Bugzilla – Attachment 122380 Details for
Bug 28627
Revert the order receive page to display 'Actual cost' as ecost_tax_included/ecost_tax_excluded if unitprice not set
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 28627: Fallback to displaying ecost_tax_included, ecost_tax_excluded in orderreceive.pl
Bug-28627-Fallback-to-displaying-ecosttaxincluded-.patch (text/plain), 2.79 KB, created by
Alex Buckley
on 2021-06-24 10:34:08 UTC
(
hide
)
Description:
Bug 28627: Fallback to displaying ecost_tax_included, ecost_tax_excluded in orderreceive.pl
Filename:
MIME Type:
Creator:
Alex Buckley
Created:
2021-06-24 10:34:08 UTC
Size:
2.79 KB
patch
obsolete
>From 809360128600b9d50d672e6f9f0265c428925b1d Mon Sep 17 00:00:00 2001 >From: Alex Buckley <alexbuckley@catalyst.net.nz> >Date: Thu, 24 Jun 2021 21:48:48 +1200 >Subject: [PATCH] Bug 28627: Fallback to displaying ecost_tax_included, > ecost_tax_excluded in orderreceive.pl > >Test plan: >1. Create a basket and adding items to it. Set the 'Vendor price' to >'20', do not add an 'Actual cost' >2. Close the basket >3. Select 'Receive shipment' >4. Set a value for vendor invoice >5. Receive the order you created >6. Observe 'Actual cost' is = 0.00 >7. Apply patch >8. Refresh the order receival page, and confirm the 'Actual cost' = >20.00 > >Sponsored-By: South Taranaki District Council, NZ >--- > .../intranet-tmpl/prog/en/modules/acqui/orderreceive.tt | 12 ++++++++++-- > 1 file changed, 10 insertions(+), 2 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 49aecfc219..3e68096b6e 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/orderreceive.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/orderreceive.tt >@@ -343,9 +343,17 @@ > <li> > <label for="unitprice">Actual cost:</label> > [% IF (invoiceincgst) %] >- <input type="text" size="20" name="unitprice" id="unitprice" value="[% order.unitprice_tax_included | $Price on_editing => 1 %]" /> <span class="hint">(tax inclusive)</span> >+ [% IF (order.unitprice_tax_included == 0.00000) %] >+ <input type="text" size="20" name="unitprice" id="unitprice" value="[% order.unitprice_tax_included | $Price on_editing => 1 %]" /> <span class="hint">(tax inclusive)</span> >+ [% ELSE %] >+ <input type="text" size="20" name="unitprice" id="unitprice" value="[% order.ecost_tax_included | $Price on_editing => 1%]" /> <span class="hint">(tax inclusive)</span> >+ [% END %] > [% ELSE %] >- <input type="text" size="20" name="unitprice" id="unitprice" value="[% order.unitprice_tax_excluded | $Price on_editing => 1 %]" /> <span class="hint">(tax exclusive)</span> >+ [% IF (order.unitprice_tax_excluded == 0.00000) %] >+ <input type="text" size="20" name="unitprice" id="unitprice" value="[% order.unitprice_tax_excluded | $Price on_editing => 1 %]" /> <span class="hint">(tax exclusive)</span> >+ [% ELSE %] >+ <input type="text" size="20" name="unitprice" id="unitprice" value="[% order.ecost_tax_excluded | $Price on_editing => 1 %]" /> <span class="hint">(tax exclusive)</span> >+ [% END %] > [% END %] > <label style="font-weight: inherit; float:none;"><input type="checkbox" name="change_currency">Change currency</label> > </li> >-- >2.11.0
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 28627
:
122380
|
127592
|
127597
|
127604