Bugzilla – Attachment 151817 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: Only use ecost if unitprice has not been set on ordering
Bug-33783-Only-use-ecost-if-unitprice-has-not-been.patch (text/plain), 2.03 KB, created by
Tomás Cohen Arazi (tcohen)
on 2023-05-30 17:24:16 UTC
(
hide
)
Description:
Bug 33783: Only use ecost if unitprice has not been set on ordering
Filename:
MIME Type:
Creator:
Tomás Cohen Arazi (tcohen)
Created:
2023-05-30 17:24:16 UTC
Size:
2.03 KB
patch
obsolete
>From 13d9059da890c7ba9484eb4ab27393aeeef88830 Mon Sep 17 00:00:00 2001 >From: Tomas Cohen Arazi <tomascohen@theke.io> >Date: Tue, 30 May 2023 14:23:59 -0300 >Subject: [PATCH] Bug 33783: Only use ecost if unitprice has not been set on > ordering > >Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io> >--- > koha-tmpl/intranet-tmpl/prog/en/modules/acqui/orderreceive.tt | 4 ++-- > 1 file changed, 2 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 13f8d19943a..05a18563894 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/orderreceive.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/orderreceive.tt >@@ -1171,12 +1171,12 @@ > 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(Number(row.ecost_tax_included).format_price()); >+ $("#unitprice").val(row.unit_price_tax_included > 0 ? Number(row.unit_price_tax_included).format_price() : Number(row.ecost_tax_included).format_price()); > $("#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(Number(row.ecost_tax_excluded).format_price()); >+ $("#unitprice").val(row.unit_price_tax_excluded > 0 ? Number(row.unit_price_tax_excluded).format_price() : Number(row.ecost_tax_excluded).format_price()); > $("#unitprice_hint").html(TAX_EXC); > } > $("#rrp").html(rrp_txt); >-- >2.34.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 33783
:
151469
|
151758
|
151761
|
151789
|
151794
|
151795
| 151817