Lines 368-373
Link Here
|
368 |
<th>Internal note</th> |
368 |
<th>Internal note</th> |
369 |
<th>Vendor note</th> |
369 |
<th>Vendor note</th> |
370 |
<th>Fund</th> |
370 |
<th>Fund</th> |
|
|
371 |
<th>Quantity</th> |
371 |
<th title="ecost tax exc. / ecost tax inc.">Ordered</th> |
372 |
<th title="ecost tax exc. / ecost tax inc.">Ordered</th> |
372 |
<th title="Actual cost tax exc. / Actual cost tax inc.">Spent</th> |
373 |
<th title="Actual cost tax exc. / Actual cost tax inc.">Spent</th> |
373 |
</tr> |
374 |
</tr> |
Lines 410-424
Link Here
|
410 |
<td>[% order.order_internalnote | html %]</td> |
411 |
<td>[% order.order_internalnote | html %]</td> |
411 |
<td>[% order.order_vendornote | html %]</td> |
412 |
<td>[% order.order_vendornote | html %]</td> |
412 |
<td>[% order.fund.budget_name | html %]</td> |
413 |
<td>[% order.fund.budget_name | html %]</td> |
|
|
414 |
<td>[% order.quantity | html %]</td> |
413 |
<td> |
415 |
<td> |
414 |
[% UNLESS order.datereceived %] |
416 |
[% UNLESS order.datereceived %] |
415 |
[% order.ecost_tax_excluded | $Price %] / [% order.ecost_tax_included | $Price %] |
417 |
[% order.ecost_tax_excluded * order.quantity | $Price %] / [% order.ecost_tax_included * order.quantity | $Price %] |
416 |
[% END %] |
418 |
[% END %] |
417 |
</td> |
419 |
</td> |
418 |
<td> |
420 |
<td> |
419 |
[% IF order.datereceived %] |
421 |
[% IF order.datereceived %] |
420 |
[%# FIXME What if unitprice has not been filled? %] |
422 |
[%# FIXME What if unitprice has not been filled? %] |
421 |
[% order.unitprice_tax_excluded | $Price %] / [% order.unitprice_tax_included | $Price %] |
423 |
[% order.unitprice_tax_excluded * order.quantity | $Price %] / [% order.unitprice_tax_included * order.quantity | $Price %] |
422 |
[% END %] |
424 |
[% END %] |
423 |
</td> |
425 |
</td> |
424 |
</tr> |
426 |
</tr> |
425 |
- |
|
|