Author: jacopoc
Date: Fri Feb 15 08:29:36 2008
New Revision: 628106
URL:
http://svn.apache.org/viewvc?rev=628106&view=revLog:
Fixed bug that was preventing, under some special circumstances, the posting of acctg trans for purchase invoices.
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=628106&r1=628105&r2=628106&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 Fri Feb 15 08:29:36 2008
@@ -456,7 +456,6 @@
<field-to-result field-name="partyGlAccount.glAccountId" result-name="glAccountId"/>
<return/>
</if-not-empty>
- <return/>
</then>
</if>
@@ -477,6 +476,7 @@
</and>
</condition>
<then>
+
<entity-one entity-name="Payment" value-name="payment"/>
<get-related-one value-name="payment" relation-name="PaymentMethod" to-value-name="paymentMethod"/>
<if-not-empty field-name="paymentMethod.glAccountId">
@@ -532,6 +532,7 @@
<set field="lookedUpValue.glAccountId" from-field="productGlAccount.glAccountId"/>
</else>
</if-empty>
+
</if-not-empty>
<if>
<condition>
@@ -551,6 +552,7 @@
</and>
</condition>
<then>
+
<if-not-empty field-name="parameters.productId">
<if-compare field-name="parameters.acctgTransTypeId" operator="equals" value="PURCHASE_INVOICE">
<!-- TODO ***: refactor the entity-one into one simple-method call: input organizationPartyId and glAccountTypeId; output glAccountTypeDefault -->