rattail/tailbone
2
0
Fork 0
Code Issues 2 Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source
This commit is contained in:
Lance Edgar 2019-03-07 17:05:25 -06:00
parent 3760c3239f
commit d337defb09
2 changed files with 44 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

14
tailbone/views/purchasing/receiving.py
View file

@ -161,6 +161,7 @@ class ReceivingBatchView(PurchasingBatchView):
'created',
'created_by',
'rowcount',
'invoice_total_calculated',
'status_code',
'executed',
]
@ -191,6 +192,7 @@ class ReceivingBatchView(PurchasingBatchView):
'invoice_date',
'invoice_number',
'invoice_total',
'invoice_total_calculated',
'notes',
'created',
'created_by',
@ -221,7 +223,7 @@ class ReceivingBatchView(PurchasingBatchView):
'cases_received',
'units_received',
# 'po_total',
'invoice_total',
'invoice_total_calculated',
'credits',
'status_code',
'truck_dump_status',
@ -252,6 +254,7 @@ class ReceivingBatchView(PurchasingBatchView):
'invoice_line_number',
'invoice_unit_cost',
'invoice_total',
'invoice_total_calculated',
'status_code',
'truck_dump_status',
'claims',
@ -418,6 +421,10 @@ class ReceivingBatchView(PurchasingBatchView):
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):
kwargs = super(ReceivingBatchView, self).template_kwargs_create(**kwargs)
if self.allow_truck_dump:
@ -849,7 +856,12 @@ class ReceivingBatchView(PurchasingBatchView):
f.set_readonly('units_ordered')
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
f.set_readonly('claims')