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

Use 'today' as fallback date for ordering worksheet

Browse source
This commit is contained in:
Lance Edgar 2018-03-21 10:42:50 -05:00
parent 79b1502920
commit fde5398455
2 changed files with 6 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
tailbone/templates/ordering/worksheet.mako
View file

@ -224,12 +224,12 @@ ${h.end_form()}
% endfor % endfor
% if not ignore_cases: % if not ignore_cases:
<th> <th>
${batch.date_ordered.strftime('%m/%d')}<br /> ${order_date.strftime('%m/%d')}<br />
Cases Cases
</th> </th>
% endif % endif
<th> <th>
${batch.date_ordered.strftime('%m/%d')}<br /> ${order_date.strftime('%m/%d')}<br />
Units Units
</th> </th>
<th>PO Total</th> <th>PO Total</th>

4
tailbone/views/purchasing/ordering.py
View file

@ -170,8 +170,12 @@ class OrderingBatchView(PurchasingBatchView):
history = list(reversed(history)) history = list(reversed(history))
title = self.get_instance_title(batch) title = self.get_instance_title(batch)
order_date = batch.date_ordered
if not order_date:
order_date = localtime(self.rattail_config).date()
return self.render_to_response('worksheet', { return self.render_to_response('worksheet', {
'batch': batch, 'batch': batch,
'order_date': order_date,
'instance': batch, 'instance': batch,
'instance_title': title, 'instance_title': title,
'instance_url': self.get_action_url('view', batch), 'instance_url': self.get_action_url('view', batch),