From eb51b8892784096e70dcd05c8bfd3c70934ad1da Mon Sep 17 00:00:00 2001 From: Bill Erickson Date: Mon, 2 Jun 2014 17:01:29 -0400 Subject: [PATCH] LP#1270289 Show delay count in ACQ lineitem summary This affects the canned lineitem summary displayed in the lineitem copies page and the invoice UI. Signed-off-by: Bill Erickson Signed-off-by: Kathy Lussier Signed-off-by: Ben Shum --- Open-ILS/web/js/dojo/openils/acq/Lineitem.js | 3 ++- Open-ILS/web/js/dojo/openils/acq/nls/acq.js | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/Open-ILS/web/js/dojo/openils/acq/Lineitem.js b/Open-ILS/web/js/dojo/openils/acq/Lineitem.js index ee69ef71b4..d5a58a0df1 100644 --- a/Open-ILS/web/js/dojo/openils/acq/Lineitem.js +++ b/Open-ILS/web/js/dojo/openils/acq/Lineitem.js @@ -181,7 +181,8 @@ openils.acq.Lineitem.fetchAndRender = function(liId, args, callback) { liLink, (po) ? 'foo' : '', // forces class='hiddenfoo' i.e. not hidden (pl) ? 'foo' : '', // ditto - encodeURIComponent(location.pathname + location.search) + encodeURIComponent(location.pathname + location.search), + lineitem.order_summary().delay_count() || '0' ], function(str) { // prevent long titles from filling up the page 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 11267742f5..674840c9c7 100644 --- a/Open-ILS/web/js/dojo/openils/acq/nls/acq.js +++ b/Open-ILS/web/js/dojo/openils/acq/nls/acq.js @@ -64,7 +64,7 @@ "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
\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}", -- 2.43.2