Changeset d337def in tailbone

Timestamp:

03/07/19 17:05:25 (11 months ago)

Author:

Lance Edgar <ledgar@…>

Branches:

master

Children:

15c47fb

Parents:

3760c32

Message:

Expose new "calculated" invoice totals for receiving batch, rows

Location:

tailbone/views/purchasing

Files:

• batch.py (modified) (6 diffs)
• receiving.py (modified) (6 diffs)

tailbone/views/purchasing/batch.py

@@ -145 +145 @@
         'invoice_unit_cost',
         'invoice_total',
+        'invoice_total_calculated',
         'status_code',
         'credits',
@@ -205 +206 @@
             g.filters['complete'].default_active = True
             g.filters['complete'].default_verb = 'is_true'
+
+        # invoice_total
+        g.set_type('invoice_total', 'currency')
+        g.set_label('invoice_total', "Total")
+
+        # invoice_total_calculated
+        g.set_type('invoice_total_calculated', 'currency')
+        g.set_label('invoice_total_calculated', "Total")
 
         g.set_label('date_ordered', "Ordered")
@@ -348 +357 @@
         f.set_type('invoice_total', 'currency')
 
+        # invoice_total_calculated
+        f.set_readonly('invoice_total_calculated')
+        f.set_type('invoice_total_calculated', 'currency')
+
         # vendor_email
         f.set_readonly('vendor_email')
@@ -604 +617 @@
         g.set_type('units_received', 'quantity')
         g.set_type('po_total', 'currency')
-        g.set_type('invoice_total', 'currency')
         g.set_type('credits', 'boolean')
 
@@ -618 +630 @@
         g.filters['units_received'].label = "Units Received"
 
+        # invoice_total
+        g.set_type('invoice_total', 'currency')
+        g.set_label('invoice_total', "Total")
+
+        # invoice_total_calculated
+        g.set_type('invoice_total_calculated', 'currency')
+        g.set_label('invoice_total_calculated', "Total")
+
         g.set_label('po_total', "Total")
-        g.set_label('invoice_total', "Total")
         g.set_label('credits', "Credits?")
 
@@ -665 +684 @@
         f.set_type('po_total', 'currency')
         f.set_type('invoice_unit_cost', 'currency')
-        f.set_type('invoice_total', 'currency')
 
         # upc
         f.set_type('upc', 'gpc')
+
+        # invoice total
+        f.set_readonly('invoice_total')
+        f.set_type('invoice_total', 'currency')
+        f.set_label('invoice_total', "Invoice Total (Orig.)")
+
+        # invoice total_calculated
+        f.set_readonly('invoice_total_calculated')
+        f.set_type('invoice_total_calculated', 'currency')
+        f.set_label('invoice_total_calculated', "Invoice Total (Calc.)")
 
         # credits

tailbone/views/purchasing/receiving.py

@@ -162 +162 @@
         'created_by',
         'rowcount',
+        'invoice_total_calculated',
         'status_code',
         'executed',
@@ -192 +193 @@
         'invoice_number',
         'invoice_total',
+        'invoice_total_calculated',
         'notes',
         'created',
@@ -222 +224 @@
         'units_received',
         # 'po_total',
-        'invoice_total',
+        'invoice_total_calculated',
         'credits',
         'status_code',
@@ -253 +255 @@
         'invoice_unit_cost',
         'invoice_total',
+        'invoice_total_calculated',
         'status_code',
         'truck_dump_status',
@@ -418 +421 @@
         if not self.editing:
             f.remove_field('order_quantities_known')
+
+        # invoice totals
+        f.set_label('invoice_total', "Invoice Total (Orig.)")
+        f.set_label('invoice_total_calculated', "Invoice Total (Calc.)")
 
     def template_kwargs_create(self, **kwargs):
@@ -850 +857 @@
         f.set_readonly('po_unit_cost')
         f.set_readonly('po_total')
+
+        # invoice totals
         f.set_readonly('invoice_total')
+        f.set_label('invoice_total', "Invoice Total (Orig.)")
+        f.set_readonly('invoice_total_calculated')
+        f.set_label('invoice_total_calculated', "Invoice Total (Calc.)")
 
         # claims