Fixed PHP timeout option merging bug

orchestra/contrib/mailer/engine.py

@@ -14,7 +14,7 @@ from .models import Message
 
 
 def send_message(message, num=0, connection=None, bulk=100):
-    if num >= bulk:
+    if num >= bulk and connection is not None:
         connection.close()
         connection = None
     if connection is None:

orchestra/contrib/payments/templates/admin/payments/transaction/report.html

@@ -30,6 +30,7 @@
 <tr id="transaction">
     <th class="title column-id">ID</th>
     <th class="title column-bill">{% trans "Bill" %}</th>
+    <th class="title column-account">{% trans "Account" %}</th>
     <th class="title column-billcontant">{% trans "Contact" %}</th>
     <th class="title column-iban">IBAN</th>
     <th class="title column-amount">{% trans "Amount" %}</th>
@@ -41,6 +42,7 @@
 <tr>
     <td class="item column-id">{{ transaction.id }}</td>
     <td class="item column-bill">{{ transaction.bill.number }}</td>
+    <td class="item column-account">{{ transaction.bill.account.username }}</td>
     <td class="item column-billcontant">{{ transaction.bill.buyer.get_name }}</td>
     <td class="item column-iban">{{ transaction.source.data.iban }}</td>
     <td class="item column-amount">{{ transaction.amount }}</td>

scripts/services/apache_full_stack.md

@@ -37,10 +37,7 @@ The goal of this setup is having a high-performance state-of-the-art deployment
     a2enmod ssl
     #a2enmod auth_pam
     a2enmod proxy_fcgi
-    a2emmod userdir
     ```
-    * TODO compat module
-    https://httpd.apache.org/docs/trunk/mod/mod_access_compat.html
 
 
 3. Configure `suexec-custom`
@@ -57,9 +54,6 @@ The goal of this setup is having a high-performance state-of-the-art deployment
     ```
 
 
-
-
-
 5. Restart Apache
     ```bash
     service apache2 restart