svn commit: r1603434 - in /ofbiz/trunk/applications/accounting/widget: GlSetupForms.xml GlobalGlAccountsForms.xml

[jacopoc]

Author: jacopoc
Date: Wed Jun 18 12:50:41 2014
New Revision: 1603434

URL: http://svn.apache.org/r1603434
Log:
Applied patch from OFBIZ-5592: made more consistent the Chart of Accounts screen in Global GL Settings with the one in Organisational GL Settings.
Thanks to Pierre Smits for the contribution (and to Anahita Goljahani for the tests).

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

Modified: ofbiz/trunk/applications/accounting/widget/GlSetupForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/GlSetupForms.xml?rev=1603434&r1=1603433&r2=1603434&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/GlSetupForms.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/GlSetupForms.xml Wed Jun 18 12:50:41 2014
@@ -46,22 +46,30 @@ under the License.
         <actions>
             <entity-condition entity-name="GlAccountOrganizationAndClass">
                 <condition-expr field-name="organizationPartyId" from-field="organizationPartyId"/>
-                <order-by field-name="glAccountId"/>
+                <order-by field-name="accountCode"/>
             </entity-condition>
         </actions>
-        <auto-fields-entity entity-name="GlAccount" default-field-type="display"/>
-        <field name="glAccountId" widget-style="buttontext">
-            <hyperlink also-hidden="false" description="${glAccountId}" target="GlAccountNavigate">
+        <field name="accountCode" title="${uiLabelMap.CommonCode}" widget-style="buttontext">
+            <hyperlink also-hidden="false" description="${accountCode}" target="GlAccountNavigate">
                 <parameter param-name="glAccountId"/>
             </hyperlink>
         </field>
-        <field name="glAccountClassId">
-            <display-entity entity-name="GlAccountClass"/>
-        </field>
-        <field name="glAccountTypeId">
-            <display-entity entity-name="GlAccountType"/>
-        </field>
         <field name="accountName" entry-name="glAccountId"><display-entity entity-name="GlAccount" key-field-name="glAccountId" description="${accountName}"/></field>
+        <field name="parentGlAccountId">
+            <display-entity entity-name="GlAccount" description="${accountName}" key-field-name="glAccountId">
+                <sub-hyperlink target="GlAccountNavigate" description="[${parentGlAccountId}]" use-when="parentGlAccountId!=null">
+                    <parameter param-name="glAccountId"/>
+                </sub-hyperlink>
+            </display-entity>
+        </field>
+        <field name="glAccountTypeId"><display-entity entity-name="GlAccountType"/></field>
+        <field name="glAccountClassId"><display-entity entity-name="GlAccountClass"/></field>
+        <field name="glResourceTypeId"><display-entity entity-name="GlResourceType"/></field>
+        <field name="glXbrlClassId"><display-entity entity-name="GlXbrlClass"/></field>
+
+        <field name="description"><display/></field>
+        <field name="productId"><display-entity entity-name="Product"/></field>
+        <field name="externalId"><display/></field>
     </form>
 
     <form name="AddCompany" type="single" target="AdminMain" title="" >

Modified: ofbiz/trunk/applications/accounting/widget/GlobalGlAccountsForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/GlobalGlAccountsForms.xml?rev=1603434&r1=1603433&r2=1603434&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/GlobalGlAccountsForms.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/GlobalGlAccountsForms.xml Wed Jun 18 12:50:41 2014
@@ -73,22 +73,17 @@ under the License.
             <service service-name="performFind" result-map="result" result-map-list="listIt">
                 <field-map field-name="inputFields" from-field="parameters"/>
                 <field-map field-name="entityName" from-field="entityName"/>
-                <field-map field-name="orderBy" value="glAccountId"/>
+                <field-map field-name="orderBy" value="accountCode"/>
                 <field-map field-name="noConditionFind" value="Y"/>
             </service>
             <property-to-field field="defaultCurrencyUomId" resource="general" property="currency.uom.id.default" default="USD"/>
         </actions>
-        <!--auto-fields-entity entity-name="GlAccount" default-field-type="display"/-->
-        <field name="glAccountId" title="${uiLabelMap.CommonEdit}" widget-style="buttontext">
-            <hyperlink also-hidden="false" description="${glAccountId}" target="GlAccountNavigate">
+        <field name="accountCode" title="${uiLabelMap.CommonCode}" widget-style="buttontext">
+            <hyperlink also-hidden="false" description="${accountCode}" target="GlAccountNavigate">
                 <parameter param-name="glAccountId"/>
             </hyperlink>
         </field>
         <field name="accountName" entry-name="glAccountId"><display-entity entity-name="GlAccount" key-field-name="glAccountId" description="${accountName}"/></field>
-        <field name="glAccountTypeId"><display-entity entity-name="GlAccountType"/></field>
-        <field name="glAccountClassId"><display-entity entity-name="GlAccountClass"/></field>
-        <field name="glResourceTypeId"><display-entity entity-name="GlResourceType"></display-entity></field>
-        <field name="glXbrlClassId"><display-entity entity-name="GlXbrlClass"></display-entity></field>
         <field name="parentGlAccountId">
             <display-entity entity-name="GlAccount" description="${accountName}" key-field-name="glAccountId">
                 <sub-hyperlink target="GlAccountNavigate" description="[${parentGlAccountId}]" use-when="parentGlAccountId!=null">
@@ -96,7 +91,14 @@ under the License.
                 </sub-hyperlink>
             </display-entity>
         </field>
-        <field name="accountCode"><hidden/></field>
+        <field name="glAccountTypeId"><display-entity entity-name="GlAccountType"/></field>
+        <field name="glAccountClassId"><display-entity entity-name="GlAccountClass"/></field>
+        <field name="glResourceTypeId"><display-entity entity-name="GlResourceType"/></field>
+        <field name="glXbrlClassId"><display-entity entity-name="GlXbrlClass"/></field>
+
+        <field name="description"><display/></field>
+        <field name="productId"><display-entity entity-name="Product"/></field>
+        <field name="externalId"><display/></field>
     </form>
 
     <form name="EditGlAccount" type="single" target="updateGlAccount" title="" default-map-name="glAccount"