svn commit: r557564 - in /ofbiz/branches/release4.0/applications/accounting: webapp/accounting/admin/ widget/

[lektran]

Author: lektran
Date: Thu Jul 19 03:45:07 2007
New Revision: 557564

URL: http://svn.apache.org/viewvc?view=rev&rev=557564
Log:
Applied fix from trunk for revision: 556105

Modified:
    ofbiz/branches/release4.0/applications/accounting/webapp/accounting/admin/AdminForms.xml
    ofbiz/branches/release4.0/applications/accounting/widget/AdminScreens.xml
    ofbiz/branches/release4.0/applications/accounting/widget/AgreementScreens.xml
    ofbiz/branches/release4.0/applications/accounting/widget/BillingAccountForms.xml
    ofbiz/branches/release4.0/applications/accounting/widget/BillingAccountScreens.xml
    ofbiz/branches/release4.0/applications/accounting/widget/FinAccountForms.xml
    ofbiz/branches/release4.0/applications/accounting/widget/FinAccountScreens.xml

Modified: ofbiz/branches/release4.0/applications/accounting/webapp/accounting/admin/AdminForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release4.0/applications/accounting/webapp/accounting/admin/AdminForms.xml?view=diff&rev=557564&r1=557563&r2=557564
==============================================================================
--- ofbiz/branches/release4.0/applications/accounting/webapp/accounting/admin/AdminForms.xml (original)
+++ ofbiz/branches/release4.0/applications/accounting/webapp/accounting/admin/AdminForms.xml Thu Jul 19 03:45:07 2007
@@ -78,7 +78,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"/>
@@ -183,7 +183,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"/>
@@ -191,7 +191,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/branches/release4.0/applications/accounting/widget/AdminScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release4.0/applications/accounting/widget/AdminScreens.xml?view=diff&rev=557564&r1=557563&r2=557564
==============================================================================
--- ofbiz/branches/release4.0/applications/accounting/widget/AdminScreens.xml (original)
+++ ofbiz/branches/release4.0/applications/accounting/widget/AdminScreens.xml Thu Jul 19 03:45: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/branches/release4.0/applications/accounting/widget/AgreementScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release4.0/applications/accounting/widget/AgreementScreens.xml?view=diff&rev=557564&r1=557563&r2=557564
==============================================================================
--- ofbiz/branches/release4.0/applications/accounting/widget/AgreementScreens.xml (original)
+++ ofbiz/branches/release4.0/applications/accounting/widget/AgreementScreens.xml Thu Jul 19 03:45: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/branches/release4.0/applications/accounting/widget/BillingAccountForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release4.0/applications/accounting/widget/BillingAccountForms.xml?view=diff&rev=557564&r1=557563&r2=557564
==============================================================================
--- ofbiz/branches/release4.0/applications/accounting/widget/BillingAccountForms.xml (original)
+++ ofbiz/branches/release4.0/applications/accounting/widget/BillingAccountForms.xml Thu Jul 19 03:45:07 2007
@@ -30,7 +30,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/branches/release4.0/applications/accounting/widget/BillingAccountScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release4.0/applications/accounting/widget/BillingAccountScreens.xml?view=diff&rev=557564&r1=557563&r2=557564
==============================================================================
--- ofbiz/branches/release4.0/applications/accounting/widget/BillingAccountScreens.xml (original)
+++ ofbiz/branches/release4.0/applications/accounting/widget/BillingAccountScreens.xml Thu Jul 19 03:45:07 2007
@@ -75,7 +75,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/branches/release4.0/applications/accounting/widget/FinAccountForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release4.0/applications/accounting/widget/FinAccountForms.xml?view=diff&rev=557564&r1=557563&r2=557564
==============================================================================
--- ofbiz/branches/release4.0/applications/accounting/widget/FinAccountForms.xml (original)
+++ ofbiz/branches/release4.0/applications/accounting/widget/FinAccountForms.xml Thu Jul 19 03:45: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/branches/release4.0/applications/accounting/widget/FinAccountScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release4.0/applications/accounting/widget/FinAccountScreens.xml?view=diff&rev=557564&r1=557563&r2=557564
==============================================================================
--- ofbiz/branches/release4.0/applications/accounting/widget/FinAccountScreens.xml (original)
+++ ofbiz/branches/release4.0/applications/accounting/widget/FinAccountScreens.xml Thu Jul 19 03:45: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>