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

Use shipped instead of ordered, for receiving authority

Browse source 
i.e. compare receiving quantities to shipped quantities instead of ordered
This commit is contained in:
Lance Edgar 2019-04-01 13:32:43 -05:00
parent 49017fda39
commit bf189bb704
3 changed files with 15 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
tailbone/templates/mobile/receiving/receive_row.mako
View file

@ -30,12 +30,12 @@
<tbody> <tbody>
% if batch.order_quantities_known: % if batch.order_quantities_known:
<tr> <tr>
<td>ordered</td> <td>shipped</td>
<td> <td>
% if allow_cases: % if allow_cases:
${h.pretty_quantity(row.cases_ordered or 0)} / ${h.pretty_quantity(row.cases_shipped or 0)} /
% endif % endif
${h.pretty_quantity(row.units_ordered or 0)} ${h.pretty_quantity(row.units_shipped or 0)}
</td> </td>
</tr> </tr>
% endif % endif

8
tailbone/views/purchasing/batch.py
View file

@ -613,6 +613,8 @@ class PurchasingBatchView(BatchMasterView):
g.set_type('upc', 'gpc') g.set_type('upc', 'gpc')
g.set_type('cases_ordered', 'quantity') g.set_type('cases_ordered', 'quantity')
g.set_type('units_ordered', 'quantity') g.set_type('units_ordered', 'quantity')
g.set_type('cases_shipped', 'quantity')
g.set_type('units_shipped', 'quantity')
g.set_type('cases_received', 'quantity') g.set_type('cases_received', 'quantity')
g.set_type('units_received', 'quantity') g.set_type('units_received', 'quantity')
g.set_type('po_total', 'currency') g.set_type('po_total', 'currency')
@ -624,6 +626,10 @@ class PurchasingBatchView(BatchMasterView):
g.filters['cases_ordered'].label = "Cases Ordered" g.filters['cases_ordered'].label = "Cases Ordered"
g.set_label('units_ordered', "Units Ord.") g.set_label('units_ordered', "Units Ord.")
g.filters['units_ordered'].label = "Units Ordered" g.filters['units_ordered'].label = "Units Ordered"
g.set_label('cases_shipped', "Cases Shp.")
g.filters['cases_shipped'].label = "Cases Shipped"
g.set_label('units_shipped', "Units Shp.")
g.filters['units_shipped'].label = "Units Shipped"
g.set_label('cases_received', "Cases Rec.") g.set_label('cases_received', "Cases Rec.")
g.filters['cases_received'].label = "Cases Received" g.filters['cases_received'].label = "Cases Received"
g.set_label('units_received', "Units Rec.") g.set_label('units_received', "Units Rec.")
@ -670,6 +676,8 @@ class PurchasingBatchView(BatchMasterView):
f.set_type('case_quantity', 'quantity') f.set_type('case_quantity', 'quantity')
f.set_type('cases_ordered', 'quantity') f.set_type('cases_ordered', 'quantity')
f.set_type('units_ordered', 'quantity') f.set_type('units_ordered', 'quantity')
f.set_type('cases_shipped', 'quantity')
f.set_type('units_shipped', 'quantity')
f.set_type('cases_received', 'quantity') f.set_type('cases_received', 'quantity')
f.set_type('units_received', 'quantity') f.set_type('units_received', 'quantity')
f.set_type('cases_damaged', 'quantity') f.set_type('cases_damaged', 'quantity')

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

@ -219,8 +219,8 @@ class ReceivingBatchView(PurchasingBatchView):
'description', 'description',
'size', 'size',
'department_name', 'department_name',
'cases_ordered', 'cases_shipped',
'units_ordered', 'units_shipped',
'cases_received', 'cases_received',
'units_received', 'units_received',
# 'po_total', # 'po_total',
@ -241,6 +241,8 @@ class ReceivingBatchView(PurchasingBatchView):
'case_quantity', 'case_quantity',
'cases_ordered', 'cases_ordered',
'units_ordered', 'units_ordered',
'cases_shipped',
'units_shipped',
'cases_received', 'cases_received',
'units_received', 'units_received',
'cases_damaged', 'cases_damaged',