svn commit: r1675852 - in /ofbiz/trunk/applications/accounting/servicedef: secas.xml secas_invoice.xml

[pranayp]

Author: pranayp
Date: Fri Apr 24 13:29:56 2015
New Revision: 1675852

URL: http://svn.apache.org/r1675852
Log:
Fixed the order in which invoice and payment transactions are created.

Payment transactions were being created prior to invoice transactions, It causes confusion for accountants in real world.

It was a seca execution order which was causing the issue on setInvoiceStatus. Moved the trigger on setInvoiceStatus for checkInvoicePaymentApplications and capturePaymentsByInvoice from secas.xml to secas_invoice.xml, so that we do invoice transactions prior to payment.

Modified:
    ofbiz/trunk/applications/accounting/servicedef/secas.xml
    ofbiz/trunk/applications/accounting/servicedef/secas_invoice.xml

Modified: ofbiz/trunk/applications/accounting/servicedef/secas.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/servicedef/secas.xml?rev=1675852&r1=1675851&r2=1675852&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/servicedef/secas.xml (original)
+++ ofbiz/trunk/applications/accounting/servicedef/secas.xml Fri Apr 24 13:29:56 2015
@@ -158,13 +158,4 @@ under the License.
         <condition field-name="productTypeId" operator="equals" value="ASSET_USAGE"/>
         <action service="createFixedAssetAndLinkToProduct" mode="sync"/>
     </eca>
-
-    <eca service="setInvoiceStatus" event="commit">
-        <condition field-name="invoiceId" operator="is-not-empty"/>
-        <condition field-name="statusId" operator="equals" value="INVOICE_READY"/>
-        <condition field-name="oldStatusId" operator="not-equals" value="INVOICE_READY"/>
-        <condition field-name="oldStatusId" operator="not-equals" value="INVOICE_PAID"/>
-        <action service="checkInvoicePaymentApplications" mode="sync"/>
-        <action service="capturePaymentsByInvoice" mode="sync"/>
-    </eca>
 </service-eca>

Modified: ofbiz/trunk/applications/accounting/servicedef/secas_invoice.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/servicedef/secas_invoice.xml?rev=1675852&r1=1675851&r2=1675852&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/servicedef/secas_invoice.xml (original)
+++ ofbiz/trunk/applications/accounting/servicedef/secas_invoice.xml Fri Apr 24 13:29:56 2015
@@ -47,4 +47,12 @@ under the License.
         <action service="createMatchingPaymentApplication" mode="sync"/>
     </eca>
 
+    <eca service="setInvoiceStatus" event="commit">
+        <condition field-name="invoiceId" operator="is-not-empty"/>
+        <condition field-name="statusId" operator="equals" value="INVOICE_READY"/>
+        <condition field-name="oldStatusId" operator="not-equals" value="INVOICE_READY"/>
+        <condition field-name="oldStatusId" operator="not-equals" value="INVOICE_PAID"/>
+        <action service="checkInvoicePaymentApplications" mode="sync"/>
+        <action service="capturePaymentsByInvoice" mode="sync"/>
+    </eca>
 </service-eca>