svn commit: r947060 - /ofbiz/branches/release10.04/applications/accounting/webapp/ar/invoice/ListInvoices.ftl

[mo...@apache.org]

Author: mor
Date: Fri May 21 16:18:19 2010
New Revision: 947060

URL: http://svn.apache.org/viewvc?rev=947060&view=rev
Log:
Merged changes from trunk r947055

Received status in not applicable to AR invoice as it was used in running mass operation on invoice selected from the find invoice result page. The correct 
status should be Sent.

Modified:
    ofbiz/branches/release10.04/applications/accounting/webapp/ar/invoice/ListInvoices.ftl

Modified: ofbiz/branches/release10.04/applications/accounting/webapp/ar/invoice/ListInvoices.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/release10.04/applications/accounting/webapp/ar/invoice/ListInvoices.ftl?rev=947060&r1=947059&r2=947060&view=diff
==============================================================================
--- ofbiz/branches/release10.04/applications/accounting/webapp/ar/invoice/ListInvoices.ftl (original)
+++ ofbiz/branches/release10.04/applications/accounting/webapp/ar/invoice/ListInvoices.ftl Fri May 21 16:18:19 2010
@@ -55,15 +55,15 @@ under the License.
     }
 
     function setServiceName(selection) {
-        if ( selection.value == 'massInvoicesToApprove' || selection.value == 'massInvoicesToReceive' || selection.value == 'massInvoicesToReady' || selection.value == 'massInvoicesToPaid' || selection.value == 'massInvoicesToWriteoff' || selection.value == 'massInvoicesToCancel') {
+        if ( selection.value == 'massInvoicesToApprove' || selection.value == 'massInvoicesToSent' || selection.value == 'massInvoicesToReady' || selection.value == 'massInvoicesToPaid' || selection.value == 'massInvoicesToWriteoff' || selection.value == 'massInvoicesToCancel') {
             $('listInvoices').action = $('invoiceStatusChange').value;
         } else {
             $('listInvoices').action = selection.value;
         }
         if (selection.value == 'massInvoicesToApprove') {
             $('statusId').value = "INVOICE_APPROVED";
-        } else if (selection.value == 'massInvoicesToReceive') {
-            $('statusId').value = "INVOICE_RECEIVED";
+        } else if (selection.value == 'massInvoicesToSent') {
+            $('statusId').value = "INVOICE_SENT";
         } else if (selection.value == 'massInvoicesToReady') {
             $('statusId').value = "INVOICE_READY";
         } else if (selection.value == 'massInvoicesToPaid') {
@@ -94,7 +94,7 @@ under the License.
         <option value="">${uiLabelMap.AccountingSelectAction}</option>
         <option value="<@o...@ofbizUrl>">${uiLabelMap.AccountingPrintInvoices}</option>
         <option value="massInvoicesToApprove">${uiLabelMap.AccountingInvoiceStatusToApproved}</option>
-        <option value="massInvoicesToReceive">${uiLabelMap.AccountingInvoiceStatusToReceived}</option>
+        <option value="massInvoicesToSent">${uiLabelMap.AccountingInvoiceStatusToSent}</option>
         <option value="massInvoicesToReady">${uiLabelMap.AccountingInvoiceStatusToReady}</option>
         <option value="massInvoicesToPaid">${uiLabelMap.AccountingInvoiceStatusToPaid}</option>
         <option value="massInvoicesToWriteoff">${uiLabelMap.AccountingInvoiceStatusToWriteoff}</option>