Bugzilla – Attachment 127858 Details for
Bug 29415
Wrong number of received items/quantity shown in several places
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 29415: Fix quantity display in acq module
Bug-29415-Fix-quantity-display-in-acq-module.patch (text/plain), 3.70 KB, created by
Jonathan Druart
on 2021-11-19 11:46:51 UTC
(
hide
)
Description:
Bug 29415: Fix quantity display in acq module
Filename:
MIME Type:
Creator:
Jonathan Druart
Created:
2021-11-19 11:46:51 UTC
Size:
3.70 KB
patch
obsolete
>From 70955092d3864390fdcac1231adf71d647fb430c Mon Sep 17 00:00:00 2001 >From: Jonathan Druart <jonathan.druart@bugs.koha-community.org> >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 @@ > <td class="number tax_excluded">[% order.unitprice_tax_excluded | $Price %]</td> > <td class="number tax_included">[% order.unitprice_tax_included | $Price %]</td> > <td class="number replacementprice">[% order.replacementprice | $Price %] [% IF ( order.uncertainprice ) %] (Uncertain) [% END %]</td> >- <td class="number">[% order.quantity | html %]</td> >+ <td class="number">[% order.quantityreceived | html %]</td> > <td class="number tax_excluded">[% order.total_tax_excluded | $Price %]</td> > <td class="number tax_included">[% order.total_tax_included | $Price %]</td> > <td class="number">[% order.tax_rate * 100 | html %]</td> >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. > <th>Creation date</th> > <th>Receive date</th> > <th>Status</th> >- <th>Quantity</th> >+ <th title="Quantity received/quantity ordered">Quantity</th> > <th title="Estimated cost tax incl. while pending, actual cost tax incl. once received">Price</th> > <th>Internal note</th> > <th>Subscription</th> >@@ -816,7 +816,7 @@ Note that permanent location is a code, and location may be an authval. > [% CASE 'cancelled' %]Cancelled > [% END %] > </td> >- <td>[% order.quantity | html %]</td> >+ <td>[% order.quantity | html %]/[% order.quantityreceived | html %]</td> > <td>[% IF ( order.unitprice_tax_included > 0 ) %][% order.unitprice_tax_included | $Price %][% ELSE %][% order.ecost_tax_included | $Price %][% END %] > <td>[% order.order_internalnote | html %]</td> > <td> >-- >2.25.1
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
|
Splinter Review
Attachments on
bug 29415
: 127858