From 458379df976e523b631b40f202eae7ef17dec757 Mon Sep 17 00:00:00 2001 From: Bill Erickson Date: Fri, 20 Jul 2012 16:17:30 -0400 Subject: [PATCH] acq : invoice running cost total, experimenting Signed-off-by: Bill Erickson --- Open-ILS/src/templates/acq/invoice/view.tt2 | 3 ++- Open-ILS/web/js/ui/default/acq/invoice/view.js | 21 +++++++++++++++++++++ 2 files changed, 23 insertions(+), 1 deletion(-) diff --git a/Open-ILS/src/templates/acq/invoice/view.tt2 b/Open-ILS/src/templates/acq/invoice/view.tt2 index d0aefa401d..8d6aa72bf3 100644 --- a/Open-ILS/src/templates/acq/invoice/view.tt2 +++ b/Open-ILS/src/templates/acq/invoice/view.tt2 @@ -16,7 +16,8 @@

-
[% l("Lineitems: " ) %]0

+
[% l("Lineitems: " ) %]0
+
[% l("Expected Cost: " ) %]0


diff --git a/Open-ILS/web/js/ui/default/acq/invoice/view.js b/Open-ILS/web/js/ui/default/acq/invoice/view.js index a82ce83513..86785cf380 100644 --- a/Open-ILS/web/js/ui/default/acq/invoice/view.js +++ b/Open-ILS/web/js/ui/default/acq/invoice/view.js @@ -595,6 +595,26 @@ function updateReceiveLink(li) { link.onclick = function() { location.href = oilsBasePath + '/acq/invoice/receive/' + invoiceId; }; } +function updateExpectedCost(li, entry) { + + var prevCost = Number(li._expected_cost || 0); + + if (entry.isnew()) { + // total estimated minus any elsewhere invoiced + li._expected_cost = + Number(li.order_summary().estimated_amount() || 0) - + Number(li.order_summary().paid_amount() || 0); + + } else { + + li._expected_cost = Number(entry.cost_billed() || 0); + } + + var total = Number(dojo.byId('acq-invoice-summary-cost').innerHTML || 0); + total += li._expected_cost; + dojo.byId('acq-invoice-summary-cost').innerHTML = total.toFixed(2); +} + function addInvoiceEntry(entry) { openils.Util.removeCSSClass(dojo.byId('acq-invoice-entry-header'), 'hidden'); @@ -625,6 +645,7 @@ function addInvoiceEntry(entry) { nodeByName('title_details', row).innerHTML = html; updateReceiveLink(li); + updateExpectedCost(li, entry); dojo.forEach( ['inv_item_count', 'phys_item_count', 'cost_billed', 'amount_paid'], -- 2.11.0