Author: lektran
Date: Sat Jan 3 20:39:18 2009
New Revision: 731171
URL: http://svn.apache.org/viewvc?rev=731171&view=rev
Log:
Removed code which I'm assuming was committed by accident
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=731171&r1=731170&r2=731171&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 Jan 3 20:39:18 2009
@@ -2011,38 +2011,12 @@
<set field="debitEntry.origCurrencyUomId"
from-field="invoice.currencyUomId"/>
<set field="acctgTransEntries[]" from-field="debitEntry"
type="Object"/>
</iterate>
- <!-- debit 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="D"/>
- <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>
<!-- Credit -->
<make-value entity-name="AcctgTransEntry"
value-field="creditEntry"/>
<set field="creditEntry.debitCreditFlag" value="C"/>
<set field="creditEntry.organizationPartyId"
from-field="invoice.partyId"/>
<set field="creditEntry.glAccountTypeId" value="ACCOUNTS_PAYABLE"/>
- <calculate field="totalAmountFromInvoice" type="BigDecimal"
decimal-scale="${ledgerDecimals}" rounding-mode="${roundingMode}">
- <calcop operator="add">
- <calcop operator="get" field="totalAmountFromInvoice"/>
- <calcop operator="get" field="invoiceTaxTotal"/>
- </calcop>
- </calculate>
<set field="creditEntry.origAmount"
from-field="totalAmountFromInvoice"/>
<set field="creditEntry.origCurrencyUomId"
from-field="invoice.currencyUomId"/>
<set field="creditEntry.partyId" from-field="invoice.partyIdFrom"/>
@@ -2111,39 +2085,12 @@
</if-not-empty>
<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"/>
<set field="debitEntry.glAccountTypeId"
value="ACCOUNTS_RECEIVABLE"/>
<set field="debitEntry.organizationPartyId"
from-field="invoice.partyIdFrom"/>
- <calculate field="totalOrigAmount" type="BigDecimal"
decimal-scale="${ledgerDecimals}" rounding-mode="${roundingMode}">
- <calcop operator="add">
- <calcop operator="get" field="totalOrigAmount"/>
- <calcop operator="get" field="invoiceTaxTotal"/>
- </calcop>
- </calculate>
<set field="debitEntry.origAmount" from-field="totalOrigAmount"/>
<set field="debitEntry.origCurrencyUomId"
from-field="invoice.currencyUomId"/>
<set field="debitEntry.partyId" from-field="invoice.partyId"/>
