You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by jl...@apache.org on 2007/07/13 20:59:08 UTC
svn commit: r556105 - in /ofbiz/trunk/applications:
accounting/webapp/accounting/admin/ accounting/widget/
party/webapp/partymgr/party/ party/widget/partymgr/
Author: jleroux
Date: Fri Jul 13 11:59:07 2007
New Revision: 556105
URL: http://svn.apache.org/viewvc?view=rev&rev=556105
Log:
A patch from Bilgin Ibryam "Replaced hard coded USD in currency dropdowns with defaultCurrencyUomId" (https://issues.apache.org/jira/browse/OFBIZ-1137)
Modified:
ofbiz/trunk/applications/accounting/webapp/accounting/admin/AdminForms.xml
ofbiz/trunk/applications/accounting/widget/AdminScreens.xml
ofbiz/trunk/applications/accounting/widget/AgreementScreens.xml
ofbiz/trunk/applications/accounting/widget/BillingAccountForms.xml
ofbiz/trunk/applications/accounting/widget/BillingAccountScreens.xml
ofbiz/trunk/applications/accounting/widget/FinAccountForms.xml
ofbiz/trunk/applications/accounting/widget/FinAccountScreens.xml
ofbiz/trunk/applications/party/webapp/partymgr/party/PartyForms.xml
ofbiz/trunk/applications/party/widget/partymgr/ProfileScreens.xml
Modified: ofbiz/trunk/applications/accounting/webapp/accounting/admin/AdminForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/webapp/accounting/admin/AdminForms.xml?view=diff&rev=556105&r1=556104&r2=556105
==============================================================================
--- ofbiz/trunk/applications/accounting/webapp/accounting/admin/AdminForms.xml (original)
+++ ofbiz/trunk/applications/accounting/webapp/accounting/admin/AdminForms.xml Fri Jul 13 11:59:07 2007
@@ -79,7 +79,7 @@
</drop-down>
</field>
<field name="baseCurrencyUomId" use-when="partyAcctgPreference==null">
- <drop-down no-current-selected-key="USD">
+ <drop-down no-current-selected-key="${defaultCurrencyUomId}">
<entity-options entity-name="Uom" description="${description}" key-field-name="uomId">
<entity-constraint name="uomTypeId" operator="equals" value="CURRENCY_MEASURE"/>
<entity-order-by field-name="description"/>
@@ -193,7 +193,7 @@
<form name="updateFXConversion" type="single" target="updateFXConversion" default-service-name="updateFXConversion">
<field name="organizationPartyId"><hidden value="${organizationPartyId}"/></field>
<field name="uomId" title="${uiLabelMap.CommonFrom} ${uiLabelMap.CommonCurrency}">
- <drop-down no-current-selected-key="USD">
+ <drop-down no-current-selected-key="${defaultCurrencyUomId}">
<entity-options entity-name="Uom" description="${description}" key-field-name="uomId">
<entity-constraint name="uomTypeId" operator="equals" value="CURRENCY_MEASURE"/>
<entity-order-by field-name="description"/>
@@ -201,7 +201,7 @@
</drop-down>
</field>
<field name="uomIdTo" title="${uiLabelMap.CommonTo} ${uiLabelMap.CommonCurrency}">
- <drop-down no-current-selected-key="USD">
+ <drop-down no-current-selected-key="${defaultCurrencyUomId}">
<entity-options entity-name="Uom" description="${description}" key-field-name="uomId">
<entity-constraint name="uomTypeId" operator="equals" value="CURRENCY_MEASURE"/>
<entity-order-by field-name="description"/>
Modified: ofbiz/trunk/applications/accounting/widget/AdminScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/AdminScreens.xml?view=diff&rev=556105&r1=556104&r2=556105
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/AdminScreens.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/AdminScreens.xml Fri Jul 13 11:59:07 2007
@@ -88,6 +88,7 @@
<set field="tabButtonItem" value="PartyAcctgPreference"/>
<set field="organizationPartyId" from-field="parameters.organizationPartyId"/>
<set field="partyId" from-field="parameters.organizationPartyId"/>
+ <property-to-field field="defaultCurrencyUomId" resource="general" property="currency.uom.id.default" default="USD" />
<entity-one entity-name="PartyAcctgPreference" value-name="partyAcctgPreference"/>
</actions>
<widgets>
@@ -131,6 +132,7 @@
<set field="labelTitleProperty" value="${uiLabelMap.AccountingFX}"/>
<set field="tabButtonItem" value="ViewFXConversions"/>
<set field="organizationPartyId" from-field="parameters.organizationPartyId" global="true"/>
+ <property-to-field field="defaultCurrencyUomId" resource="general" property="currency.uom.id.default" default="USD" />
<!-- TODO: If UomConversionDated is ever used for another type of conversion besides currencies or if some currencies are
stored in UomConversion, we need to change the logic here -->
<entity-condition entity-name="UomConversionDated" list-name="conversions">
Modified: ofbiz/trunk/applications/accounting/widget/AgreementScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/AgreementScreens.xml?view=diff&rev=556105&r1=556104&r2=556105
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/AgreementScreens.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/AgreementScreens.xml Fri Jul 13 11:59:07 2007
@@ -143,7 +143,7 @@
<set field="titleProperty" value="PageTitleEditAgreementItem"/>
<set field="headerItem" value="agreement"/>
<set field="tabButtonItem" value="EditAgreementItem"/>
-
+ <property-to-field field="defaultCurrencyUomId" resource="general" property="currency.uom.id.default" default="USD" />
<set field="agreementId" from-field="parameters.agreementId"/>
<set field="agreementItemSeqId" from-field="parameters.agreementItemSeqId"/>
Modified: ofbiz/trunk/applications/accounting/widget/BillingAccountForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/BillingAccountForms.xml?view=diff&rev=556105&r1=556104&r2=556105
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/BillingAccountForms.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/BillingAccountForms.xml Fri Jul 13 11:59:07 2007
@@ -96,7 +96,7 @@
<field use-when="billingAccount!=null" name="billingAccountId" tooltip="${uiLabelMap.CommonNotModifRecreat}"><display/></field>
<field name="accountCurrencyUomId">
- <drop-down allow-empty="false" no-current-selected-key="USD">
+ <drop-down allow-empty="false" no-current-selected-key="${defaultCurrencyUomId}">
<entity-options entity-name="Uom" description="[${abbreviation}] ${description}" key-field-name="uomId">
<entity-constraint name="uomTypeId" value="CURRENCY_MEASURE"/>
<entity-order-by field-name="abbreviation"/>
Modified: ofbiz/trunk/applications/accounting/widget/BillingAccountScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/BillingAccountScreens.xml?view=diff&rev=556105&r1=556104&r2=556105
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/BillingAccountScreens.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/BillingAccountScreens.xml Fri Jul 13 11:59:07 2007
@@ -100,7 +100,7 @@
<set field="titleProperty" value="PageTitleEditBillingAccount"/>
<set field="headerItem" value="billingaccount"/>
<set field="tabButtonItem" value="EditBillingAccount"/>
-
+ <property-to-field field="defaultCurrencyUomId" resource="general" property="currency.uom.id.default" default="USD" />
<set field="billingAccountId" from-field="parameters.billingAccountId"/>
<entity-one entity-name="BillingAccount" value-name="billingAccount"/>
</actions>
Modified: ofbiz/trunk/applications/accounting/widget/FinAccountForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/FinAccountForms.xml?view=diff&rev=556105&r1=556104&r2=556105
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/FinAccountForms.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/FinAccountForms.xml Fri Jul 13 11:59:07 2007
@@ -71,9 +71,10 @@
</drop-down>
</field>
<field name="currencyUomId" title="${uiLabelMap.CommonCurrency}">
- <drop-down no-current-selected-key="USD">
+ <drop-down no-current-selected-key="${defaultCurrencyUomId}">
<entity-options description="${uomId} - ${description}" entity-name="Uom" key-field-name="uomId">
<entity-constraint name="uomTypeId" operator="equals" value="CURRENCY_MEASURE"/>
+ <entity-order-by field-name="uomId"/>
</entity-options>
</drop-down>
</field>
Modified: ofbiz/trunk/applications/accounting/widget/FinAccountScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/FinAccountScreens.xml?view=diff&rev=556105&r1=556104&r2=556105
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/FinAccountScreens.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/FinAccountScreens.xml Fri Jul 13 11:59:07 2007
@@ -48,6 +48,7 @@
<set field="titleProperty" value="PageTitleEditFinAccount"/>
<set field="tabButtonItem" value="EditFinAccount"/>
<set field="finAccountId" from-field="parameters.finAccountId"/>
+ <property-to-field field="defaultCurrencyUomId" resource="general" property="currency.uom.id.default" default="USD" />
<entity-one entity-name="FinAccount" value-name="finAccount"/>
</actions>
<widgets>
Modified: ofbiz/trunk/applications/party/webapp/partymgr/party/PartyForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/webapp/partymgr/party/PartyForms.xml?view=diff&rev=556105&r1=556104&r2=556105
==============================================================================
--- ofbiz/trunk/applications/party/webapp/partymgr/party/PartyForms.xml (original)
+++ ofbiz/trunk/applications/party/webapp/partymgr/party/PartyForms.xml Fri Jul 13 11:59:07 2007
@@ -487,7 +487,7 @@
</drop-down>
</field>
<field name="currencyUomId">
- <drop-down allow-empty="false" no-current-selected-key="USD">
+ <drop-down allow-empty="false" no-current-selected-key="${defaultCurrencyUomId}">
<entity-options entity-name="Uom" description="[${abbreviation}] ${description}" key-field-name="uomId">
<entity-constraint name="uomTypeId" value="CURRENCY_MEASURE"/>
<entity-order-by field-name="abbreviation"/>
Modified: ofbiz/trunk/applications/party/widget/partymgr/ProfileScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/widget/partymgr/ProfileScreens.xml?view=diff&rev=556105&r1=556104&r2=556105
==============================================================================
--- ofbiz/trunk/applications/party/widget/partymgr/ProfileScreens.xml (original)
+++ ofbiz/trunk/applications/party/widget/partymgr/ProfileScreens.xml Fri Jul 13 11:59:07 2007
@@ -172,6 +172,7 @@
<screen name="FinAccounts">
<section>
<actions>
+ <property-to-field field="defaultCurrencyUomId" resource="general" property="currency.uom.id.default" default="USD" />
<entity-condition entity-name="FinAccount" list-name="ownedFinAccountList" filter-by-date="true">
<condition-expr field-name="ownerPartyId" operator="equals" env-name="parameters.partyId"/>
<order-by field-name="-fromDate"/>