[open-ils-commits] r17389 - in trunk/Open-ILS/web: js/dojo/openils/acq/nls js/ui/default/acq/common templates/default/acq/common (erickson)
svn at svn.open-ils.org
svn at svn.open-ils.org
Mon Aug 30 13:27:41 EDT 2010
Author: erickson
Date: 2010-08-30 13:27:37 -0400 (Mon, 30 Aug 2010)
New Revision: 17389
Modified:
trunk/Open-ILS/web/js/dojo/openils/acq/nls/acq.js
trunk/Open-ILS/web/js/ui/default/acq/common/li_table.js
trunk/Open-ILS/web/templates/default/acq/common/li_table.tt2
Log:
show lineitem ID for each lineitem in lineitem table (po/pl) and general lineitem summary blob (invoicing)
Modified: trunk/Open-ILS/web/js/dojo/openils/acq/nls/acq.js
===================================================================
--- trunk/Open-ILS/web/js/dojo/openils/acq/nls/acq.js 2010-08-30 17:03:51 UTC (rev 17388)
+++ trunk/Open-ILS/web/js/dojo/openils/acq/nls/acq.js 2010-08-30 17:27:37 UTC (rev 17389)
@@ -59,7 +59,7 @@
"INVOICE_ITEM_DETAILS" : "${0} <br/> ${1} <br/> ${2}. <br/> Estimated Price: $${3}. <br/> Lineitem ID: ${4} <br/> PO: ${5} <br/> 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" : "<div class='acq-lineitem-summary'><a href='${19}'>${0}</a>, by ${1} (${2})</div>\n<div class='acq-lineitem-summary-extra'>\n${3} Ordered, ${4} Received, ${7} Invoiced, ${8} Claimed, ${9} Cancelled</div>\n<div class='acq-lineitem-summary-extra'>Estimated $${6}, Encumbered $${16}, Paid $${17}</div>\n<div class='acq-lineitem-summary-extra'>\n<a style='padding-right: 10px;' class='hidden${20}' href='${11}/acq/po/view/${12}'>⌘ ${13} ${18}</a>\n<a style='padding-right: 10px;' class='hidden${21}' href='${11}/acq/picklist/view/${14}'>❖ ${15}</a></div>",
+ "LINEITEM_SUMMARY" : "<div class='acq-lineitem-summary'><a href='${19}'>${0}</a>, by ${1} (${2})</div>\n<div class='acq-lineitem-summary-extra'>\n${3} Ordered, ${4} Received, ${7} Invoiced, ${8} Claimed, ${9} Cancelled</div>\n<div class='acq-lineitem-summary-extra'>Estimated $${6}, Encumbered $${16}, Paid $${17}</div>\n<div class='acq-lineitem-summary-extra'>\n# ${10} <a style='padding-right: 10px;' class='hidden${20}' href='${11}/acq/po/view/${12}'>⌘ ${13} ${18}</a>\n<a style='padding-right: 10px;' class='hidden${21}' href='${11}/acq/picklist/view/${14}'>❖ ${15}</a></div>",
"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 <b>${0}</b> more copies than originally ordered. <br/><br/>To add these items to the original order, select a fund and choose 'Add New Items' below. <br/>After saving the invoice, you may finish editing and importing the new copies from the lineitem details page.",
"INVOICE_ITEM_PO_DETAILS" : "<b>${0}</b><br/><a href='${1}/acq/po/view/${2}'>PO #${3} ${4}</a><br/>Total Estimated Cost: $${5}",
Modified: trunk/Open-ILS/web/js/ui/default/acq/common/li_table.js
===================================================================
--- trunk/Open-ILS/web/js/ui/default/acq/common/li_table.js 2010-08-30 17:03:51 UTC (rev 17388)
+++ trunk/Open-ILS/web/js/ui/default/acq/common/li_table.js 2010-08-30 17:27:37 UTC (rev 17389)
@@ -274,11 +274,12 @@
);
}
+ 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) };
}
Modified: trunk/Open-ILS/web/templates/default/acq/common/li_table.tt2
===================================================================
--- trunk/Open-ILS/web/templates/default/acq/common/li_table.tt2 2010-08-30 17:03:51 UTC (rev 17388)
+++ trunk/Open-ILS/web/templates/default/acq/common/li_table.tt2 2010-08-30 17:27:37 UTC (rev 17389)
@@ -99,8 +99,9 @@
</tr>
<tr>
<td colspan='0'>
- <span name="catalog" class='hidden'><a title='Show In Catalog' name="catalog_link" href="javascript:void(0);">➟ catalog</a></span>
- <span name="link_to_catalog" class='hidden'><a title='Link To Catalog Record' name="link_to_catalog_link" href="javascript:void(0);">➾ link to catalog</a></span>
+ <span name="liid"># </span>
+ <span name="catalog" class='hidden'> | <a title='Show In Catalog' name="catalog_link" href="javascript:void(0);">➟ catalog</a></span>
+ <span name="link_to_catalog" class='hidden'> | <a title='Link To Catalog Record' name="link_to_catalog_link" href="javascript:void(0);">➾ link to catalog</a></span>
<span name="worksheet"> | <a title='Generate Worksheet' name="worksheet_link" href="javascript:void(0);">✍ worksheet</a></span>
<span name='pl' class='hidden'> | <a title='Select List' name='pl_link' href='javascript:void(0);'>❖ </a></span>
<span name='po' class='hidden'> | <a title='Purchase Order' name='po_link' href='javascript:void(0);'>⌘ </a></span>
More information about the open-ils-commits
mailing list