svn commit: r604558 - /ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/ledger/GeneralLedgerServices.xml

[lektran]

Author: lektran
Date: Sat Dec 15 22:18:35 2007
New Revision: 604558

URL: http://svn.apache.org/viewvc?rev=604558&view=rev
Log:
Fixed problem where the createAcctgTransForPurchaseInvoice service was attempting to call createAcctgTransAndEntries even if the invoice type was not PURCHASE_INVOICE

Modified:
    ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/ledger/GeneralLedgerServices.xml

Modified: ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/ledger/GeneralLedgerServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/ledger/GeneralLedgerServices.xml?rev=604558&r1=604557&r2=604558&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/ledger/GeneralLedgerServices.xml (original)
+++ ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/ledger/GeneralLedgerServices.xml Sat Dec 15 22:18:35 2007
@@ -1496,28 +1496,28 @@
                 <set field="debitEntry.origCurrencyUomId" from-field="invoice.currencyUomId"/>
                 <set field="acctgTransEntries[]" from-field="debitEntry" type="Object"/>
             </iterate>
-        </if-compare>
-        <!-- Credit -->
-        <make-value entity-name="AcctgTransEntry" value-name="creditEntry"/>
-        <set field="creditEntry.debitCreditFlag" value="C"/>
-        <set field="creditEntry.organizationPartyId" from-field="invoice.partyId"/>
-        <set field="creditEntry.glAccountTypeId" value="ACCOUNTS_PAYABLE"/>
-        <set field="creditEntry.origAmount" from-field="totalAmountFromInvoice"/>
-        <set field="creditEntry.origCurrencyUomId" from-field="invoice.currencyUomId"/>
-        <set field="creditEntry.partyId" from-field="invoice.partyIdFrom"/>
-        <set field="creditEntry.roleTypeId" value="BILL_FROM_VENDOR"/>
-        <set field="acctgTransEntries[]" from-field="creditEntry" type="Object"/>
+            <!-- Credit -->
+            <make-value entity-name="AcctgTransEntry" value-name="creditEntry"/>
+            <set field="creditEntry.debitCreditFlag" value="C"/>
+            <set field="creditEntry.organizationPartyId" from-field="invoice.partyId"/>
+            <set field="creditEntry.glAccountTypeId" value="ACCOUNTS_PAYABLE"/>
+            <set field="creditEntry.origAmount" from-field="totalAmountFromInvoice"/>
+            <set field="creditEntry.origCurrencyUomId" from-field="invoice.currencyUomId"/>
+            <set field="creditEntry.partyId" from-field="invoice.partyIdFrom"/>
+            <set field="creditEntry.roleTypeId" value="BILL_FROM_VENDOR"/>
+            <set field="acctgTransEntries[]" from-field="creditEntry" type="Object"/>
 
-        <!-- Set header fields (AcctgTrans) -->
-        <set field="createAcctgTransAndEntriesInMap.glFiscalTypeId" value="ACTUAL"/>
-        <set field="createAcctgTransAndEntriesInMap.acctgTransTypeId" value="PURCHASE_INVOICE"/>
-        <set field="createAcctgTransAndEntriesInMap.partyId" from-field="invoice.partyIdFrom"/>
-        <set field="createAcctgTransAndEntriesInMap.roleTypeId" value="BILL_FROM_VENDOR"/>
-        <set field="createAcctgTransAndEntriesInMap.acctgTransEntries" from-field="acctgTransEntries"/>
-        <call-service service-name="createAcctgTransAndEntries" in-map-name="createAcctgTransAndEntriesInMap">
-            <result-to-field result-name="acctgTransId"/>
-        </call-service>
-        <field-to-result field-name="acctgTransId" result-name="acctgTransId"/>
+            <!-- Set header fields (AcctgTrans) -->
+            <set field="createAcctgTransAndEntriesInMap.glFiscalTypeId" value="ACTUAL"/>
+            <set field="createAcctgTransAndEntriesInMap.acctgTransTypeId" value="PURCHASE_INVOICE"/>
+            <set field="createAcctgTransAndEntriesInMap.partyId" from-field="invoice.partyIdFrom"/>
+            <set field="createAcctgTransAndEntriesInMap.roleTypeId" value="BILL_FROM_VENDOR"/>
+            <set field="createAcctgTransAndEntriesInMap.acctgTransEntries" from-field="acctgTransEntries"/>
+            <call-service service-name="createAcctgTransAndEntries" in-map-name="createAcctgTransAndEntriesInMap">
+                <result-to-field result-name="acctgTransId"/>
+            </call-service>
+            <field-to-result field-name="acctgTransId" result-name="acctgTransId"/>
+        </if-compare>
     </simple-method>
     
 </simple-methods>