svn commit: r891171 - /ofbiz/trunk/applications/accounting/servicedef/secas_ledger.xml

[jacopoc]

Author: jacopoc
Date: Wed Dec 16 10:04:32 2009
New Revision: 891171

URL: http://svn.apache.org/viewvc?rev=891171&view=rev
Log:
Misc cleanups:
* modified order of seca definitions
* improved and cleaned up comments
* unified two secas with the same conditions into one

Modified:
    ofbiz/trunk/applications/accounting/servicedef/secas_ledger.xml

Modified: ofbiz/trunk/applications/accounting/servicedef/secas_ledger.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/servicedef/secas_ledger.xml?rev=891171&r1=891170&r2=891171&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/servicedef/secas_ledger.xml (original)
+++ ofbiz/trunk/applications/accounting/servicedef/secas_ledger.xml Wed Dec 16 10:04:32 2009
@@ -45,10 +45,13 @@
         <action service="createAcctgTransForShipmentReceipt" mode="sync"/>
     </eca>
 
+    <!-- work effort related transactions -->
+    <eca service="assignInventoryToWorkEffort" event="commit">
+        <action service="createAcctgTransForWorkEffortIssuance" mode="sync"/>
+    </eca>
     <eca service="createWorkEffortInventoryProduced" event="commit">
         <action service="createAcctgTransForWorkEffortInventoryProduced" mode="sync"/>
     </eca>
-
     <eca service="createCostComponent" event="commit">
         <condition field-name="workEffortId" operator="is-not-empty"/>
         <condition field-name="costComponentTypeId" operator="not-equals" value="ACTUAL_MAT_COST"/>
@@ -61,11 +64,7 @@
         <action service="createAcctgTransForInventoryItemOwnerChange" mode="sync"/>
     </eca>
 
-    <eca service="assignInventoryToWorkEffort" event="commit">
-        <action service="createAcctgTransForWorkEffortIssuance" mode="sync"/>
-    </eca>
-
-    <!--creating inventory item detail when unitCost is not empty and recieptId is  empty-->
+    <!-- creating inventory item detail when unitCost is not empty and receiptId is empty -->
     <eca service="createInventoryItemDetail" event="commit">
         <condition field-name="unitCost" operator="is-not-empty"/>
         <condition field-name="receiptId" operator="is-empty"/>
@@ -83,56 +82,45 @@
         <condition field-name="fixedAssetId" operator="is-not-empty"/>
         <action service="createAcctgTransForFixedAssetMaintIssuance" mode="sync"/>
     </eca>
-    <!--attempt to create AcctgTrans and Entries for Incoming Payment -->
-    <eca service="createPayment" event="commit">
-        <condition field-name="statusId" operator="equals" value="PMNT_RECEIVED"/>
-        <action service="createAcctgTransAndEntriesForIncomingPayment" mode="sync"/>
-    </eca>
-    <!--attempt to create AcctgTrans and Entries for Incoming when set PaymentStatus -->
-    <eca service="setPaymentStatus" event="commit">
-        <condition field-name="statusId" operator="equals" value="PMNT_RECEIVED"/>
-        <condition field-name="oldStatusId" operator="not-equals" value="PMNT_RECEIVED"/>
-        <condition field-name="oldStatusId" operator="not-equals" value="PMNT_CONFIRMED"/>
-        <action service="createAcctgTransAndEntriesForIncomingPayment" mode="sync"/>
-    </eca>
 
-    <!-- attempt to create AcctgTrans for Purchase Invoice -->
+    <!-- accounting transactions for Purchase (AP) and Sales Invoices (AR) -->
     <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="createAcctgTransForPurchaseInvoice" mode="sync"/>
+        <action service="createAcctgTransForSalesInvoice" mode="sync"/>
     </eca>
-
-    <!-- attempt to create AcctgTrans for Sales Invoice -->
     <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="createAcctgTransForSalesInvoice" mode="sync"/>
+        <condition field-name="statusId" operator="equals" value="INVOICE_CANCELLED"/>
+        <action service="cancelInvoice" mode="sync"/>
     </eca>
 
-    <!--attempt to create AcctgTrans and Entries for Outgoing Payment -->
+    <!-- accounting transactions for Incoming Payment (AR) -->
+    <eca service="createPayment" event="commit">
+        <condition field-name="statusId" operator="equals" value="PMNT_RECEIVED"/>
+        <action service="createAcctgTransAndEntriesForIncomingPayment" mode="sync"/>
+    </eca>
+    <eca service="setPaymentStatus" event="commit">
+        <condition field-name="statusId" operator="equals" value="PMNT_RECEIVED"/>
+        <condition field-name="oldStatusId" operator="not-equals" value="PMNT_RECEIVED"/>
+        <condition field-name="oldStatusId" operator="not-equals" value="PMNT_CONFIRMED"/>
+        <action service="createAcctgTransAndEntriesForIncomingPayment" mode="sync"/>
+    </eca>
+
+    <!-- accounting transactions for Outgoing Payment (AP) -->
     <eca service="createPayment" event="commit">
         <condition field-name="statusId" operator="equals" value="PMNT_SENT"/>
         <action service="createAcctgTransAndEntriesForOutgoingPayment" mode="sync"/>
     </eca>
-
-    <!--attempt to create AcctgTrans and Entries for Outgoing when set PaymentStatus -->
     <eca service="setPaymentStatus" event="commit">
         <condition field-name="statusId" operator="equals" value="PMNT_SENT"/>
         <condition field-name="oldStatusId" operator="not-equals" value="PMNT_SENT"/>
         <condition field-name="oldStatusId" operator="not-equals" value="PMNT_CONFIRMED"/>
         <action service="createAcctgTransAndEntriesForOutgoingPayment" mode="sync"/>
     </eca>
-    
-    <eca service="setInvoiceStatus" event="commit">
-        <condition field-name="invoiceId" operator="is-not-empty"/>
-        <condition field-name="statusId" operator="equals" value="INVOICE_CANCELLED"/>
-        <action service="cancelInvoice" mode="sync"/>
-    </eca>
 
     <eca service="createPaymentApplication" event="commit">
         <condition field-name="invoiceId" operator="is-not-empty"/>