Attachment 111378 Details for Bug 23376 – Bug 23376: (follow-up) Fix subscription bug in orderreceive.tt

[patch] Bug 23376: (follow-up) Fix subscription bug in orderreceive.tt

Bug-23376-follow-up-Fix-subscription-bug-in-orderr.patch (text/plain), 4.15 KB, created by Agustín Moyano on 2020-10-08 14:38:00 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Agustín Moyano

Created: 2020-10-08 14:38:00 UTC

Size: 4.15 KB

patch

obsolete

>From 58963cbf01f805fd206116a0f8972e77d06b7648 Mon Sep 17 00:00:00 2001
>From: Agustin Moyano <agustinmoyano@theke.io>
>Date: Thu, 8 Oct 2020 11:35:14 -0300
>Subject: [PATCH] Bug 23376: (follow-up) Fix subscription bug in
> orderreceive.tt
>
>When order has subscription, general order variable gets replaced by other order variable in FOR loop
>---
> .../prog/en/modules/acqui/orderreceive.tt     | 26 +++++++++----------
> 1 file changed, 13 insertions(+), 13 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 c18cefc43a..fcf1d6eee5 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/orderreceive.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/orderreceive.tt
>@@ -104,24 +104,24 @@
>                     </tr>
>                 </thead>
>                 <tbody>
>-                [% FOR order IN orders %]
>+                [% FOR suborder IN orders %]
>                     <tr>
>                         <td>
>-                        [% IF order.invoice %]
>+                        [% IF suborder.invoice %]
>                             [% IF CAN_user_acquisition %]
>-                                <a href="/cgi-bin/koha/acqui/invoice.pl?invoiceid=[% order.invoiceid | uri %]" title="Invoice detail page">
>-                                   [% order.invoice.invoicenumber | html %]</a>
>+                                <a href="/cgi-bin/koha/acqui/invoice.pl?invoiceid=[% suborder.invoiceid | uri %]" title="Invoice detail page">
>+                                   [% suborder.invoice.invoicenumber | html %]</a>
>                             [% ELSE %]
>-                                [% order.invoice.invoicenumber | html %]
>+                                [% suborder.invoice.invoicenumber | html %]
>                             [% END %]
>                         [% END %]
>                         </td>
>-                        <td>[% order.ordernumber | html %]</td>
>-                        <td><span title="[% order.basket.creationdate | uri %]">[% order.basket.creationdate | $KohaDates%]</span></td>
>-                        <td>[% IF order.datereceived %]<span title="[% order.datereceived | uri %]">[% order.datereceived | $KohaDates %]</span>[% END %]</td>
>-                        <td>[% order.quantityreceived | html %]</td>
>+                        <td>[% suborder.ordernumber | html %]</td>
>+                        <td><span title="[% suborder.basket.creationdate | uri %]">[% suborder.basket.creationdate | $KohaDates%]</span></td>
>+                        <td>[% IF suborder.datereceived %]<span title="[% suborder.datereceived | uri %]">[% suborder.datereceived | $KohaDates %]</span>[% END %]</td>
>+                        <td>[% suborder.quantityreceived | html %]</td>
>                         <td>
>-                          [% SWITCH order.orderstatus %]
>+                          [% SWITCH suborder.orderstatus %]
>                           [%# FIXME We should only see/display Complete here, right? %]
>                             [% CASE 'new' %]<span title="status_1">New</span>
>                             [% CASE 'ordered' %]<span title="status_2">Ordered</span>
>@@ -131,12 +131,12 @@
>                           [% END %]
>                         </td>
>                         <td>
>-                            [% IF order.datereceived %][%# FIXME Should only be true, right? %]
>+                            [% IF suborder.datereceived %][%# FIXME Should only be true, right? %]
>                                 [%# FIXME What if unitprice has not been filled? %]
>-                                [% order.unitprice_tax_excluded * order.quantity | $Price %] / [% order.unitprice_tax_included * order.quantity | $Price %]
>+                                [% suborder.unitprice_tax_excluded * suborder.quantity | $Price %] / [% suborder.unitprice_tax_included * suborder.quantity | $Price %]
>                             [% END %]
>                         </td>
>-                        <td>[% order.order_internalnote | html %]</td>
>+                        <td>[% suborder.order_internalnote | html %]</td>
>                     </tr>
>                 [% END %]
>                 </tbody>
>-- 
>2.25.0

Actions: View | Diff | Splinter Review

Attachments on bug 23376: 91774 | 91857 | 91858 | 110692 | 110693 | 110694 | 111247 | 111248 | 111249 | 111250 | 111378 | 111750 | 131857