svn commit: r643856 - in /ofbiz/trunk/applications/accounting: entitydef/entitymodel.xml widget/AccountingTrees.xml widget/GlobalGlAccountsForms.xml

[jacopoc]

Author: jacopoc
Date: Wed Apr  2 04:33:26 2008
New Revision: 643856

URL: http://svn.apache.org/viewvc?rev=643856&view=rev
Log:
Workarounds to get localized descriptions (if available) for the GL accounts (until we will  extend the support for localized entity content in the form widget).

Modified:
    ofbiz/trunk/applications/accounting/entitydef/entitymodel.xml
    ofbiz/trunk/applications/accounting/widget/AccountingTrees.xml
    ofbiz/trunk/applications/accounting/widget/GlobalGlAccountsForms.xml

Modified: ofbiz/trunk/applications/accounting/entitydef/entitymodel.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/entitydef/entitymodel.xml?rev=643856&r1=643855&r2=643856&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/entitydef/entitymodel.xml (original)
+++ ofbiz/trunk/applications/accounting/entitydef/entitymodel.xml Wed Apr  2 04:33:26 2008
@@ -1678,6 +1678,7 @@
     </entity>
     <entity entity-name="GlAccount"
             package-name="org.ofbiz.accounting.ledger"
+            default-resource-name="ChartOfAccountsEntityLabels"
             title="General Ledger Account Entity">
       <field name="glAccountId" type="id-ne"></field>
       <field name="glAccountTypeId" type="id"></field>

Modified: ofbiz/trunk/applications/accounting/widget/AccountingTrees.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/AccountingTrees.xml?rev=643856&r1=643855&r2=643856&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/AccountingTrees.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/AccountingTrees.xml Wed Apr  2 04:33:26 2008
@@ -30,7 +30,8 @@
             </sub-node>
         </node>
         <node name="node-body">
-            <link target="GlAccountNavigate?glAccountId=${glAccountId}&amp;trail=${currentNodeTrailPiped}" text="${glAccountId} ${accountName} ${postedBalance}"/>
+            <entity-one entity-name="GlAccount" value-name="glAccount"></entity-one>
+            <link target="GlAccountNavigate?glAccountId=${glAccountId}&amp;trail=${currentNodeTrailPiped}" text="${glAccountId} ${glAccount.accountName} ${postedBalance}"/>
             <sub-node node-name="node-body">
                 <entity-and entity-name="GlAccount">
                     <field-map field-name="parentGlAccountId" env-name="glAccountId"/>

Modified: ofbiz/trunk/applications/accounting/widget/GlobalGlAccountsForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/GlobalGlAccountsForms.xml?rev=643856&r1=643855&r2=643856&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/GlobalGlAccountsForms.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/GlobalGlAccountsForms.xml Wed Apr  2 04:33:26 2008
@@ -73,17 +73,16 @@
             </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?glAccountId=${glAccountId}"/>
         </field>
-        <field name="accountName"><display/></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}[${glAccountId}]" key-field-name="glAccountId"></display-entity></field>
+        <field name="parentGlAccountId"><display-entity entity-name="GlAccount" description="${accountName} [${glAccountId}]" key-field-name="glAccountId"></display-entity></field>
         <field name="accountCode"><hidden/></field>
         <field name="postedBalance" widget-area-style="align-text" title-area-style="align-text"><display type="currency" currency="${defaultCurrencyUomId}"/></field>
     </form>