From 70955092d3864390fdcac1231adf71d647fb430c Mon Sep 17 00:00:00 2001 From: Jonathan Druart Date: Fri, 19 Nov 2021 12:46:15 +0100 Subject: [PATCH] Bug 29415: Fix quantity display in acq module --- acqui/invoice.pl | 4 ++-- koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoice.tt | 2 +- koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/acqui/invoice.pl b/acqui/invoice.pl index 7240d9319ff..abe5ad036c3 100755 --- a/acqui/invoice.pl +++ b/acqui/invoice.pl @@ -260,8 +260,8 @@ foreach my $order (@$orders) { $foot{$$line{tax_rate}}{tax_rate} = $$line{tax_rate}; $foot{$$line{tax_rate}}{tax_value} += get_rounded_price($$line{tax_value}); $total_tax_value += $$line{tax_value}; - $foot{$$line{tax_rate}}{quantity} += $$line{quantity}; - $total_quantity += $$line{quantity}; + $foot{$$line{tax_rate}}{quantity} += $$line{quantityreceived}; + $total_quantity += $$line{quantityreceived}; $foot{$$line{tax_rate}}{total_tax_excluded} += get_rounded_price($$line{total_tax_excluded}); $total_tax_excluded += get_rounded_price($$line{total_tax_excluded}); $foot{$$line{tax_rate}}{total_tax_included} += get_rounded_price($$line{total_tax_included}); diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoice.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoice.tt index ce0a059b87d..b0d5fef128a 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoice.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoice.tt @@ -382,7 +382,7 @@ [% order.unitprice_tax_excluded | $Price %] [% order.unitprice_tax_included | $Price %] [% order.replacementprice | $Price %] [% IF ( order.uncertainprice ) %] (Uncertain) [% END %] - [% order.quantity | html %] + [% order.quantityreceived | html %] [% order.total_tax_excluded | $Price %] [% order.total_tax_included | $Price %] [% order.tax_rate * 100 | html %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt index 684a082ffab..61ce3c56432 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt @@ -763,7 +763,7 @@ Note that permanent location is a code, and location may be an authval. Creation date Receive date Status - Quantity + Quantity Price Internal note Subscription @@ -816,7 +816,7 @@ Note that permanent location is a code, and location may be an authval. [% CASE 'cancelled' %]Cancelled [% END %] - [% order.quantity | html %] + [% order.quantity | html %]/[% order.quantityreceived | html %] [% IF ( order.unitprice_tax_included > 0 ) %][% order.unitprice_tax_included | $Price %][% ELSE %][% order.ecost_tax_included | $Price %][% END %] [% order.order_internalnote | html %] -- 2.25.1