show deleted transactions in cashbox empty summary

cseg-michigan · May 22, 2016 · b42e27a · b42e27a
1 parent 53172e5
commit b42e27a
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 11 deletions.
diff --git a/chezbetty/models/model.py b/chezbetty/models/model.py
@@ -15,7 +15,8 @@
     ForeignKey,
     Boolean,
     LargeBinary,
-    desc
+    desc,
+    asc
     )
 
 from sqlalchemy.ext.declarative import declarative_base

diff --git a/chezbetty/models/transaction.py b/chezbetty/models/transaction.py
@@ -473,7 +473,7 @@ def __relevant_cash_deposits(self):
     # Now get all cash deposits between that cash box empty and this one
     q = object_session(self).query(event.Deposit)\
             .filter(event.Event.timestamp < self.timestamp)\
-            .filter(event.Event.deleted==False)
+            .order_by(asc(event.Event.timestamp))
 
     if previous_cb_empty:
         q = q.filter(event.Event.timestamp >= previous_cb_empty.timestamp)

diff --git a/chezbetty/templates/admin/event.jinja2 b/chezbetty/templates/admin/event.jinja2
@@ -152,8 +152,8 @@
           <th></th>
           <th>Timestamp</th>
           <th>Type</th>
-          <th>From Account:</th>
           <th>To Account:</th>
+          <th>Deleted:</th>
           <th class="right">Amount</th>
         </tr>
       </thead>
@@ -162,23 +162,17 @@
         {% for t in e.transactions %}
           {% if t.type == 'cashdeposit' %}
 
-          <tr>
+          <tr {% if e.deleted==True %}style="background-color: #FF9999;"{% endif %}>
             <td>{{ button.event(e.id) }}</td>
             <td>{{ e.timestamp|pretty_date|safe }}</td>
             <td>{{ t.type }}</td>
-            <td>
-              {{ t.fr_account_virt|make_link|safe if t.fr_account_virt else "n/a" }}
-              {# Add account balance next to name for easy lookup. #}
-              {% if t.fr_account_virt.balance is defined and t.fr_account_virt.type != 'virtual' %}
-                ({{ t.fr_account_virt.balance|format_currency|safe }})
-              {% endif %}
-            </td>
             <td>
               {{ t.to_account_virt|make_link|safe if t.to_account_virt else "n/a" }}
               {% if t.to_account_virt.balance is defined and t.to_account_virt.type != 'virtual' %}
                 ({{ t.to_account_virt.balance|format_currency|safe }})
               {% endif %}
             </td>
+            <td>{% if e.deleted==True %}DELETED{% endif %}</td>
             <td class="right">{{ t.amount|format_currency|safe }}</td>
           </tr>
           {% endif %}