svn commit: r598906 - in /ofbiz/trunk/applications/accounting/widget: GlSetupScreens.xml Menus.xml

[jacopoc]

Author: jacopoc
Date: Wed Nov 28 00:25:52 2007
New Revision: 598906

URL: http://svn.apache.org/viewvc?rev=598906&view=rev
Log:
Small improvements to the screen to edit ProductGlAccounts:
1) moved as a menu subitems of the 'Gl Accounts default' menu
2) the list of account id is filtered out by organization using the GlAccountOrganizationAndClass entity

Part of issue: OFBIZ-1435

Modified:
    ofbiz/trunk/applications/accounting/widget/GlSetupScreens.xml
    ofbiz/trunk/applications/accounting/widget/Menus.xml

Modified: ofbiz/trunk/applications/accounting/widget/GlSetupScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/GlSetupScreens.xml?rev=598906&r1=598905&r2=598906&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/GlSetupScreens.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/GlSetupScreens.xml Wed Nov 28 00:25:52 2007
@@ -296,7 +296,8 @@
                 <property-map resource="AccountingUiLabels" map-name="uiLabelMap" global="true"/>                
                 <set field="titleProperty" value="AccountingProductGlAccount"/>
                 <set field="labelTitleProperty" value="${uiLabelMap.AccountingProductGlAccount}"/>
-                <set field="tabButtonItem" value="ProductGlAccounts"/>
+                <set field="tabButtonItem" value="GlAccountAssignment"/>
+                <set field="tabButtonItem2" value="ProductGlAccounts"/>
                 <set field="organizationPartyId" from-field="parameters.organizationPartyId" />
                 
                 <entity-condition entity-name="ProductGlAccount" list-name="productGlAccounts">
@@ -306,7 +307,8 @@
                 <entity-condition entity-name="GlAccountType" list-name="productGlAccountTypes" use-cache="true">
                     <order-by field-name="description"/>
                 </entity-condition>
-                <entity-condition entity-name="GlAccount" list-name="glAccounts" use-cache="true">
+                <entity-condition entity-name="GlAccountOrganizationAndClass" list-name="glAccounts" use-cache="true">
+                    <condition-expr field-name="organizationPartyId" env-name="organizationPartyId"/>
                     <order-by field-name="accountCode"/>
                 </entity-condition>
             </actions>

Modified: ofbiz/trunk/applications/accounting/widget/Menus.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/Menus.xml?rev=598906&r1=598905&r2=598906&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/Menus.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/Menus.xml Wed Nov 28 00:25:52 2007
@@ -448,14 +448,14 @@
         <menu-item name="ViewFXConversions" title="${uiLabelMap.AccountingFX}">
             <link target="viewFXConversions?organizationPartyId=${organizationPartyId}"/>
         </menu-item>
-        <menu-item name="ProductGlAccounts" title="${uiLabelMap.AccountingProductGlAccount}">
-            <link target="editProductGlAccounts?organizationPartyId=${organizationPartyId}"/>
-        </menu-item>
     </menu>
     <menu name="PartyAdminAssignTabBar" selected-menuitem-context-field-name="tabButtonItem2" default-menu-item-name="GlAccountSalInvoice" default-selected-style="selected"
         menu-container-style="button-bar tab-bar" type="simple">
         <menu-item name="GlAccountTypeDefaults" title="${uiLabelMap.AccountingGlAccountTypeDefaults}">
             <link target="GlAccountTypeDefaults?organizationPartyId=${organizationPartyId}"/>
+        </menu-item>
+        <menu-item name="ProductGlAccounts" title="${uiLabelMap.AccountingProductGlAccount}">
+            <link target="editProductGlAccounts?organizationPartyId=${organizationPartyId}"/>
         </menu-item>
         <menu-item name="GlAccountSalInvoice" title="${uiLabelMap.AccountingInvoiceSales}">
             <link target="GlAccountSalInvoice?organizationPartyId=${organizationPartyId}"/>