Attachment 82126 Details for Bug 21467 – Bug 21467: Display the quantity and adjust the amounts

[patch] Bug 21467: Display the quantity and adjust the amounts

Bug-21467-Display-the-quantity-and-adjust-the-amou.patch (text/plain), 3.74 KB, created by Katrin Fischer on 2018-11-08 22:07:14 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Katrin Fischer

Created: 2018-11-08 22:07:14 UTC

Size: 3.74 KB

patch

obsolete

>From 7f6e7be8e5c5bdd66623abebecb9055a33fdaab6 Mon Sep 17 00:00:00 2001
>From: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
>Date: Tue, 2 Oct 2018 13:42:58 -0300
>Subject: [PATCH] Bug 21467: Display the quantity and adjust the amounts
>MIME-Version: 1.0
>Content-Type: text/plain; charset=UTF-8
>Content-Transfer-Encoding: 8bit
>
>On the subscription detail view we should display the amounts depending
>on the quantity (can be different than 0 now!)
>
>Sponsored-by: BULAC - http://www.bulac.fr/
>
>Signed-off-by: SÃ©verine QUEUNE <severine.queune@bulac.fr>
>
>Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
>---
> koha-tmpl/intranet-tmpl/prog/en/modules/acqui/orderreceive.tt       | 2 +-
> .../intranet-tmpl/prog/en/modules/serials/subscription-detail.tt    | 6 ++++--
> 2 files changed, 5 insertions(+), 3 deletions(-)
>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/orderreceive.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/orderreceive.tt
>index abe2d16a5f..e79648caf1 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/orderreceive.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/orderreceive.tt
>@@ -100,7 +100,7 @@
>                         <td>
>                             [% IF order.datereceived %][%# FIXME Should only be true, right? %]
>                                 [%# FIXME What if unitprice has not been filled? %]
>-                                [% order.unitprice_tax_excluded | $Price | html %] / [% order.unitprice_tax_included | $Price | html %]
>+                                [% order.unitprice_tax_excluded * order.quantity | $Price %] / [% order.unitprice_tax_included * order.quantity | $Price %]
>                             [% END %]
>                         </td>
>                         <td>[% order.order_internalnote | html %]</td>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tt
>index 1dcac0f3f9..5cbbb9bc39 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tt
>@@ -368,6 +368,7 @@
>                         <th>Internal note</th>
>                         <th>Vendor note</th>
>                         <th>Fund</th>
>+                        <th>Quantity</th>
>                         <th title="ecost tax exc. / ecost tax inc.">Ordered</th>
>                         <th title="Actual cost tax exc. / Actual cost tax inc.">Spent</th>
>                     </tr>
>@@ -410,15 +411,16 @@
>                         <td>[% order.order_internalnote | html %]</td>
>                         <td>[% order.order_vendornote | html %]</td>
>                         <td>[% order.fund.budget_name | html %]</td>
>+                        <td>[% order.quantity | html %]</td>
>                         <td>
>                             [% UNLESS order.datereceived %]
>-                                [% order.ecost_tax_excluded | $Price %] / [% order.ecost_tax_included | $Price %]
>+                                [% order.ecost_tax_excluded * order.quantity | $Price %] / [% order.ecost_tax_included * order.quantity | $Price %]
>                             [% END %]
>                         </td>
>                         <td>
>                             [% IF order.datereceived %]
>                                 [%# FIXME What if unitprice has not been filled? %]
>-                                [% order.unitprice_tax_excluded | $Price %] / [% order.unitprice_tax_included | $Price %]
>+                                [% order.unitprice_tax_excluded * order.quantity | $Price %] / [% order.unitprice_tax_included * order.quantity | $Price %]
>                             [% END %]
>                         </td>
>                     </tr>
>-- 
>2.11.0

Actions: View | Diff | Splinter Review

Attachments on bug 21467: 79801 | 79802 | 79834 | 79835 | 79836 | 79837 | 79838 | 80546 | 80706 | 80707 | 80717 | 80718 | 80719 | 80720 | 80721 | 80722 | 80723 | 80724 | 81394 | 81395 | 81396 | 81397 | 81398 | 81399 | 81400 | 81430 | 81797 | 81798 | 81799 | 81800 | 81801 | 81802 | 81803 | 81804 | 81805 | 81806 | 81807 | 81808 | 81809 | 81810 | 81811 | 82117 | 82122 | 82123 | 82124 | 82125 | 82126 | 82127 | 82128 | 82129 | 82130 | 82131 | 82132