Author: jleroux
Date: Mon Mar 30 12:26:51 2009
New Revision: 759940
URL:
http://svn.apache.org/viewvc?rev=759940&view=revLog:
There has been a duplicate certainly during merges, removed
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=759940&r1=759939&r2=759940&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 Mon Mar 30 12:26:51 2009
@@ -2086,27 +2086,6 @@
<set field="acctgTransEntries[]" from-field="creditEntry" type="Object"/>
</iterate>
- <!-- credit entry for SALES_TAX-->
- <call-class-method method-name="getInvoiceTaxByTaxAuthGeoAndParty" class-name="org.ofbiz.accounting.invoice.InvoiceWorker"
- ret-field="invoiceTaxByTaxAuthGeoAndPartyResult">
- <field field="invoice" type="org.ofbiz.entity.GenericValue"/>
- </call-class-method>
- <set field="taxByTaxAuthGeoAndPartyList" from-field="invoiceTaxByTaxAuthGeoAndPartyResult.taxByTaxAuthGeoAndPartyList"/>
- <set field="invoiceTaxTotal" from-field="invoiceTaxByTaxAuthGeoAndPartyResult.taxGrandTotal"/>
- <iterate list="taxByTaxAuthGeoAndPartyList" entry="taxByTaxAuthGeoAndParty">
- <clear-field field="creditEntry"/>
- <make-value entity-name="AcctgTransEntry" value-field="creditEntry"/>
- <set field="creditEntry.debitCreditFlag" value="C"/>
- <set field="creditEntry.organizationPartyId" from-field="invoice.partyIdFrom"/>
- <set field="creditEntry.origAmount" from-field="taxByTaxAuthGeoAndParty.totalAmount"/>
- <set field="creditEntry.origCurrencyUomId" from-field="invoice.currencyUomId"/>
- <if-not-empty field="taxByTaxAuthGeoAndParty.taxAuthPartyId">
- <set field="creditEntry.partyId" from-field="taxByTaxAuthGeoAndParty.taxAuthPartyId"/>
- <set field="creditEntry.roleTypeId" value="TAX_AUTHORITY"/>
- </if-not-empty>
- <set field="acctgTransEntries[]" from-field="creditEntry" type="Object"/>
- </iterate>
-
<!-- Debit -->
<make-value entity-name="AcctgTransEntry" value-field="debitEntry"/>
<set field="debitEntry.debitCreditFlag" value="D"/>