fixed bug in save+prorate action (passing null ID)

changed default currency textbox width
removed stub number from view invoices link

git-svn-id: svn://svn.open-ils.org/ILS/trunk@16196 dcc99617-32d9-48b4-a31d-7c20da2025e4

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 bac605d..7e9188a 100644 (file)
--- a/Open-ILS/web/js/ui/default/acq/invoice/view.js
+++ b/Open-ILS/web/js/ui/default/acq/invoice/view.js
@@ -168,7 +168,7 @@ function updateTotalCost() {
     var totalCost = 0;    
     if(!totalInvoicedBox) {
         totalInvoicedBox = new dijit.form.CurrencyTextBox(
-            {style : 'width: 5em'}, dojo.byId('acq-invoice-total-invoiced'));
+            {style : 'width: 6em'}, dojo.byId('acq-invoice-total-invoiced'));
     }
     for(var id in widgetRegistry.acqii) 
         if(!widgetRegistry.acqii[id]._object.isdeleted())
@@ -181,7 +181,7 @@ function updateTotalCost() {
     totalPaid = 0;    
     if(!totalPaidBox) {
         totalPaidBox = new dijit.form.CurrencyTextBox(
-            {style : 'width: 5em'}, dojo.byId('acq-invoice-total-paid'));
+            {style : 'width: 6em'}, dojo.byId('acq-invoice-total-paid'));
     }
     for(var id in widgetRegistry.acqii) 
         if(!widgetRegistry.acqii[id]._object.isdeleted())
@@ -255,7 +255,7 @@ function addInvoiceItem(item) {
                     fmClass : 'acqii',
                     fmObject : item,
                     fmField : field,
-                    dijitArgs : (field == 'cost_billed' || field == 'amount_paid') ? {required : true, style : 'width: 5em'} : null,
+                    dijitArgs : (field == 'cost_billed' || field == 'amount_paid') ? {required : true, style : 'width: 6em'} : null,
                     parentNode : nodeByName(field, row)
                 })
             )
@@ -389,7 +389,7 @@ function addInvoiceEntry(entry) {
     dojo.forEach(
         ['inv_item_count', 'phys_item_count', 'cost_billed', 'amount_paid'],
         function(field) {
-            var dijitArgs = {required : true, constraints : {min: 0}, style : 'width:5em'};
+            var dijitArgs = {required : true, constraints : {min: 0}, style : 'width:6em'};
             if(entry.isnew() && field == 'phys_item_count') dijitArgs.value = numReceived;
             registerWidget(
                 entry, 
@@ -508,7 +508,7 @@ function saveChanges(doProrate) {
                 var invoice = openils.Util.readResponse(r);
                 if(invoice) {
                     if(doProrate)
-                        return prorateInvoice();
+                        return prorateInvoice(invoice);
                     location.href = oilsBasePath + '/acq/invoice/view/' + invoice.id();
                 }
             }
@@ -516,7 +516,7 @@ function saveChanges(doProrate) {
     );
 }
 
-function prorateInvoice() {
+function prorateInvoice(invoice) {
     if(!confirm(localeStrings.INVOICE_CONFIRM_PRORATE)) return;
     progressDialog.show(true);
 

diff --git a/Open-ILS/web/templates/default/acq/po/view.tt2 b/Open-ILS/web/templates/default/acq/po/view.tt2
index 828c141..6bbeefc 100644 (file)
--- a/Open-ILS/web/templates/default/acq/po/view.tt2
+++ b/Open-ILS/web/templates/default/acq/po/view.tt2
@@ -54,7 +54,7 @@
                 <tr id='acq-po-view-invoices'> <!-- TODO: hidden until applicable -->
                     <td>Invoicing</td>
                     <td>
-                        <a href="javascript:void(0);" id="acq-po-view-invoice-link">View Invoices(0)</a> / 
+                        <a href="javascript:void(0);" id="acq-po-view-invoice-link">View Invoices</a> / 
                         <a href="javascript:void(0);" id="acq-po-create-invoice-link">Create Invoice</a> / 
                         <a href="javascript:void(0);" id="acq-po-link-invoice-link">Link Invoice</a>
                     </td>