You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by ap...@apache.org on 2010/10/29 08:34:38 UTC
svn commit: r1028625 - in /ofbiz/trunk/applications/accounting:
script/org/ofbiz/accounting/ledger/GeneralLedgerServices.xml
widget/PaymentForms.xml
Author: apatel
Date: Fri Oct 29 06:34:37 2010
New Revision: 1028625
URL: http://svn.apache.org/viewvc?rev=1028625&view=rev
Log:
Fix issue with posting GlTransaction for payment made to tax authority. Also using geo lookup instead of dropdown, now you are not limited to selecting only from countries.
Modified:
ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/ledger/GeneralLedgerServices.xml
ofbiz/trunk/applications/accounting/widget/PaymentForms.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=1028625&r1=1028624&r2=1028625&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 Oct 29 06:34:37 2010
@@ -2591,9 +2591,9 @@ under the License.
<else>
<if-not-empty field="paymentApplication.taxAuthGeoId">
<entity-one entity-name="TaxAuthorityGlAccount" value-field="taxAuthorityGlAccount">
- <field-map field-name="organizationPartyId" from-field="organizationPartyId"/>
+ <field-map field-name="organizationPartyId" from-field="payment.partyIdFrom"/>
<field-map field-name="taxAuthGeoId" from-field="paymentApplication.taxAuthGeoId"/>
- <field-map field-name="taxAuthPartyId" from-field="partyId"/>
+ <field-map field-name="taxAuthPartyId" from-field="payment.partyIdTo"/>
</entity-one>
<set field="debitEntry.glAccountId" from-field="taxAuthorityGlAccount.glAccountId"/>
</if-not-empty>
Modified: ofbiz/trunk/applications/accounting/widget/PaymentForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/PaymentForms.xml?rev=1028625&r1=1028624&r2=1028625&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/PaymentForms.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/PaymentForms.xml Fri Oct 29 06:34:37 2010
@@ -333,14 +333,7 @@ under the License.
odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
<field name="paymentApplicationId"><hidden/></field>
<field name="paymentId"><hidden/></field>
- <field name="taxAuthGeoId">
- <drop-down allow-empty="true">
- <entity-options entity-name="Geo" key-field-name="geoId" description="${geoName}" cache="true">
- <entity-constraint name="geoTypeId" operator="equals" value="COUNTRY"/>
- <entity-order-by field-name="geoId"/>
- </entity-options>
- </drop-down>
- </field>
+ <field name="taxAuthGeoId"><lookup target-form-name="LookupGeo"/></field>
<field name="amountApplied"><text size="15"/></field>
<field name="updateButton" title="${uiLabelMap.CommonUpdate}" widget-style="buttontext"><submit button-type="text-link"/></field>
<field name="removeButton" title="${uiLabelMap.CommonRemove}" widget-style="buttontext">
@@ -397,14 +390,7 @@ under the License.
<field name="invoiceItemSeqId" use-when=""${uiConfigMap.invoiceProcessing}".equals("YY")"><text size="10"/></field>
<field name="toPaymentId"><lookup target-form-name="LookupPayment"/></field>
<field name="billingAccountId"><lookup target-form-name="LookupBillingAccount"/></field>
- <field name="taxAuthGeoId">
- <drop-down allow-empty="true">
- <entity-options entity-name="Geo" key-field-name="geoId" description="${geoName}" cache="true">
- <entity-constraint name="geoTypeId" operator="equals" value="COUNTRY"/>
- <entity-order-by field-name="geoId"/>
- </entity-options>
- </drop-down>
- </field>
+ <field name="taxAuthGeoId"><lookup target-form-name="LookupGeo"/></field>
<field name="amountToApply" parameter-name="amountApplied" tooltip="${uiLabelMap.AccountingLeaveEmptyForMaximumAmount}"><text/></field>
<field name="invoiceProcessing" use-when=""${uiConfigMap.invoiceProcessing}".equals("Y")"><check/></field>
<field name="invoiceProcessing" use-when=""${uiConfigMap.invoiceProcessing}".equals("N")"><check/></field>