From: erickson Date: Thu, 2 Sep 2010 17:35:46 +0000 (+0000) Subject: display PO order (activation) date in PO page X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=2ba8064f8610e483b2a6d948f9d82e867f83d18e;p=evergreen%2Fbjwebb.git display PO order (activation) date in PO page git-svn-id: svn://svn.open-ils.org/ILS/trunk@17446 dcc99617-32d9-48b4-a31d-7c20da2025e4 --- 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 c6e58f572..3b8f8b5c9 100644 --- a/Open-ILS/web/js/dojo/openils/acq/nls/acq.js +++ b/Open-ILS/web/js/dojo/openils/acq/nls/acq.js @@ -49,6 +49,7 @@ "FUND_LIST_ROLLOVER_SUMMARY_ROLLOVER_AMOUNT" : "$${1} unspent money rolled over to fiscal year ${0} for the selected locations", "FUND_XFER_SAME_SOURCE_AND_DEST" : "Cannot transfer. The source and destination funds are the same.", "FUND_XFER_CONFIRM" : "Are you sure you're ready to commit this transfer?", + "PO_ACTIVATED_ON" : "Activated ${0}", "PO_CHECKING" : "[One moment...]", "PO_COULD_ACTIVATE" : "Yes.", "PO_WARNING_NO_BLOCK_ACTIVATION" : "Yes; fund ${0} (${1}) would be encumbered beyond its warning level.", diff --git a/Open-ILS/web/js/ui/default/acq/po/view_po.js b/Open-ILS/web/js/ui/default/acq/po/view_po.js index 65b978ab9..92cb39666 100644 --- a/Open-ILS/web/js/ui/default/acq/po/view_po.js +++ b/Open-ILS/web/js/ui/default/acq/po/view_po.js @@ -312,6 +312,21 @@ function renderPo() { dojo.byId("acq-po-view-total-enc").innerHTML = PO.amount_encumbered().toFixed(2); dojo.byId("acq-po-view-total-spent").innerHTML = PO.amount_spent().toFixed(2); dojo.byId("acq-po-view-state").innerHTML = PO.state(); // TODO i18n + + if(PO.order_date()) { + openils.Util.show('acq-po-activated-on', 'inline'); + dojo.byId('acq-po-activated-on').innerHTML = + dojo.string.substitute( + localeStrings.PO_ACTIVATED_ON, [ + dojo.date.locale.format( + dojo.date.stamp.fromISOString(PO.order_date()), + {formatLength:'short'} + ) + ] + ); + + } + makePrepayWidget( dojo.byId("acq-po-view-prepay"), openils.Util.isTrue(PO.prepayment_required()) diff --git a/Open-ILS/web/templates/default/acq/po/view.tt2 b/Open-ILS/web/templates/default/acq/po/view.tt2 index 46358e97b..1f14d9ad2 100644 --- a/Open-ILS/web/templates/default/acq/po/view.tt2 +++ b/Open-ILS/web/templates/default/acq/po/view.tt2 @@ -5,7 +5,10 @@
- Purchase Order () + + Purchase Order () + +
ID