Bugzilla – Attachment 151469 Details for
Bug 33783
Populate actual cost with estimated cost if actual cost not set when receiving (bug 8179 follow-up)
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 33783: (bug 8179 follow-up) Populate actual cost with ecost during receiving if not set
Bug-33783-bug-8179-follow-up-Populate-actual-cost-.patch (text/plain), 2.37 KB, created by
Nick Clemens (kidclamp)
on 2023-05-19 10:47:06 UTC
(
hide
)
Description:
Bug 33783: (bug 8179 follow-up) Populate actual cost with ecost during receiving if not set
Filename:
MIME Type:
Creator:
Nick Clemens (kidclamp)
Created:
2023-05-19 10:47:06 UTC
Size:
2.37 KB
patch
obsolete
>From 86628133b00f5600582a66e30ec65be6b7a3140c Mon Sep 17 00:00:00 2001 >From: Nick Clemens <nick@bywatersolutions.com> >Date: Fri, 19 May 2023 10:44:33 +0000 >Subject: [PATCH] Bug 33783: (bug 8179 follow-up) Populate actual cost with > ecost during receiving if not set > >This restores behavior prior to 8179 to use the estimated cost when receiving if the >actual cost is not set > >To test: >1 - Add some orders to a basket, do not set actual cost field >2 - Close basket, receive orders >3 - Note actual cost field is blank >4 - Cancel receipt >5 - Apply patch >6 - Receive again >7 - Note actual cost is populated >8 - Complete receipt and confirm actual cost correctly saved >--- > .../intranet-tmpl/prog/en/modules/acqui/orderreceive.tt | 6 ++++-- > 1 file changed, 4 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 b2ab673a26..5de480ccc7 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/orderreceive.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/orderreceive.tt >@@ -1135,12 +1135,14 @@ > if(invoiceincgst == "1") { > rrp_txt = Number(row.rrp_tax_included).format_price()+'<span class="hint"> '+ADJ_TAX_INC.format(active_currency)+"</span>"; > ecost_txt = Number(row.ecost_tax_included).format_price()+'<span class="hint"> '+TAX_INC+"</span>"; >- $("#unitprice").val(row.unit_price_tax_included); >+ var init_unitprice = row.unit_price_tax_included > 0 ? row.unit_price_tax_included : row.ecost_tax_included >+ $("#unitprice").val(init_unitprice); > $("#unitprice_hint").html(TAX_INC); > } else { > rrp_txt = Number(row.rrp_tax_excluded).format_price()+'<span class="hint"> '+ADJ_TAX_EXC.format(active_currency)+"</span>"; > ecost_txt = Number(row.ecost_tax_excluded).format_price()+'<span class="hint"> '+TAX_EXC+"</span>"; >- $("#unitprice").val(row.unit_price_tax_excluded); >+ var init_unitprice = row.unit_price_tax_excluded > 0 ? row.unit_price_tax_excluded : row.ecost_tax_excluded >+ $("#unitprice").val(init_unitprice); > $("#unitprice_hint").html(TAX_EXC); > } > $("#rrp").html(rrp_txt); >-- >2.30.2
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 33783
:
151469
|
151758
|
151761
|
151789
|
151794
|
151795
|
151817