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

Tweaks to order form template etc., for purchasing batch

Browse source
This commit is contained in:
Lance Edgar 2017-01-25 11:15:17 -06:00
parent c2a189cb40
commit 732681b545
2 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
tailbone/templates/purchases/batches/order_form.mako
View file

@ -158,11 +158,12 @@
% for data in history: % for data in history:
<th> <th>
% if data: % if data:
% if data['purchase']['date_ordered']: % if data['purchase']['date_received']:
${data['purchase']['date_ordered'].strftime('%m/%d')}
% elif data['purchase']['date_received']:
Rec.<br /> Rec.<br />
${data['purchase']['date_received'].strftime('%m/%d')} ${data['purchase']['date_received'].strftime('%m/%d')}
% elif data['purchase']['date_ordered']:
Ord.<br />
${data['purchase']['date_ordered'].strftime('%m/%d')}
% else: % else:
?? ??
% endif % endif

1
tailbone/views/purchases/batch.py
View file

@ -366,6 +366,7 @@ class PurchaseBatchView(BatchMasterView):
if batch.mode == self.enum.PURCHASE_BATCH_MODE_ORDERING: if batch.mode == self.enum.PURCHASE_BATCH_MODE_ORDERING:
del g.cases_received del g.cases_received
del g.units_received del g.units_received
del g.has_credits
del g.invoice_total del g.invoice_total
elif batch.mode in (self.enum.PURCHASE_BATCH_MODE_RECEIVING, elif batch.mode in (self.enum.PURCHASE_BATCH_MODE_RECEIVING,
self.enum.PURCHASE_BATCH_MODE_COSTING): self.enum.PURCHASE_BATCH_MODE_COSTING):