Author: akashjain
Date: Sat Apr 28 12:33:44 2018
New Revision: 1830449
URL: http://svn.apache.org/viewvc?rev=1830449&view=rev
Log:
Improved: Invoice in status approved - cancel, applied patch from jira issue
with minor changes (OFBIZ-10189)
Thanks, Ingo Wolfmayr for your contribution.
Modified:
ofbiz/ofbiz-framework/trunk/applications/accounting/widget/AccountingMenus.xml
ofbiz/ofbiz-framework/trunk/applications/datamodel/data/seed/AccountingSeedData.xml
Modified:
ofbiz/ofbiz-framework/trunk/applications/accounting/widget/AccountingMenus.xml
URL:
http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/accounting/widget/AccountingMenus.xml?rev=1830449&r1=1830448&r2=1830449&view=diff
==============================================================================
---
ofbiz/ofbiz-framework/trunk/applications/accounting/widget/AccountingMenus.xml
(original)
+++
ofbiz/ofbiz-framework/trunk/applications/accounting/widget/AccountingMenus.xml
Sat Apr 28 12:33:44 2018
@@ -326,6 +326,7 @@ under the License.
<if-compare field="invoice.statusId" operator="equals"
value="INVOICE_SENT"/>
<if-compare field="invoice.statusId" operator="equals"
value="INVOICE_RECEIVED"/>
<if-compare field="invoice.statusId" operator="equals"
value="INVOICE_READY"/>
+ <if-compare field="invoice.statusId" operator="equals"
value="INVOICE_APPROVED"/>
</or>
</and>
</condition>
Modified:
ofbiz/ofbiz-framework/trunk/applications/datamodel/data/seed/AccountingSeedData.xml
URL:
http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/datamodel/data/seed/AccountingSeedData.xml?rev=1830449&r1=1830448&r2=1830449&view=diff
==============================================================================
---
ofbiz/ofbiz-framework/trunk/applications/datamodel/data/seed/AccountingSeedData.xml
(original)
+++
ofbiz/ofbiz-framework/trunk/applications/datamodel/data/seed/AccountingSeedData.xml
Sat Apr 28 12:33:44 2018
@@ -915,6 +915,7 @@ under the License.
<StatusValidChange statusId="INVOICE_IN_PROCESS"
statusIdTo="INVOICE_RECEIVED" transitionName="Receive"/>
<StatusValidChange statusId="INVOICE_RECEIVED"
statusIdTo="INVOICE_APPROVED" transitionName="Approve"/>
<StatusValidChange statusId="INVOICE_APPROVED" statusIdTo="INVOICE_READY"
transitionName="Mark Ready"/>
+ <StatusValidChange statusId="INVOICE_APPROVED"
statusIdTo="INVOICE_CANCELLED" transitionName="Cancel"/>
<!-- finally the invoice can be paid or written off. -->
<StatusValidChange statusId="INVOICE_READY" statusIdTo="INVOICE_PAID"
transitionName="Pay"/>
<StatusValidChange statusId="INVOICE_READY" statusIdTo="INVOICE_WRITEOFF"
transitionName="Write Off"/>
