Various improvements to batch worksheets, index links etc.

This commit is contained in:
Lance Edgar 2017-08-01 14:42:32 -05:00
parent 00027b09f6
commit 0171f3ebba
7 changed files with 13 additions and 29 deletions

View file

@ -1,7 +1,7 @@
## -*- coding: utf-8; -*-
<%inherit file="/base.mako" />
<%def name="title()">Purchase Order Form</%def>
<%def name="title()">Ordering Worksheet</%def>
<%def name="extra_javascript()">
${parent.extra_javascript()}
@ -237,8 +237,8 @@ ${h.end_form()}
</tr>
</thead>
<tbody>
% for cost in subdepartment._order_costs:
<tr data-uuid="${cost.product_uuid}">
% for i, cost in enumerate(subdepartment._order_costs, 1):
<tr data-uuid="${cost.product_uuid}" class="${'even' if i % 2 == 0 else 'odd'}">
${self.order_form_row(cost)}
% for data in history:
<td class="scratch_pad">
@ -270,7 +270,7 @@ ${h.end_form()}
<td class="current-order">
${h.text('units_ordered_{}'.format(cost.uuid), value=int(cost._batchrow.units_ordered or 0) if cost._batchrow else None)}
</td>
<td class="po-total">${'${:0,.2f}'.format(cost._batchrow.po_total) if cost._batchrow else ''}</td>
<td class="po-total">${'${:0,.2f}'.format(cost._batchrow.po_total or 0) if cost._batchrow else ''}</td>
${self.extra_td(cost)}
</tr>
% endfor

View file

@ -36,7 +36,7 @@
<%def name="leading_buttons()">
% if not batch.complete and not batch.executed and request.has_perm('ordering.order_form'):
<button type="button" id="order-form">Ordering Form</button>
<button type="button" id="order-form">Edit as Worksheet</button>
% endif
</%def>