[OFBiz] SVN: r7153 - in trunk/applications/accounting: data widget

[hansbak@svn.ofbiz.org]

Author: hansbak
Date: 2006-03-31 18:48:30 -0600 (Fri, 31 Mar 2006)
New Revision: 7153

Modified:
   trunk/applications/accounting/data/AccountingTypeData.xml
   trunk/applications/accounting/widget/Menus.xml
Log:
allow invoice status change from send/received to cancelled

Modified: trunk/applications/accounting/data/AccountingTypeData.xml
===================================================================
--- trunk/applications/accounting/data/AccountingTypeData.xml	2006-03-31 19:47:47 UTC (rev 7152)
+++ trunk/applications/accounting/data/AccountingTypeData.xml	2006-04-01 00:48:30 UTC (rev 7153)
@@ -398,12 +398,14 @@
     	<!-- this is the simplest process: IN_PROCESS -> READY or CANCELLED -->
     <StatusValidChange condition="" statusId="INVOICE_IN_PROCESS" statusIdTo="INVOICE_READY" transitionName="Mark Ready"/>
     <StatusValidChange condition="" statusId="INVOICE_IN_PROCESS" statusIdTo="INVOICE_CANCELLED" transitionName="Cancel"/>
-    <!-- this is a more complicated process: IN_PROCESS -> SENT -> (optionally RECEIVED) -> READY -->
+    <!-- this is a more complicated process: IN_PROCESS -> SENT -> (optionally RECEIVED) -> READY or CANCELLED -->
     <StatusValidChange condition="" statusId="INVOICE_IN_PROCESS" statusIdTo="INVOICE_SENT" transitionName="Send"/>
     <StatusValidChange condition="" statusId="INVOICE_IN_PROCESS" statusIdTo="INVOICE_RECEIVED" transitionName="Receive"/>
     <StatusValidChange condition="" statusId="INVOICE_SENT" statusIdTo="INVOICE_READY" transitionName="Mark Ready"/>
     <StatusValidChange condition="" statusId="INVOICE_SENT" statusIdTo="INVOICE_RECEIVED" transitionName="Receive"/>
     <StatusValidChange condition="" statusId="INVOICE_RECEIVED" statusIdTo="INVOICE_READY" transitionName="Mark Receive"/>
+    <StatusValidChange condition="" statusId="INVOICE_SENT" statusIdTo="INVOICE_CANCELLED" transitionName="Cancel"/>
+    <StatusValidChange condition="" statusId="INVOICE_RECEIVED" statusIdTo="INVOICE_CANCELLED" transitionName="Cancel"/>
     <!-- this is a process to enable modification via the Status IN_PROCESS when the receiver/sender wants an invoice change or to cancel it -->
     <StatusValidChange condition="" statusId="INVOICE_SENT" statusIdTo="INVOICE_IN_PROCESS" transitionName="Enable sales invoice update"/>
     <StatusValidChange condition="" statusId="INVOICE_RECEIVED" statusIdTo="INVOICE_IN_PROCESS" transitionName="Enable purch.invoice update"/>

Modified: trunk/applications/accounting/widget/Menus.xml
===================================================================
--- trunk/applications/accounting/widget/Menus.xml	2006-03-31 19:47:47 UTC (rev 7152)
+++ trunk/applications/accounting/widget/Menus.xml	2006-04-01 00:48:30 UTC (rev 7153)
@@ -212,7 +212,11 @@
             <condition>
                 <and>
                     <not><if-empty field-name="invoice.invoiceId"/></not>
-                    <if-compare field-name="invoice.statusId" operator="equals" value="INVOICE_IN_PROCESS"/>
+                    <or>
+                        <if-compare field-name="invoice.statusId" operator="equals" value="INVOICE_IN_PROCESS"/>
+                        <if-compare field-name="invoice.statusId" operator="equals" value="INVOICE_SENT"/>
+                        <if-compare field-name="invoice.statusId" operator="equals" value="INVOICE_RECEIVED"/>
+                    </or>                
                 </and>
             </condition>
             <link target="javascript:confirmActionLink('You want to cancel this invoice number ${invoice.invoiceId}?','setInvoiceStatus?invoiceId=${invoice.invoiceId}&amp;statusId=INVOICE_CANCELLED')" url-mode="plain"/>