[open-ils-commits] r16302 - in trunk/Open-ILS/web/js/dojo/openils/acq: . nls (erickson)

[svn at svn.open-ils.org]

Author: erickson
Date: 2010-04-26 09:18:59 -0400 (Mon, 26 Apr 2010)
New Revision: 16302

Modified:
   trunk/Open-ILS/web/js/dojo/openils/acq/Lineitem.js
   trunk/Open-ILS/web/js/dojo/openils/acq/nls/acq.js
Log:
show PO order date in li summary display

Modified: trunk/Open-ILS/web/js/dojo/openils/acq/Lineitem.js
===================================================================
--- trunk/Open-ILS/web/js/dojo/openils/acq/Lineitem.js	2010-04-26 13:18:59 UTC (rev 16301)
+++ trunk/Open-ILS/web/js/dojo/openils/acq/Lineitem.js	2010-04-26 13:18:59 UTC (rev 16302)
@@ -22,6 +22,8 @@
 dojo.require('openils.User');
 dojo.require('openils.Event');
 dojo.require('openils.Util');
+dojo.require('dojo.date.stamp');
+dojo.require('dojo.date.locale');
 
 dojo.requireLocalization('openils.acq', 'acq');
 var localeStrings = dojo.i18n.getLocalization('openils.acq', 'acq');
@@ -139,6 +141,11 @@
 
                 var po = lineitem.purchase_order();
                 var li = lineitem.picklist();
+                var orderDate = '';
+                if(po) {
+                    var date = dojo.date.stamp.fromISOString(po.order_date());
+                    orderDate = dojo.date.locale.format(date, {selector:'date'});
+                }
 
                 var displayString = dojo.string.substitute(
                     localeStrings.LINEITEM_SUMMARY, [
@@ -160,6 +167,7 @@
                         (li) ? li.name() : '',
                         lineitem.order_summary().encumbrance_amount() || '0.00',
                         lineitem.order_summary().paid_amount() || '0.00',
+                        orderDate
                     ]
                 );
 

Modified: trunk/Open-ILS/web/js/dojo/openils/acq/nls/acq.js
===================================================================
--- trunk/Open-ILS/web/js/dojo/openils/acq/nls/acq.js	2010-04-26 13:18:59 UTC (rev 16301)
+++ trunk/Open-ILS/web/js/dojo/openils/acq/nls/acq.js	2010-04-26 13:18:59 UTC (rev 16302)
@@ -64,8 +64,8 @@
             "${3} Ordered, ${4} Received, ${7} Invoiced, ${8} Claimed, ${9} Cancelled</div>" +
         "<div class='acq-lineitem-summary-extra'>Estimated $${6}, Encumbered $${16}, Paid $${17}</div>" +
         "<div class='acq-lineitem-summary-extra'>" +
-            "<a style='padding-right: 10px;' href='${11}/acq/po/view/${12}'>PO: ${13}</a>" +
-            "<a style='padding-right: 10px;' href='${11}/acq/picklist/view/${14}'>SL: ${15}</a></div>",
+            "<a style='padding-right: 10px;' href='${11}/acq/po/view/${12}'>PO#${13} ${18}</a>" +
+            "<a style='padding-right: 10px;' 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.",
     'UNNAMED': "Unnamed",
     'NO_FIND_INVOICE': "Could not find that invoice.\nNote that the Invoice # field is case-sensitive.",