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:37:09 UTC
svn commit: r1028626 - in /ofbiz/branches/release10.04: ./
applications/accounting/script/org/ofbiz/accounting/ledger/GeneralLedgerServices.xml
applications/accounting/widget/PaymentForms.xml
Author: apatel
Date: Fri Oct 29 06:37:09 2010
New Revision: 1028626
URL: http://svn.apache.org/viewvc?rev=1028626&view=rev
Log:
Applied fix from trunk for revision: 1028625
===
Modified:
ofbiz/branches/release10.04/ (props changed)
ofbiz/branches/release10.04/applications/accounting/script/org/ofbiz/accounting/ledger/GeneralLedgerServices.xml
ofbiz/branches/release10.04/applications/accounting/widget/PaymentForms.xml
Propchange: ofbiz/branches/release10.04/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Oct 29 06:37:09 2010
@@ -1,3 +1,3 @@
/ofbiz/branches/addbirt:831210-885099,885686-886087
/ofbiz/branches/multitenant20100310:921280-927264
-/ofbiz/trunk:939988,939990,939999,940025,940053,940234,940248,940309,940401,940410,940425,940779,940815,940849,940851,941007,941047,941109,941177,941199,941261,941440,941600,941999,942084,942406,942414,942671,942883-942884,943168,943271-943272,944614,944621,944623,944647,944669,944797,944895,945010,945018,945026,945118,945573,945578,945580,945582,945610,945619,945848,945852,945857,946061,946066,946073,946075,946080,946309,946313,946320,946322,946596,947004-947005,947392,947424,947679,947988,948017,948694,949174,949710,949844,950866,950870,950893,951005,951062,951098,951251,951367,951381,951672,952232,952249,952270,953294,953671,954135,954583,954733,954956,955568,956022,956206,956340,957160,958343,958514,958521,958752,958758,958769,958953,959456,960143,960491,960997,963610,964558,965470,965916,966525,966785,967098,978806,978893,978939,979104,980641-980642,980935,981051,981104,981123,981288,983920,983930,985163,985473,985718,985856,985902,987841,989166,990127,990339,990539,991
485,993344,993387,995384,995686,996069,996078-996079,996563,997418-997420,997423-997425,997431,997440,997526,997990,998061,998412,998557,1000621,1000725,1000998,1001099,1001131,1001185,1001574,1001849,1001962,1002963,1003434,1003450,1003829,1004139,1027756,1027960,1028053
+/ofbiz/trunk:939988,939990,939999,940025,940053,940234,940248,940309,940401,940410,940425,940779,940815,940849,940851,941007,941047,941109,941177,941199,941261,941440,941600,941999,942084,942406,942414,942671,942883-942884,943168,943271-943272,944614,944621,944623,944647,944669,944797,944895,945010,945018,945026,945118,945573,945578,945580,945582,945610,945619,945848,945852,945857,946061,946066,946073,946075,946080,946309,946313,946320,946322,946596,947004-947005,947392,947424,947679,947988,948017,948694,949174,949710,949844,950866,950870,950893,951005,951062,951098,951251,951367,951381,951672,952232,952249,952270,953294,953671,954135,954583,954733,954956,955568,956022,956206,956340,957160,958343,958514,958521,958752,958758,958769,958953,959456,960143,960491,960997,963610,964558,965470,965916,966525,966785,967098,978806,978893,978939,979104,980641-980642,980935,981051,981104,981123,981288,983920,983930,985163,985473,985718,985856,985902,987841,989166,990127,990339,990539,991
485,993344,993387,995384,995686,996069,996078-996079,996563,997418-997420,997423-997425,997431,997440,997526,997990,998061,998412,998557,1000621,1000725,1000998,1001099,1001131,1001185,1001574,1001849,1001962,1002963,1003434,1003450,1003829,1004139,1027756,1027960,1028053,1028625
Modified: ofbiz/branches/release10.04/applications/accounting/script/org/ofbiz/accounting/ledger/GeneralLedgerServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release10.04/applications/accounting/script/org/ofbiz/accounting/ledger/GeneralLedgerServices.xml?rev=1028626&r1=1028625&r2=1028626&view=diff
==============================================================================
--- ofbiz/branches/release10.04/applications/accounting/script/org/ofbiz/accounting/ledger/GeneralLedgerServices.xml (original)
+++ ofbiz/branches/release10.04/applications/accounting/script/org/ofbiz/accounting/ledger/GeneralLedgerServices.xml Fri Oct 29 06:37:09 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/branches/release10.04/applications/accounting/widget/PaymentForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release10.04/applications/accounting/widget/PaymentForms.xml?rev=1028626&r1=1028625&r2=1028626&view=diff
==============================================================================
--- ofbiz/branches/release10.04/applications/accounting/widget/PaymentForms.xml (original)
+++ ofbiz/branches/release10.04/applications/accounting/widget/PaymentForms.xml Fri Oct 29 06:37:09 2010
@@ -331,14 +331,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">
@@ -395,14 +388,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>