You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by ja...@apache.org on 2007/12/29 10:19:53 UTC
svn commit: r607401 -
/ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/ledger/GeneralLedgerServices.xml
Author: jacopoc
Date: Sat Dec 29 01:19:52 2007
New Revision: 607401
URL: http://svn.apache.org/viewvc?rev=607401&view=rev
Log:
Misc bug fixes to GL auto posting service for payments.
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=607401&r1=607400&r2=607401&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 29 01:19:52 2007
@@ -1906,7 +1906,7 @@
<field field-name="payment" type="org.ofbiz.entity.GenericValue"/>
</call-class-method>
- <if-compare value="true" field-name="isDisbursement" operator="equals">
+ <if-compare value="true" field-name="isDisbursement" operator="equals" type="Boolean">
<set field="organizationPartyId" from-field="payment.partyIdFrom"/>
<set field="partyId" from-field="payment.partyIdTo"/>
<set field="roleTypeId" value="BILL_FROM_VENDOR"/>
@@ -1930,11 +1930,6 @@
<entity-and entity-name="PaymentApplication" list-name="paymentApplications">
<field-map field-name="paymentId" env-name="payment.paymentId"/>
</entity-and>
- <entity-one entity-name="TaxAuthorityGlAccount" value-name="taxAuthorityGlAccount">
- <field-map field-name="organizationPartyId" value="organizationPartyId" />
- <field-map field-name="taxAuthGeoId" env-name="paymentApplications.taxAuthGeoId"/>
- <field-map field-name="taxAuthPartyId" value="partyId"/>
- </entity-one>
<iterate list-name="paymentApplications" entry-name="paymentApplication">
<!-- Debit -->
<make-value entity-name="AcctgTransEntry" value-name="debitEntry"/>
@@ -1947,6 +1942,11 @@
<set field="debitEntry.glAccountId" from-field="paymentApplication.overrideGlAccountId"/>
<else>
<if-not-empty field-name="paymentApplication.taxAuthGeoId">
+ <entity-one entity-name="TaxAuthorityGlAccount" value-name="taxAuthorityGlAccount">
+ <field-map field-name="organizationPartyId" env-name="organizationPartyId" />
+ <field-map field-name="taxAuthGeoId" env-name="paymentApplication.taxAuthGeoId"/>
+ <field-map field-name="taxAuthPartyId" env-name="partyId"/>
+ </entity-one>
<set field="debitEntry.glAccountId" from-field="taxAuthorityGlAccount.glAccountId"/>
<else>
<set field="debitEntry.glAccountId" from-field="payment.overrideGlAccountId"/>
@@ -1956,7 +1956,7 @@
</if-not-empty>
<calculate field-name="amountAppliedTotal" type="BigDecimal" decimal-scale="${ledgerDecimals}" rounding-mode="${roundingMode}">
<calcop operator="add">
- <calcop operator="get" field-name="amountAppliedTotal "/>
+ <calcop operator="get" field-name="amountAppliedTotal"/>
<calcop operator="get" field-name="paymentApplication.amountApplied"/>
</calcop>
</calculate>
@@ -1968,7 +1968,7 @@
<calcop operator="get" field-name="amountAppliedTotal"/>
</calcop>
</calculate>
- <if-compare field-name="amount" operator="greater" value="0">
+ <if-compare field-name="amount" operator="greater" value="0" type="BigDecimal">
<make-value entity-name="AcctgTransEntry" value-name="debitEntryWithDiffAmount"/>
<set field="debitEntryWithDiffAmount.debitCreditFlag" value="D"/>
<set field="debitEntryWithDiffAmount.origAmount" from-field="amount"/>