acq invoice : price per copy column; more ui cleanup in progress

Signed-off-by: Bill Erickson <berick@esilibrary.com>

diff --git a/Open-ILS/src/templates/acq/invoice/view.tt2 b/Open-ILS/src/templates/acq/invoice/view.tt2
index dd6c712..2503964 100644 (file)
--- a/Open-ILS/src/templates/acq/invoice/view.tt2
+++ b/Open-ILS/src/templates/acq/invoice/view.tt2
@@ -161,7 +161,11 @@
                                         dojoType='dijit.form.Button' onclick='saveChanges({reopen:true});'>[% l('Reopen') %]</button>
                                 </span>
                             </td>
-                            <td class='acq-invoice-center-col'><div jsId='totalInvoicedBox' dojoType='dijit.form.CurrencyTextBox' style='width:9em;'></div></td>
+                            <!--
+                            <td class='acq-invoice-center-col'><div jsId='totalInvoicedBox' readOnly='true'  dojoType='dijit.form.CurrencyTextBox' style='width:9em;'></div></td>
+                            -->
+                            <td class='acq-invoice-center-col'><div id='acq-total-invoiced-box' jsId='totalInvoicedBox' style='width:9em;'></div></td>
+                            <td/>
                             <td class='acq-invoice-paid-col'><div jsId='totalPaidBox' dojoType='dijit.form.CurrencyTextBox' style='width:9em;'></div></td>
                             <td class='acq-invoice-center-col'><div jsId='balanceOwedBox' dojoType='dijit.form.CurrencyTextBox' style='width:9em;'></div></td>
                         </tr>

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 3e64528..16f1625 100644 (file)
--- a/Open-ILS/web/js/ui/default/acq/invoice/view.js
+++ b/Open-ILS/web/js/ui/default/acq/invoice/view.js
@@ -398,7 +398,9 @@ function updateTotalCost() {
     for(var id in widgetRegistry.acqie) 
         if(!widgetRegistry.acqie[id]._object.isdeleted())
             totalCost += Number(widgetRegistry.acqie[id].cost_billed.getFormattedValue());
-    totalInvoicedBox.attr('value', totalCost);
+    totalInvoicedBox = dojo.byId('acq-total-invoiced-box');
+    //totalInvoicedBox.attr('value', totalCost);
+    totalInvoicedBox.innerHTML = totalCost;
 
     totalPaid = 0;    
     for(var id in widgetRegistry.acqii) 
@@ -423,11 +425,14 @@ function updateTotalCost() {
     }
 
     if(totalCost < 0) {
-        openils.Util.addCSSClass(totalInvoicedBox.domNode, 'acq-invoice-invalid-amount');
+        //openils.Util.addCSSClass(totalInvoicedBox.domNode, 'acq-invoice-invalid-amount');
+        console.log('here totalCost < 0');
+        openils.Util.addCSSClass(totalInvoicedBox, 'acq-invoice-invalid-amount');
         invoiceSaveButton.attr('disabled', true);
         invoiceProrateButton.attr('disabled', true);
     } else {
-        openils.Util.removeCSSClass(totalInvoicedBox.domNode, 'acq-invoice-invalid-amount');
+        //openils.Util.removeCSSClass(totalInvoicedBox.domNode, 'acq-invoice-invalid-amount');
+        openils.Util.removeCSSClass(totalInvoicedBox, 'acq-invoice-invalid-amount');
         if(!buttonsDisabled) {
             invoiceSaveButton.attr('disabled', false);
             invoiceProrateButton.attr('disabled', false);