From ffca577690a07516769e6f070e739cc24d537ad9 Mon Sep 17 00:00:00 2001 From: erickson Date: Mon, 30 Aug 2010 17:27:37 +0000 Subject: [PATCH] show lineitem ID for each lineitem in lineitem table (po/pl) and general lineitem summary blob (invoicing) git-svn-id: svn://svn.open-ils.org/ILS/trunk@17389 dcc99617-32d9-48b4-a31d-7c20da2025e4 --- Open-ILS/web/js/dojo/openils/acq/nls/acq.js | 2 +- Open-ILS/web/js/ui/default/acq/common/li_table.js | 3 ++- Open-ILS/web/templates/default/acq/common/li_table.tt2 | 5 +++-- 3 files changed, 6 insertions(+), 4 deletions(-) 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 f0b3be9cc..c6e58f572 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
\n⌘ ${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# ${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}", diff --git a/Open-ILS/web/js/ui/default/acq/common/li_table.js b/Open-ILS/web/js/ui/default/acq/common/li_table.js index 00ae185bf..40f1217b4 100644 --- a/Open-ILS/web/js/ui/default/acq/common/li_table.js +++ b/Open-ILS/web/js/ui/default/acq/common/li_table.js @@ -274,11 +274,12 @@ function AcqLiTable() { ); } + nodeByName("liid", row).innerHTML += li.id(); + if(li.eg_bib_id()) { openils.Util.show(nodeByName('catalog', row), 'inline'); nodeByName("catalog_link", row).onclick = this.generateMakeRecTab(li.eg_bib_id()); } else { - // TODO: Add discovery mechanism for bib linking openils.Util.show(nodeByName('link_to_catalog', row), 'inline'); nodeByName("link_to_catalog_link", row).onclick = function() { self.drawBibFinder(li) }; } diff --git a/Open-ILS/web/templates/default/acq/common/li_table.tt2 b/Open-ILS/web/templates/default/acq/common/li_table.tt2 index 7e28783ec..69e91d949 100644 --- a/Open-ILS/web/templates/default/acq/common/li_table.tt2 +++ b/Open-ILS/web/templates/default/acq/common/li_table.tt2 @@ -99,8 +99,9 @@ - - + # + + | ✍ worksheet -- 2.11.0