View | Details | Raw Unified | Return to bug 21467
Collapse All | Expand All

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/orderreceive.tt (-1 / +1 lines)
Lines 100-106 Link Here
100
                        <td>
100
                        <td>
101
                            [% IF order.datereceived %][%# FIXME Should only be true, right? %]
101
                            [% IF order.datereceived %][%# FIXME Should only be true, right? %]
102
                                [%# FIXME What if unitprice has not been filled? %]
102
                                [%# FIXME What if unitprice has not been filled? %]
103
                                [% order.unitprice_tax_excluded | $Price | html %] / [% order.unitprice_tax_included | $Price | html %]
103
                                [% order.unitprice_tax_excluded * order.quantity | $Price %] / [% order.unitprice_tax_included * order.quantity | $Price %]
104
                            [% END %]
104
                            [% END %]
105
                        </td>
105
                        </td>
106
                        <td>[% order.order_internalnote | html %]</td>
106
                        <td>[% order.order_internalnote | html %]</td>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tt (-3 / +4 lines)
Lines 355-360 Link Here
355
                        <th>Internal note</th>
355
                        <th>Internal note</th>
356
                        <th>Vendor note</th>
356
                        <th>Vendor note</th>
357
                        <th>Fund</th>
357
                        <th>Fund</th>
358
                        <th>Quantity</th>
358
                        <th title="ecost tax exc. / ecost tax inc.">Ordered</th>
359
                        <th title="ecost tax exc. / ecost tax inc.">Ordered</th>
359
                        <th title="Actual cost tax exc. / Actual cost tax inc.">Spent</th>
360
                        <th title="Actual cost tax exc. / Actual cost tax inc.">Spent</th>
360
                    </tr>
361
                    </tr>
Lines 397-411 Link Here
397
                        <td>[% order.order_internalnote | html %]</td>
398
                        <td>[% order.order_internalnote | html %]</td>
398
                        <td>[% order.order_vendornote | html %]</td>
399
                        <td>[% order.order_vendornote | html %]</td>
399
                        <td>[% order.fund.budget_name | html %]</td>
400
                        <td>[% order.fund.budget_name | html %]</td>
401
                        <td>[% order.quantity | html %]</td>
400
                        <td>
402
                        <td>
401
                            [% UNLESS order.datereceived %]
403
                            [% UNLESS order.datereceived %]
402
                                [% order.ecost_tax_excluded | $Price %] / [% order.ecost_tax_included | $Price %]
404
                                [% order.ecost_tax_excluded * order.quantity | $Price %] / [% order.ecost_tax_included * order.quantity | $Price %]
403
                            [% END %]
405
                            [% END %]
404
                        </td>
406
                        </td>
405
                        <td>
407
                        <td>
406
                            [% IF order.datereceived %]
408
                            [% IF order.datereceived %]
407
                                [%# FIXME What if unitprice has not been filled? %]
409
                                [%# FIXME What if unitprice has not been filled? %]
408
                                [% order.unitprice_tax_excluded | $Price %] / [% order.unitprice_tax_included | $Price %]
410
                                [% order.unitprice_tax_excluded * order.quantity | $Price %] / [% order.unitprice_tax_included * order.quantity | $Price %]
409
                            [% END %]
411
                            [% END %]
410
                        </td>
412
                        </td>
411
                    </tr>
413
                    </tr>
412
- 

Return to bug 21467