svn commit: r779617 - in /ofbiz/trunk/applications/accounting: webapp/accounting/WEB-INF/controller.xml widget/GlSetupScreens.xml widget/GlobalGlAccountsScreens.xml widget/Menus.xml

[jacopoc]

Author: jacopoc
Date: Thu May 28 15:07:59 2009
New Revision: 779617

URL: http://svn.apache.org/viewvc?rev=779617&view=rev
Log:
Moved the screen to manage currency exchange rates to a more meaningful place: from the division specific GL setup screens to the global GL setup screens.

Modified:
    ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/controller.xml
    ofbiz/trunk/applications/accounting/widget/GlSetupScreens.xml
    ofbiz/trunk/applications/accounting/widget/GlobalGlAccountsScreens.xml
    ofbiz/trunk/applications/accounting/widget/Menus.xml

Modified: ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/controller.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/controller.xml?rev=779617&r1=779616&r2=779617&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/controller.xml (original)
+++ ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/controller.xml Thu May 28 15:07:59 2009
@@ -2167,7 +2167,7 @@
     <view-map name="PartyAcctgPreference" type="screen" page="component://accounting/widget/GlSetupScreens.xml#PartyAcctgPreference"/>
     <view-map name="ListGlAccountOrganization" type="screen" page="component://accounting/widget/GlSetupScreens.xml#ListGlAccountOrganization"/>
     <view-map name="SetupGlJournals" type="screen" page="component://accounting/widget/GlSetupScreens.xml#SetupGlJournals"/>
-    <view-map name="ViewFXConversions" type="screen" page="component://accounting/widget/GlSetupScreens.xml#ViewFXConversions"/>
+    <view-map name="ViewFXConversions" type="screen" page="component://accounting/widget/GlobalGlAccountsScreens.xml#ViewFXConversions"/>
     <view-map name="ViewRateAmounts" type="screen" page="component://accounting/widget/GlobalGlAccountsScreens.xml#ViewRateAmounts"/>
     <view-map name="GlAccountTypeDefaults" type="screen" page="component://accounting/widget/GlSetupScreens.xml#GlAccountTypeDefaults"/>
     <view-map name="GlAccountPurInvoice" type="screen" page="component://accounting/widget/GlSetupScreens.xml#GlAccountPurInvoice"/>

Modified: ofbiz/trunk/applications/accounting/widget/GlSetupScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/GlSetupScreens.xml?rev=779617&r1=779616&r2=779617&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/GlSetupScreens.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/GlSetupScreens.xml Thu May 28 15:07:59 2009
@@ -224,36 +224,6 @@
             </widgets>
         </section>
     </screen>
-    <!-- Screen to view and manage foreign exchange conversions -->
-    <screen name="ViewFXConversions">
-        <section>
-            <actions>
-                <property-map resource="AccountingUiLabels" map-name="uiLabelMap" global="true"/>
-                <set field="titleProperty" value="AccountingFX"/>
-                <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="conversions">
-                    <order-by field-name="uomId"/>
-                    <order-by field-name="uomIdTo"/>
-                    <order-by field-name="fromDate"/>
-                </entity-condition>
-            </actions>
-            <widgets>
-                <decorator-screen name="CommonAdminDecorator">
-                    <decorator-section name="body">
-                        <screenlet id="FxConversionPanel" title="${uiLabelMap.AccountingUpdateFX}" collapsible="true">
-                            <include-form name="updateFXConversion" location="component://accounting/widget/GlSetupForms.xml"/>
-                        </screenlet>
-                        <include-form name="ListConversions" location="component://accounting/widget/GlSetupForms.xml"/>
-                    </decorator-section>
-                </decorator-screen>
-            </widgets>
-        </section>
-    </screen>
     <screen name="SetupGlJournals">
         <section>
             <actions>

Modified: ofbiz/trunk/applications/accounting/widget/GlobalGlAccountsScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/GlobalGlAccountsScreens.xml?rev=779617&r1=779616&r2=779617&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/GlobalGlAccountsScreens.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/GlobalGlAccountsScreens.xml Thu May 28 15:07:59 2009
@@ -431,4 +431,33 @@
             </widgets>
         </section>
     </screen>
+    <!-- Screen to view and manage foreign exchange conversions -->
+    <screen name="ViewFXConversions">
+        <section>
+            <actions>
+                <property-map resource="AccountingUiLabels" map-name="uiLabelMap" global="true"/>
+                <set field="titleProperty" value="AccountingFX"/>
+                <set field="labelTitleProperty" value="${uiLabelMap.AccountingFX}"/>
+                <set field="tabButtonItem" value="ViewFXConversions"/>
+                <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="conversions">
+                    <order-by field-name="uomId"/>
+                    <order-by field-name="uomIdTo"/>
+                    <order-by field-name="fromDate"/>
+                </entity-condition>
+            </actions>
+            <widgets>
+                <decorator-screen name="GlobalGLSettingsDecorator" location="${parameters.mainDecoratorLocation}">
+                    <decorator-section name="body">
+                        <screenlet id="FxConversionPanel" title="${uiLabelMap.AccountingUpdateFX}" collapsible="true">
+                            <include-form name="updateFXConversion" location="component://accounting/widget/GlSetupForms.xml"/>
+                        </screenlet>
+                        <include-form name="ListConversions" location="component://accounting/widget/GlSetupForms.xml"/>
+                    </decorator-section>
+                </decorator-screen>
+            </widgets>
+        </section>
+    </screen>
 </screens>
\ No newline at end of file

Modified: ofbiz/trunk/applications/accounting/widget/Menus.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/Menus.xml?rev=779617&r1=779616&r2=779617&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/Menus.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/Menus.xml Thu May 28 15:07:59 2009
@@ -689,14 +689,6 @@
                 <parameter param-name="organizationPartyId"/>
             </link>
         </menu-item>
-        <menu-item name="ViewFXConversions" title="${uiLabelMap.AccountingFX}">
-            <condition>
-                <if-service-permission service-name="acctgFxPermissionCheck" main-action="UPDATE"/>
-            </condition>
-            <link target="viewFXConversions">
-                <parameter param-name="organizationPartyId"/>
-            </link>
-        </menu-item>
     </menu>
     <menu name="PartyAdminAssignTabBar" extends="CommonTabBarMenu" extends-resource="component://common/widget/CommonMenus.xml"
           selected-menuitem-context-field-name="tabButtonItem2" default-menu-item-name="GlAccountSalInvoice">
@@ -796,6 +788,14 @@
         <menu-item name="ViewRateAmounts" title="${uiLabelMap.AccountingRates}">
             <link target="viewRateAmounts"/>
         </menu-item>
+        <menu-item name="ViewFXConversions" title="${uiLabelMap.AccountingFX}">
+            <condition>
+                <if-service-permission service-name="acctgFxPermissionCheck" main-action="UPDATE"/>
+            </condition>
+            <link target="viewFXConversions">
+                <parameter param-name="organizationPartyId"/>
+            </link>
+        </menu-item>
     </menu>
 
     <menu name="AgreementTabBar" extends="CommonTabBarMenu" extends-resource="component://common/widget/CommonMenus.xml">