From b0c03b1e88ff28726f364d0137bd87c66a6c4d2f Mon Sep 17 00:00:00 2001 From: Galen Charlton Date: Thu, 6 Jan 2022 17:56:26 -0500 Subject: [PATCH] LP#1942220: (follow-up) link to Angular PO and SL from Dojo invoice display Signed-off-by: Galen Charlton --- Open-ILS/web/js/dojo/openils/acq/Lineitem.js | 2 +- Open-ILS/web/js/dojo/openils/acq/nls/acq.js | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Open-ILS/web/js/dojo/openils/acq/Lineitem.js b/Open-ILS/web/js/dojo/openils/acq/Lineitem.js index d5a58a0df1..a97f9b172d 100644 --- a/Open-ILS/web/js/dojo/openils/acq/Lineitem.js +++ b/Open-ILS/web/js/dojo/openils/acq/Lineitem.js @@ -148,7 +148,7 @@ openils.acq.Lineitem.fetchAndRender = function(liId, args, callback) { pl = null; if(po) { - liLink = oilsBasePath + '/acq/po/view/' + po.id() + '/' + lineitem.id(); + liLink = '/eg2/en-US/staff/acq/po/' + po.id() + '#' + lineitem.id(); if(po.order_date()) { var date = dojo.date.stamp.fromISOString(po.order_date()); if(date) { diff --git a/Open-ILS/web/js/dojo/openils/acq/nls/acq.js b/Open-ILS/web/js/dojo/openils/acq/nls/acq.js index 0947f21e95..5ffb48a557 100644 --- a/Open-ILS/web/js/dojo/openils/acq/nls/acq.js +++ b/Open-ILS/web/js/dojo/openils/acq/nls/acq.js @@ -64,11 +64,11 @@ "INVOICE_ITEM_DETAILS" : "${0}
${1}
${2}.
Estimated Price: $${3}.
Lineitem ID: ${4}
PO: ${5}
Order Date: ${6}", "INVOICE_CONFIRM_ITEM_DELETE" : "Remove this $${0} '${1}' charge from the invoice?", "INVOICE_CONFIRM_ENTRY_DETACH" : "Remove $${0} charge for item '${1}, ${2} [${3}] from the invoice?", - "LINEITEM_SUMMARY" : "
${0}, by ${1} (${2})
\n
\n${3} Ordered, ${4} Received, ${7} Invoiced, ${8} Claimed, ${9} Cancelled, ${23} Delayed
\n
Estimated $${6}, Encumbered $${16}, Paid $${17}
\n
\n# ${10} ⌘ ${13} ${18}\n❖ ${15}
", + "LINEITEM_SUMMARY" : "
${0}, by ${1} (${2})
\n
\n${3} Ordered, ${4} Received, ${7} Invoiced, ${8} Claimed, ${9} Cancelled, ${23} Delayed
\n
Estimated $${6}, Encumbered $${16}, Paid $${17}
\n
\n# ${10} ⌘ ${13} ${18}\n❖ ${15}
", "INVOICE_CONFIRM_PRORATE" : "Prorate charges?\n\nAny subsequent changes to the invoice that would affect prorated amounts should be resolved manually.", "INVOICE_EXTRA_COPIES" : "You are attempting to invoice ${0} more copies than originally ordered.

To add these items to the original order, select a fund and choose 'Add New Items' below.
After saving the invoice, you may finish editing and importing the new copies from the lineitem details page.", - "INVOICE_ITEM_PO_DETAILS" : "${0}
PO #${3} ${4}
Total Estimated Cost: $${5}", - "INVOICE_ITEM_PO_LABEL" : "PO #${2} ${3}
Total Estimated Cost: $${4}", + "INVOICE_ITEM_PO_DETAILS" : "${0}
PO #${3} ${4}
Total Estimated Cost: $${5}", + "INVOICE_ITEM_PO_LABEL" : "PO #${2} ${3}
Total Estimated Cost: $${4}", "UNNAMED" : "Unnamed", "NO_FIND_INVOICE" : "Could not find that invoice.\nNote that the Invoice # field is case-sensitive.", "LI_BATCH_UPDATE": "Line item batch update", -- 2.11.0