From: Bill Erickson <berickxx@gmail.com>
Date: Mon, 6 Apr 2015 18:54:55 +0000 (-0400)
Subject: LP#1380803 Include direct charges in PO esimated price
X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=dcb45dd9d19ae36cab0b905b9bd13ac62e11e484;p=working%2FEvergreen.git

LP#1380803 Include direct charges in PO esimated price

Move the estimated PO price calculation into the middle layer, along
with the total encumbered and spent calculation.  Add a new
PO.amount_estimated field for carrying the data.

Signed-off-by: Bill Erickson <berickxx@gmail.com>
Signed-off-by: Kathy Lussier <klussier@masslnc.org>

Conflicts:
	Open-ILS/web/js/ui/default/acq/po/view_po.js
---

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 53989cc2da..96aff6abfd 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
@@ -341,6 +341,9 @@ function renderPo() {
 
     setSummaryAmounts();
     dojo.byId("acq-po-view-total-li").innerHTML = PO.lineitem_count();
+    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-total-estimated").innerHTML = PO.amount_estimated().toFixed(2);
     dojo.byId("acq-po-view-state").innerHTML = po_state; // TODO i18n
 
     if(PO.order_date()) {