From: Bill Erickson Date: Fri, 20 Jul 2012 20:17:30 +0000 (-0400) Subject: acq : invoice running cost total, experimenting X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=f13084d976f4fb7d9ce3c69022640db839ae2be8;p=evergreen%2Fequinox.git acq : invoice running cost total, experimenting Signed-off-by: Bill Erickson --- 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 9337575058..6fe4b0e7db 100644 --- a/Open-ILS/web/js/ui/default/acq/invoice/view.js +++ b/Open-ILS/web/js/ui/default/acq/invoice/view.js @@ -645,6 +645,25 @@ function focusLi() { 100); } +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) { @@ -679,6 +698,7 @@ function addInvoiceEntry(entry) { console.log(dojo.byId('li-title-ref-' + li.id())); updateReceiveLink(li); + updateExpectedCost(li, entry); dojo.forEach( ['inv_item_count', 'phys_item_count', 'cost_billed', 'amount_paid'],