From 582e8c7822cd66efb566ff81cabc072126f9179b Mon Sep 17 00:00:00 2001 From: erickson Date: Thu, 19 Aug 2010 15:01:53 +0000 Subject: [PATCH] for consistency, use same 'icons' to indicate PO and PL. don't show PO/PL links when no such object is linked to the lineitem git-svn-id: svn://svn.open-ils.org/ILS/trunk@17264 dcc99617-32d9-48b4-a31d-7c20da2025e4 --- Open-ILS/web/js/dojo/openils/acq/Lineitem.js | 7 ++++++- Open-ILS/web/js/dojo/openils/acq/nls/acq.js | 2 +- 2 files changed, 7 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 3ce519a2b..27ed9e3fd 100644 --- a/Open-ILS/web/js/dojo/openils/acq/Lineitem.js +++ b/Open-ILS/web/js/dojo/openils/acq/Lineitem.js @@ -144,6 +144,9 @@ openils.acq.Lineitem.fetchAndRender = function(liId, args, callback) { var orderDate = ''; var liLink = ''; + if(pl.name() == '') // special pl + pl = null; + if(po) { liLink = oilsBasePath + '/acq/po/view/' + po.id() + '/' + lineitem.id(); if(po.order_date()) { @@ -175,7 +178,9 @@ openils.acq.Lineitem.fetchAndRender = function(liId, args, callback) { lineitem.order_summary().encumbrance_amount() || '0.00', lineitem.order_summary().paid_amount() || '0.00', orderDate, - liLink + liLink, + (po) ? 'foo' : '', // forces class='hiddenfoo' i.e. not hidden + (pl) ? 'foo' : '', // ditto ] ); 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 f8f37815f..f0b3be9cc 100644 --- a/Open-ILS/web/js/dojo/openils/acq/nls/acq.js +++ b/Open-ILS/web/js/dojo/openils/acq/nls/acq.js @@ -59,7 +59,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
\nPO #${13} ${18}\n${15}
", + "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⌘ ${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.11.0