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

(-)a/acqui/invoice.pl (-2 / +2 lines)
Lines 260-267 foreach my $order (@$orders) { Link Here
260
    $foot{$$line{tax_rate}}{tax_rate} = $$line{tax_rate};
260
    $foot{$$line{tax_rate}}{tax_rate} = $$line{tax_rate};
261
    $foot{$$line{tax_rate}}{tax_value} += get_rounded_price($$line{tax_value});
261
    $foot{$$line{tax_rate}}{tax_value} += get_rounded_price($$line{tax_value});
262
    $total_tax_value += $$line{tax_value};
262
    $total_tax_value += $$line{tax_value};
263
    $foot{$$line{tax_rate}}{quantity}  += $$line{quantity};
263
    $foot{$$line{tax_rate}}{quantity}  += $$line{quantityreceived};
264
    $total_quantity += $$line{quantity};
264
    $total_quantity += $$line{quantityreceived};
265
    $foot{$$line{tax_rate}}{total_tax_excluded} += get_rounded_price($$line{total_tax_excluded});
265
    $foot{$$line{tax_rate}}{total_tax_excluded} += get_rounded_price($$line{total_tax_excluded});
266
    $total_tax_excluded += get_rounded_price($$line{total_tax_excluded});
266
    $total_tax_excluded += get_rounded_price($$line{total_tax_excluded});
267
    $foot{$$line{tax_rate}}{total_tax_included} += get_rounded_price($$line{total_tax_included});
267
    $foot{$$line{tax_rate}}{total_tax_included} += get_rounded_price($$line{total_tax_included});
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoice.tt (-1 / +1 lines)
Lines 382-388 Link Here
382
                  <td class="number tax_excluded">[% order.unitprice_tax_excluded | $Price %]</td>
382
                  <td class="number tax_excluded">[% order.unitprice_tax_excluded | $Price %]</td>
383
                  <td class="number tax_included">[% order.unitprice_tax_included | $Price %]</td>
383
                  <td class="number tax_included">[% order.unitprice_tax_included | $Price %]</td>
384
                  <td class="number replacementprice">[% order.replacementprice | $Price %] [% IF ( order.uncertainprice ) %] (Uncertain) [% END %]</td>
384
                  <td class="number replacementprice">[% order.replacementprice | $Price %] [% IF ( order.uncertainprice ) %] (Uncertain) [% END %]</td>
385
                  <td class="number">[% order.quantity | html %]</td>
385
                  <td class="number">[% order.quantityreceived | html %]</td>
386
                  <td class="number tax_excluded">[% order.total_tax_excluded | $Price %]</td>
386
                  <td class="number tax_excluded">[% order.total_tax_excluded | $Price %]</td>
387
                  <td class="number tax_included">[% order.total_tax_included | $Price %]</td>
387
                  <td class="number tax_included">[% order.total_tax_included | $Price %]</td>
388
                  <td class="number">[% order.tax_rate * 100 | html %]</td>
388
                  <td class="number">[% order.tax_rate * 100 | html %]</td>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt (-3 / +2 lines)
Lines 763-769 Note that permanent location is a code, and location may be an authval. Link Here
763
          <th>Creation date</th>
763
          <th>Creation date</th>
764
          <th>Receive date</th>
764
          <th>Receive date</th>
765
          <th>Status</th>
765
          <th>Status</th>
766
          <th>Quantity</th>
766
          <th title="Quantity received/quantity ordered">Quantity</th>
767
          <th title="Estimated cost tax incl. while pending, actual cost tax incl. once received">Price</th>
767
          <th title="Estimated cost tax incl. while pending, actual cost tax incl. once received">Price</th>
768
          <th>Internal note</th>
768
          <th>Internal note</th>
769
          <th>Subscription</th>
769
          <th>Subscription</th>
Lines 816-822 Note that permanent location is a code, and location may be an authval. Link Here
816
                [% CASE 'cancelled' %]Cancelled
816
                [% CASE 'cancelled' %]Cancelled
817
              [% END %]
817
              [% END %]
818
            </td>
818
            </td>
819
            <td>[% order.quantity | html %]</td>
819
            <td>[% order.quantity | html %]/[% order.quantityreceived | html %]</td>
820
            <td>[% IF ( order.unitprice_tax_included > 0 ) %][% order.unitprice_tax_included | $Price %][% ELSE %][% order.ecost_tax_included | $Price %][% END %]
820
            <td>[% IF ( order.unitprice_tax_included > 0 ) %][% order.unitprice_tax_included | $Price %][% ELSE %][% order.ecost_tax_included | $Price %][% END %]
821
            <td>[% order.order_internalnote | html %]</td>
821
            <td>[% order.order_internalnote | html %]</td>
822
            <td>
822
            <td>
823
- 

Return to bug 29415