svn commit: r643889 - in /ofbiz/trunk/applications/accounting/widget: GlSetupForms.xml GlSetupScreens.xml

[jacopoc]

Author: jacopoc
Date: Wed Apr  2 05:55:15 2008
New Revision: 643889

URL: http://svn.apache.org/viewvc?rev=643889&view=rev
Log:
Modified some of the form definitions for GL settings to get localized descriptions; bug fixes.

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

Modified: ofbiz/trunk/applications/accounting/widget/GlSetupForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/GlSetupForms.xml?rev=643889&r1=643888&r2=643889&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/GlSetupForms.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/GlSetupForms.xml Wed Apr  2 05:55:15 2008
@@ -533,8 +533,11 @@
         <field name="organizationPartyId"><hidden/></field>
         <field name="glAccountTypeId"><display-entity entity-name="GlAccountType"/></field>
         <field name="glAccountId" title="${uiLabelMap.ProductGlAccount}">
-            <drop-down allow-empty="false">                
-                <list-options key-name="accountCode" list-name="glAccounts" description="${accountCode} ${accountName}"/>    
+            <drop-down allow-empty="false">
+                <entity-options description="${accountCode} ${accountName}" entity-name="GlAccountOrganizationAndClass">
+                    <entity-constraint name="organizationPartyId" operator="equals" env-name="organizationPartyId"/>
+                    <entity-order-by field-name="accountCode"/>
+                </entity-options>
             </drop-down>
         </field>    
         <field name="deleteLink" title="${uiLabelMap.CommonEmptyHeader}" widget-style="buttontext">
@@ -548,12 +551,17 @@
         <field name="organizationPartyId"><hidden/></field>
         <field name="glAccountTypeId" title="${uiLabelMap.ProductAccountType}">
             <drop-down allow-empty="false">
-                <list-options key-name="glAccountTypeId" list-name="productGlAccountTypes" description="${description}"/>
+                <entity-options description="${description}" entity-name="GlAccountType">
+                    <entity-order-by field-name="description"/>
+                </entity-options>
             </drop-down>
         </field>
         <field name="glAccountId" title="${uiLabelMap.ProductGlAccount}">
             <drop-down allow-empty="false">
-                <list-options key-name="accountCode" list-name="glAccounts" description="${accountCode} ${accountName}"/>
+                <entity-options description="${accountCode} ${accountName}" entity-name="GlAccountOrganizationAndClass">
+                    <entity-constraint name="organizationPartyId" operator="equals" env-name="organizationPartyId"/>
+                    <entity-order-by field-name="accountCode"/>
+                </entity-options>
             </drop-down>
         </field>
         <field name="productId" title="${uiLabelMap.AccountingProductId}">
@@ -568,8 +576,11 @@
         <field name="organizationPartyId"><hidden value="${organizationPartyId}"/></field>
         <field name="finAccountTypeId"><display-entity entity-name="FinAccountType"/></field>
         <field name="glAccountId" title="${uiLabelMap.AccountingGlAccountId}">
-            <drop-down allow-empty="false">                
-                <list-options key-name="accountCode" list-name="glAccounts" description="${accountCode} ${accountName}"/>    
+            <drop-down allow-empty="false">
+                <entity-options description="${accountCode} ${accountName}" entity-name="GlAccountOrganizationAndClass">
+                    <entity-constraint name="organizationPartyId" operator="equals" env-name="organizationPartyId"/>
+                    <entity-order-by field-name="accountCode"/>
+                </entity-options>
             </drop-down>
         </field>    
         <field name="deleteLink" title="${uiLabelMap.CommonEmptyHeader}" widget-style="buttontext">
@@ -588,7 +599,10 @@
         </field>
         <field name="glAccountId" title="${uiLabelMap.AccountingGlAccountId}">
             <drop-down allow-empty="false">
-                <list-options key-name="accountCode" list-name="glAccounts" description="${accountCode} ${accountName}"/>
+                <entity-options description="${accountCode} ${accountName}" entity-name="GlAccountOrganizationAndClass">
+                    <entity-constraint name="organizationPartyId" operator="equals" env-name="organizationPartyId"/>
+                    <entity-order-by field-name="accountCode"/>
+                </entity-options>
             </drop-down>
         </field>
         <field name="submitButton" title="${uiLabelMap.CommonAdd}"><submit button-type="button"/></field>
@@ -600,8 +614,11 @@
         <field name="organizationPartyId"><hidden/></field>
         <field name="glAccountTypeId"><display-entity entity-name="GlAccountType"/></field>
         <field name="glAccountId" title="${uiLabelMap.ProductGlAccount}">
-            <drop-down allow-empty="false">                
-                <list-options key-name="accountCode" list-name="glAccounts" description="${accountCode} ${accountName}"/>
+            <drop-down allow-empty="false">
+                <entity-options description="${accountCode} ${accountName}" entity-name="GlAccountOrganizationAndClass">
+                    <entity-constraint name="organizationPartyId" operator="equals" env-name="organizationPartyId"/>
+                    <entity-order-by field-name="accountCode"/>
+                </entity-options>
             </drop-down>
         </field>    
         <field name="deleteLink" title="${uiLabelMap.CommonEmptyHeader}" widget-style="buttontext">
@@ -615,12 +632,17 @@
         <field name="organizationPartyId"><hidden/></field>
         <field name="glAccountTypeId" title="${uiLabelMap.ProductAccountType}">
             <drop-down allow-empty="false">
-                <list-options key-name="glAccountTypeId" list-name="productGlAccountTypes" description="${description}"/>
+                <entity-options description="${description}" entity-name="GlAccountType">
+                    <entity-order-by field-name="description"/>
+                </entity-options>
             </drop-down>
         </field>
         <field name="glAccountId" title="${uiLabelMap.ProductGlAccount}">
             <drop-down allow-empty="false">
-                <list-options key-name="accountCode" list-name="glAccounts" description="${accountCode} ${accountName}"/>
+                <entity-options description="${accountCode} ${accountName}" entity-name="GlAccountOrganizationAndClass">
+                    <entity-constraint name="organizationPartyId" operator="equals" env-name="organizationPartyId"/>
+                    <entity-order-by field-name="accountCode"/>
+                </entity-options>
             </drop-down>
         </field>
         <field name="productCategoryId" title="${uiLabelMap.ProductProductCategoryId}">
@@ -636,7 +658,10 @@
         <field name="varianceReasonId"><display-entity entity-name="VarianceReason"/></field>
         <field name="glAccountId" title="${uiLabelMap.AccountingGlAccountId}">
             <drop-down allow-empty="false">                
-                <list-options key-name="accountCode" list-name="glAccounts" description="${accountCode} ${accountName}"/>
+                <entity-options description="${accountCode} ${accountName}" entity-name="GlAccountOrganizationAndClass">
+                    <entity-constraint name="organizationPartyId" operator="equals" env-name="organizationPartyId"/>
+                    <entity-order-by field-name="accountCode"/>
+                </entity-options>
             </drop-down>
         </field>    
         <field name="deleteLink" title="${uiLabelMap.CommonEmptyHeader}" widget-style="buttontext">
@@ -657,7 +682,10 @@
         </field>
         <field name="glAccountId" title="${uiLabelMap.FormFieldTitle_glAccountTypeId}">
             <drop-down allow-empty="false">
-                <list-options key-name="accountCode" list-name="glAccounts" description="${accountCode} ${accountName}"/>
+                <entity-options description="${accountCode} ${accountName}" entity-name="GlAccountOrganizationAndClass">
+                    <entity-constraint name="organizationPartyId" operator="equals" env-name="organizationPartyId"/>
+                    <entity-order-by field-name="accountCode"/>
+                </entity-options>
             </drop-down>
         </field>
         <field name="submitButton" title="${uiLabelMap.CommonAdd}"><submit button-type="button"/></field>
@@ -669,7 +697,10 @@
         <field name="organizationPartyId"><hidden/></field>
         <field name="glAccountId" title="${uiLabelMap.AccountingGlAccountId}">
             <drop-down allow-empty="false">
-                <list-options key-name="accountCode" list-name="glAccounts" description="${accountCode} ${accountName}"/>
+                <entity-options description="${accountCode} ${accountName}" entity-name="GlAccountOrganizationAndClass">
+                    <entity-constraint name="organizationPartyId" operator="equals" env-name="organizationPartyId"/>
+                    <entity-order-by field-name="accountCode"/>
+                </entity-options>
             </drop-down>
         </field>
         <field name="deleteLink" title="${uiLabelMap.CommonEmptyHeader}" widget-style="buttontext">
@@ -691,7 +722,10 @@
         </field>
         <field name="glAccountId" title="${uiLabelMap.AccountingGlAccountId}">
             <drop-down allow-empty="false">
-               <list-options key-name="accountCode" list-name="glAccounts" description="${accountCode} ${accountName}"/>
+                <entity-options description="${accountCode} ${accountName}" entity-name="GlAccountOrganizationAndClass">
+                    <entity-constraint name="organizationPartyId" operator="equals" env-name="organizationPartyId"/>
+                    <entity-order-by field-name="accountCode"/>
+                </entity-options>
             </drop-down>
         </field>
         <field name="submitButton" title="${uiLabelMap.CommonAdd}"><submit button-type="button"/></field>
@@ -710,8 +744,11 @@
             </display-entity>
         </field>
         <field name="glAccountId" title="${uiLabelMap.AccountingGlAccountId}">
-            <drop-down allow-empty="false">                
-                <list-options key-name="accountCode" list-name="glAccounts" description="${accountCode} ${accountName}"/>
+            <drop-down allow-empty="false">
+                <entity-options description="${accountCode} ${accountName}" entity-name="GlAccountOrganizationAndClass">
+                    <entity-constraint name="organizationPartyId" operator="equals" env-name="organizationPartyId"/>
+                    <entity-order-by field-name="accountCode"/>
+                </entity-options>
             </drop-down>
         </field>    
         <field name="deleteLink" title="${uiLabelMap.CommonEmptyHeader}" widget-style="buttontext">
@@ -733,7 +770,10 @@
         </field>
         <field name="glAccountId" title="${uiLabelMap.${uiLabelMap.AccountingGlAccountId}}">
             <drop-down allow-empty="false">
-                <list-options key-name="accountCode" list-name="glAccounts" description="${accountCode} ${accountName}"/>
+                <entity-options description="${accountCode} ${accountName}" entity-name="GlAccountOrganizationAndClass">
+                    <entity-constraint name="organizationPartyId" operator="equals" env-name="organizationPartyId"/>
+                    <entity-order-by field-name="accountCode"/>
+                </entity-options>
             </drop-down>
         </field>
         <field name="submitButton" title="${uiLabelMap.CommonAdd}"><submit button-type="button"/></field>
@@ -744,8 +784,11 @@
         <auto-fields-service service-name="updatePartyGlAccount" default-field-type="display"/>
         <field name="organizationPartyId"><hidden/></field>      
         <field name="glAccountId" title="${uiLabelMap.AccountingGlAccountId}">
-            <drop-down allow-empty="false">                
-                <list-options key-name="accountCode" list-name="glAccounts" description="${accountCode} ${accountName}"/>
+            <drop-down allow-empty="false">
+                <entity-options description="${accountCode} ${accountName}" entity-name="GlAccountOrganizationAndClass">
+                    <entity-constraint name="organizationPartyId" operator="equals" env-name="organizationPartyId"/>
+                    <entity-order-by field-name="accountCode"/>
+                </entity-options>
             </drop-down>
         </field>    
         <field name="deleteLink" title="${uiLabelMap.CommonEmptyHeader}" widget-style="buttontext">
@@ -775,7 +818,10 @@
         </field>
         <field name="glAccountId" title="${uiLabelMap.AccountingGlAccountId}">
             <drop-down allow-empty="false">
-                <list-options key-name="accountCode" list-name="glAccounts" description="${accountCode} ${accountName}"/>
+                <entity-options description="${accountCode} ${accountName}" entity-name="GlAccountOrganizationAndClass">
+                    <entity-constraint name="organizationPartyId" operator="equals" env-name="organizationPartyId"/>
+                    <entity-order-by field-name="accountCode"/>
+                </entity-options>
             </drop-down>
         </field>
         <field name="submitButton" title="${uiLabelMap.CommonAdd}"><submit button-type="button"/></field>

Modified: ofbiz/trunk/applications/accounting/widget/GlSetupScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/GlSetupScreens.xml?rev=643889&r1=643888&r2=643889&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/GlSetupScreens.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/GlSetupScreens.xml Wed Apr  2 05:55:15 2008
@@ -593,13 +593,6 @@
                     <condition-expr field-name="organizationPartyId" env-name="organizationPartyId"/>
                     <order-by field-name="glAccountTypeId"/>
                 </entity-condition>
-                <entity-condition entity-name="GlAccountType" list-name="productGlAccountTypes" use-cache="true">
-                    <order-by field-name="description"/>
-                </entity-condition>
-                <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>
             <widgets>
                 <decorator-screen name="CommonAdminDecorator">
@@ -652,10 +645,6 @@
                     <condition-expr field-name="organizationPartyId" operator="equals" env-name="organizationPartyId"/>
                     <order-by field-name="finAccountTypeId"/>
                 </entity-condition>
-                <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>
                 <entity-condition entity-name="FinAccountType" list-name="finAccountTypes" use-cache="true">
                     <order-by field-name="finAccountTypeId"/>
                 </entity-condition>
@@ -712,13 +701,6 @@
                     <condition-expr field-name="organizationPartyId" env-name="organizationPartyId"/>
                     <order-by field-name="glAccountTypeId"/>
                 </entity-condition>
-                <entity-condition entity-name="GlAccountType" list-name="productGlAccountTypes" use-cache="true">
-                    <order-by field-name="description"/>
-                </entity-condition>
-                <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>
             <widgets>
                 <decorator-screen name="CommonAdminDecorator">
@@ -771,10 +753,6 @@
                     <condition-expr field-name="organizationPartyId" env-name="organizationPartyId"/>
                     <order-by field-name="glAccountId"/>
                 </entity-condition>
-                <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>
             <widgets>
                 <decorator-screen name="CommonAdminDecorator">
@@ -825,10 +803,6 @@
                 <entity-condition entity-name="CreditCardTypeGlAccount" list-name="creditCardTypeGlAccounts">
                     <condition-expr field-name="organizationPartyId" env-name="organizationPartyId"/>
                 </entity-condition>
-                <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>
             <widgets>
                 <decorator-screen name="CommonAdminDecorator">
@@ -881,10 +855,6 @@
                     <order-by field-name="taxAuthGeoId"/>
                     <order-by field-name="taxAuthPartyId"/>
                 </entity-condition>
-                <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>
                 <script location="component://accounting/webapp/accounting/WEB-INF/actions/chartofaccounts/TaxAuthorityGlAccounts.bsh"/>
             </actions>
             <widgets>
@@ -936,10 +906,6 @@
                 <entity-condition entity-name="PartyGlAccount" list-name="partyGlAccounts">
                     <condition-expr field-name="organizationPartyId" env-name="organizationPartyId"/>
                     <order-by field-name="partyId"/>
-                </entity-condition>
-                <entity-condition entity-name="GlAccountOrganizationAndClass" list-name="glAccounts">
-                    <condition-expr field-name="organizationPartyId" env-name="organizationPartyId"/>
-                    <order-by field-name="accountCode"/>
                 </entity-condition>
             </actions>
             <widgets>