svn commit: r789249 - in /ofbiz/trunk/applications/acco
Locked
 
|
Author: ashish
Date: Mon Jun 29 08:00:46 2009 New Revision: 789249 URL: http://svn.apache.org/viewvc?rev=789249&view=rev Log: Reverted my changes from previous commit for populating GlAccount entity related field in Combo box. Now the default format will be sorted by accountCode: ${accountCode}-${accountName} [${glAccountId}] - As per David's suggestion on dev list. Thanks Jacopo & David for your valuable input. Modified: ofbiz/trunk/applications/accounting/widget/GlForms.xml ofbiz/trunk/applications/accounting/widget/GlSetupForms.xml ofbiz/trunk/applications/accounting/widget/GlobalGlAccountsForms.xml Modified: ofbiz/trunk/applications/accounting/widget/GlForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/GlForms.xml?rev=789249&r1=789248&r2=789249&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/widget/GlForms.xml (original) +++ ofbiz/trunk/applications/accounting/widget/GlForms.xml Mon Jun 29 08:00:46 2009 @@ -191,10 +191,8 @@ </field> <field name="glAccountId"> <drop-down allow-empty="true"> - <entity-options entity-name="GlAccountOrganizationAndClass" description="${accountName} [${glAccountId}] [${accountCode}]"> + <entity-options entity-name="GlAccountOrganizationAndClass" description="${accountCode} - ${accountName} [${glAccountId}]"> <entity-constraint name="organizationPartyId" operator="equals" env-name="organizationPartyId"/> - <entity-order-by field-name="accountName"/> - <entity-order-by field-name="glAccountId"/> <entity-order-by field-name="accountCode"/> </entity-options> </drop-down> @@ -454,39 +452,35 @@ <field name="workEffortId"><lookup target-form-name="LookupWorkEffort" size="20" maxlength="20"/></field> <field name="debitGlAccountId" use-when="debitGlAccountClassId!=null"> <drop-down> - <entity-options entity-name="GlAccountOrganizationAndClass" key-field-name="glAccountId" description="${accountName} [${glAccountId}]"> + <entity-options entity-name="GlAccountOrganizationAndClass" key-field-name="glAccountId" description="${accountCode} - ${accountName} [${glAccountId}]"> <entity-constraint name="organizationPartyId" operator="equals" env-name="parameters.organizationPartyId"/> <entity-constraint name="glAccountClassId" operator="equals" env-name="debitGlAccountClassId" ignore-if-null="true"/> - <entity-order-by field-name="accountName"/> - <entity-order-by field-name="glAccountId"/> + <entity-order-by field-name="accountCode"/> </entity-options> </drop-down> </field> <field name="debitGlAccountId" use-when="debitGlAccountClassId==null"> <drop-down> - <entity-options entity-name="GlAccountOrganizationAndClass" key-field-name="glAccountId" description="${accountName} [${glAccountId}]"> + <entity-options entity-name="GlAccountOrganizationAndClass" key-field-name="glAccountId" description="${accountCode} - ${accountName} [${glAccountId}]"> <entity-constraint name="organizationPartyId" operator="equals" env-name="parameters.organizationPartyId"/> - <entity-order-by field-name="accountName"/> - <entity-order-by field-name="glAccountId"/> + <entity-order-by field-name="accountCode"/> </entity-options> </drop-down> </field> <field name="creditGlAccountId" use-when="creditGlAccountClassId!=null"> <drop-down> - <entity-options entity-name="GlAccountOrganizationAndClass" key-field-name="glAccountId" description="${accountName} [${glAccountId}]"> + <entity-options entity-name="GlAccountOrganizationAndClass" key-field-name="glAccountId" description="${accountCode} - ${accountName} [${glAccountId}]"> <entity-constraint name="organizationPartyId" operator="equals" env-name="parameters.organizationPartyId"/> <entity-constraint name="glAccountClassId" operator="equals" env-name="creditGlAccountClassId" ignore-if-null="true"/> - <entity-order-by field-name="accountName"/> - <entity-order-by field-name="glAccountId"/> + <entity-order-by field-name="accountCode"/> </entity-options> </drop-down> </field> <field name="creditGlAccountId" use-when="creditGlAccountClassId==null"> <drop-down> - <entity-options entity-name="GlAccountOrganizationAndClass" key-field-name="glAccountId" description="${accountName} [${glAccountId}]"> + <entity-options entity-name="GlAccountOrganizationAndClass" key-field-name="glAccountId" description="${accountCode} - ${accountName} [${glAccountId}]"> <entity-constraint name="organizationPartyId" operator="equals" env-name="parameters.organizationPartyId"/> - <entity-order-by field-name="accountName"/> - <entity-order-by field-name="glAccountId"/> + <entity-order-by field-name="accountCode"/> </entity-options> </drop-down> </field> @@ -565,10 +559,9 @@ </field> <field name="glAccountId"> <drop-down allow-empty="true"> - <entity-options entity-name="GlAccountOrganizationAndClass" key-field-name="glAccountId" description="${accountName} [${glAccountId}]"> + <entity-options entity-name="GlAccountOrganizationAndClass" key-field-name="glAccountId" description="${accountCode} - ${accountName} [${glAccountId}]"> <entity-constraint name="organizationPartyId" operator="equals" env-name="parameters.organizationPartyId"/> - <entity-order-by field-name="accountName"/> - <entity-order-by field-name="glAccountId"/> + <entity-order-by field-name="accountCode"/> </entity-options> </drop-down> </field> @@ -618,10 +611,9 @@ </field> <field name="glAccountId"> <drop-down allow-empty="true"> - <entity-options entity-name="GlAccountOrganizationAndClass" key-field-name="glAccountId" description="${accountName} [${glAccountId}]"> + <entity-options entity-name="GlAccountOrganizationAndClass" key-field-name="glAccountId" description="${accountCode} - ${accountName} [${glAccountId}]"> <entity-constraint name="organizationPartyId" operator="equals" env-name="parameters.organizationPartyId"/> - <entity-order-by field-name="accountName"/> - <entity-order-by field-name="glAccountId"/> + <entity-order-by field-name="accountCode"/> </entity-options> </drop-down> </field> @@ -728,9 +720,8 @@ <field name="organizationPartyId"><hidden/></field> <field name="glAccountId"> <drop-down allow-empty="false"> - <entity-options entity-name="GlAccount" description="${accountName} [${glAccountId}]" key-field-name="glAccountId"> - <entity-order-by field-name="accountName"/> - <entity-order-by field-name="glAccountId"/> + <entity-options entity-name="GlAccount" description="${accountCode} - ${accountName} [${glAccountId}]" key-field-name="glAccountId"> + <entity-order-by field-name="accountCode"/> </entity-options> </drop-down> </field> @@ -792,9 +783,8 @@ <field name="organizationPartyId"><hidden/></field> <field name="glAccountId"> <drop-down allow-empty="false"> - <entity-options entity-name="GlAccount" description="${accountName} [${glAccountId}]" key-field-name="glAccountId"> - <entity-order-by field-name="accountName"/> - <entity-order-by field-name="glAccountId"/> + <entity-options entity-name="GlAccount" description="${accountCode} - ${accountName} [${glAccountId}]" key-field-name="glAccountId"> + <entity-order-by field-name="accountCode"/> </entity-options> </drop-down> </field> Modified: ofbiz/trunk/applications/accounting/widget/GlSetupForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/GlSetupForms.xml?rev=789249&r1=789248&r2=789249&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/widget/GlSetupForms.xml (original) +++ ofbiz/trunk/applications/accounting/widget/GlSetupForms.xml Mon Jun 29 08:00:46 2009 @@ -64,9 +64,8 @@ <field name="organizationPartyId"><hidden/></field> <field name="glAccountId"> <drop-down> - <entity-options entity-name="GlAccount" description="${accountName} [${glAccountId}]"> - <entity-order-by field-name="accountName"/> - <entity-order-by field-name="glAccountId"/> + <entity-options entity-name="GlAccount" description="${accountCode} - ${accountName} [${glAccountId}]"> + <entity-order-by field-name="accountCode"/> </entity-options> </drop-down> </field> @@ -375,10 +374,9 @@ </field> <field name="glAccountId"> <drop-down> - <entity-options entity-name="GlAccountOrganizationAndClass" description="${accountName} [${glAccountId}]"> + <entity-options entity-name="GlAccountOrganizationAndClass" description="${accountCode} - ${accountName} [${glAccountId}]"> <entity-constraint name="organizationPartyId" operator="equals" value="${organizationPartyId}"/> - <entity-order-by field-name="accountName"/> - <entity-order-by field-name="glAccountId"/> + <entity-order-by field-name="accountCode"/> </entity-options> </drop-down> </field> @@ -423,11 +421,10 @@ </field> <field name="glAccountId" title="${uiLabelMap.AccountingOverrideRevenueGlAccountId}"> <drop-down> - <entity-options entity-name="GlAccountOrganizationAndClass" description="${accountName} [${glAccountId}]"> + <entity-options entity-name="GlAccountOrganizationAndClass" description="${accountCode} - ${accountName} [${glAccountId}]"> <entity-constraint name="organizationPartyId" operator="equals" value="${organizationPartyId}"/> <entity-constraint name="glAccountClassId" operator="in" env-name="revenueAccountClassIds"></entity-constraint> - <entity-order-by field-name="accountName"/> - <entity-order-by field-name="glAccountId"/> + <entity-order-by field-name="accountCode"/> </entity-options> </drop-down> </field> @@ -474,11 +471,10 @@ </field> <field name="glAccountId" title="${uiLabelMap.AccountingInvoiceOverrideExpenseGlAccountId}"> <drop-down> - <entity-options entity-name="GlAccountOrganizationAndClass" description="${accountName} [${glAccountId}]"> + <entity-options entity-name="GlAccountOrganizationAndClass" description="${accountCode} - ${accountName} [${glAccountId}]"> <entity-constraint name="organizationPartyId" operator="equals" value="${organizationPartyId}"/> <entity-constraint name="glAccountClassId" operator="in" env-name="expenseAccountClassIds"></entity-constraint> - <entity-order-by field-name="accountName"/> - <entity-order-by field-name="glAccountId"/> + <entity-order-by field-name="accountCode"/> </entity-options> </drop-down> </field> @@ -566,10 +562,9 @@ </field> <field name="glAccountId"> <drop-down> - <entity-options entity-name="GlAccountOrganizationAndClass" description="${accountName} [${glAccountId}]"> + <entity-options entity-name="GlAccountOrganizationAndClass" description="${accountCode} - ${accountName} [${glAccountId}]"> <entity-constraint name="organizationPartyId" operator="equals" value="${organizationPartyId}"/> - <entity-order-by field-name="accountName"/> - <entity-order-by field-name="glAccountId"/> + <entity-order-by field-name="accountCode"/> </entity-options> </drop-down> </field> @@ -669,10 +664,9 @@ <field name="glAccountTypeId"><display-entity entity-name="GlAccountType"/></field> <field name="glAccountId" title="${uiLabelMap.ProductGlAccount}"> <drop-down allow-empty="false"> - <entity-options description="${accountName} [${glAccountId}]" entity-name="GlAccountOrganizationAndClass"> + <entity-options description="${accountCode} - ${accountName} [${glAccountId}]" entity-name="GlAccountOrganizationAndClass"> <entity-constraint name="organizationPartyId" operator="equals" env-name="organizationPartyId"/> - <entity-order-by field-name="accountName"/> - <entity-order-by field-name="glAccountId"/> + <entity-order-by field-name="accountCode"/> </entity-options> </drop-down> </field> @@ -696,10 +690,9 @@ </field> <field name="glAccountId" title="${uiLabelMap.ProductGlAccount}"> <drop-down allow-empty="false"> - <entity-options description="${accountName} [${glAccountId}]" entity-name="GlAccountOrganizationAndClass"> + <entity-options description="${accountCode} - ${accountName} [${glAccountId}]" entity-name="GlAccountOrganizationAndClass"> <entity-constraint name="organizationPartyId" operator="equals" env-name="organizationPartyId"/> - <entity-order-by field-name="accountName"/> - <entity-order-by field-name="glAccountId"/> + <entity-order-by field-name="accountCode"/> </entity-options> </drop-down> </field> @@ -716,10 +709,9 @@ <field name="finAccountTypeId"><display-entity entity-name="FinAccountType"/></field> <field name="glAccountId" title="${uiLabelMap.AccountingGlAccountId}"> <drop-down allow-empty="false"> - <entity-options description="${accountName} [${glAccountId}]" entity-name="GlAccountOrganizationAndClass"> + <entity-options description="${accountCode} - ${accountName} [${glAccountId}]" entity-name="GlAccountOrganizationAndClass"> <entity-constraint name="organizationPartyId" operator="equals" env-name="organizationPartyId"/> - <entity-order-by field-name="accountName"/> - <entity-order-by field-name="glAccountId"/> + <entity-order-by field-name="accountCode"/> </entity-options> </drop-down> </field> @@ -741,9 +733,9 @@ </field> <field name="glAccountId" title="${uiLabelMap.AccountingGlAccountId}"> <drop-down allow-empty="false"> - <entity-options description="${accountName} [${glAccountId}]" entity-name="GlAccountOrganizationAndClass"> + <entity-options description="${accountCode} - ${accountName} [${glAccountId}]" entity-name="GlAccountOrganizationAndClass"> <entity-constraint name="organizationPartyId" operator="equals" env-name="organizationPartyId"/> - <entity-order-by field-name="glAccountId"/> + <entity-order-by field-name="accountCode"/> </entity-options> </drop-down> </field> @@ -757,9 +749,9 @@ <field name="glAccountTypeId"><display-entity entity-name="GlAccountType"/></field> <field name="glAccountId" title="${uiLabelMap.ProductGlAccount}"> <drop-down allow-empty="false"> - <entity-options description="${accountName} [${glAccountId}]" entity-name="GlAccountOrganizationAndClass"> + <entity-options description="${accountCode} - ${accountName} [${glAccountId}]" entity-name="GlAccountOrganizationAndClass"> <entity-constraint name="organizationPartyId" operator="equals" env-name="organizationPartyId"/> - <entity-order-by field-name="glAccountId"/> + <entity-order-by field-name="accountCode"/> </entity-options> </drop-down> </field> @@ -783,10 +775,9 @@ </field> <field name="glAccountId" title="${uiLabelMap.ProductGlAccount}"> <drop-down allow-empty="false"> - <entity-options description="${accountName} [${glAccountId}]" entity-name="GlAccountOrganizationAndClass"> + <entity-options description="${accountCode} - ${accountName} [${glAccountId}]" entity-name="GlAccountOrganizationAndClass"> <entity-constraint name="organizationPartyId" operator="equals" env-name="organizationPartyId"/> - <entity-order-by field-name="accountName"/> - <entity-order-by field-name="glAccountId"/> + <entity-order-by field-name="accountCode"/> </entity-options> </drop-down> </field> @@ -803,10 +794,9 @@ <field name="varianceReasonId"><display-entity entity-name="VarianceReason"/></field> <field name="glAccountId" title="${uiLabelMap.AccountingGlAccountId}"> <drop-down allow-empty="false"> - <entity-options description="${accountName} [${glAccountId}]" entity-name="GlAccountOrganizationAndClass"> + <entity-options description="${accountCode} - ${accountName} [${glAccountId}]" entity-name="GlAccountOrganizationAndClass"> <entity-constraint name="organizationPartyId" operator="equals" env-name="organizationPartyId"/> - <entity-order-by field-name="accountName"/> - <entity-order-by field-name="glAccountId"/> + <entity-order-by field-name="accountCode"/> </entity-options> </drop-down> </field> @@ -830,10 +820,9 @@ </field> <field name="glAccountId" title="${uiLabelMap.FormFieldTitle_glAccountTypeId}"> <drop-down allow-empty="false"> - <entity-options description="${accountName} [${glAccountId}]" entity-name="GlAccountOrganizationAndClass"> + <entity-options description="${accountCode} - ${accountName} [${glAccountId}]" entity-name="GlAccountOrganizationAndClass"> <entity-constraint name="organizationPartyId" operator="equals" env-name="organizationPartyId"/> - <entity-order-by field-name="accountName"/> - <entity-order-by field-name="glAccountId"/> + <entity-order-by field-name="accountCode"/> </entity-options> </drop-down> </field> @@ -846,9 +835,9 @@ <field name="organizationPartyId"><hidden/></field> <field name="glAccountId" title="${uiLabelMap.AccountingGlAccountId}"> <drop-down allow-empty="false"> - <entity-options description="${accountName} [${glAccountId}]" entity-name="GlAccountOrganizationAndClass"> + <entity-options description="${accountCode} - ${accountName} [${glAccountId}]" entity-name="GlAccountOrganizationAndClass"> <entity-constraint name="organizationPartyId" operator="equals" env-name="organizationPartyId"/> - <entity-order-by field-name="glAccountId"/> + <entity-order-by field-name="accountCode"/> </entity-options> </drop-down> </field> @@ -873,10 +862,9 @@ </field> <field name="glAccountId" title="${uiLabelMap.AccountingGlAccountId}"> <drop-down allow-empty="false"> - <entity-options description="${accountName} [${glAccountId}]" entity-name="GlAccountOrganizationAndClass"> + <entity-options description="${accountCode} - ${accountName} [${glAccountId}]" entity-name="GlAccountOrganizationAndClass"> <entity-constraint name="organizationPartyId" operator="equals" env-name="organizationPartyId"/> - <entity-order-by field-name="accountName"/> - <entity-order-by field-name="glAccountId"/> + <entity-order-by field-name="accountCode"/> </entity-options> </drop-down> </field> @@ -899,10 +887,9 @@ </field> <field name="glAccountId" title="${uiLabelMap.AccountingGlAccountId}"> <drop-down allow-empty="false"> - <entity-options description="${accountName} [${glAccountId}]" entity-name="GlAccountOrganizationAndClass"> + <entity-options description="${accountCode} - ${accountName} [${glAccountId}]" entity-name="GlAccountOrganizationAndClass"> <entity-constraint name="organizationPartyId" operator="equals" env-name="organizationPartyId"/> - <entity-order-by field-name="accountName"/> - <entity-order-by field-name="glAccountId"/> + <entity-order-by field-name="accountCode"/> </entity-options> </drop-down> </field> @@ -929,10 +916,9 @@ </field> <field name="glAccountId" title="${uiLabelMap.AccountingGlAccountId}"> <drop-down allow-empty="false"> - <entity-options description="${accountName} [${glAccountId}]" entity-name="GlAccountOrganizationAndClass"> + <entity-options description="${accountCode} - ${accountName} [${glAccountId}]" entity-name="GlAccountOrganizationAndClass"> <entity-constraint name="organizationPartyId" operator="equals" env-name="organizationPartyId"/> - <entity-order-by field-name="accountName"/> - <entity-order-by field-name="glAccountId"/> + <entity-order-by field-name="accountCode"/> </entity-options> </drop-down> </field> @@ -945,10 +931,9 @@ <field name="organizationPartyId"><hidden/></field> <field name="glAccountId" title="${uiLabelMap.AccountingGlAccountId}"> <drop-down allow-empty="false"> - <entity-options description="${accountName} [${glAccountId}]" entity-name="GlAccountOrganizationAndClass"> + <entity-options description="${accountCode} - ${accountName} [${glAccountId}]" entity-name="GlAccountOrganizationAndClass"> <entity-constraint name="organizationPartyId" operator="equals" env-name="organizationPartyId"/> - <entity-order-by field-name="accountName"/> - <entity-order-by field-name="glAccountId"/> + <entity-order-by field-name="accountCode"/> </entity-options> </drop-down> </field> @@ -981,10 +966,9 @@ </field> <field name="glAccountId" title="${uiLabelMap.AccountingGlAccountId}"> <drop-down allow-empty="false"> - <entity-options description="${accountName} [${glAccountId}]" entity-name="GlAccountOrganizationAndClass"> + <entity-options description="${accountCode} - ${accountName} [${glAccountId}]" entity-name="GlAccountOrganizationAndClass"> <entity-constraint name="organizationPartyId" operator="equals" env-name="organizationPartyId"/> - <entity-order-by field-name="accountName"/> - <entity-order-by field-name="glAccountId"/> + <entity-order-by field-name="accountCode"/> </entity-options> </drop-down> </field> Modified: ofbiz/trunk/applications/accounting/widget/GlobalGlAccountsForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/GlobalGlAccountsForms.xml?rev=789249&r1=789248&r2=789249&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/widget/GlobalGlAccountsForms.xml (original) +++ ofbiz/trunk/applications/accounting/widget/GlobalGlAccountsForms.xml Mon Jun 29 08:00:46 2009 @@ -45,9 +45,8 @@ header-row-style="header-row" default-table-style="basic-table"> <field name="glAccountId"> <drop-down> - <entity-options entity-name="GlAccount" description="${accountName} [${glAccountId} ]"> - <entity-order-by field-name="accountName"/> - <entity-order-by field-name="glAccountId"/> + <entity-options entity-name="GlAccount" description="${accountCode} - ${accountName} [${glAccountId}]"> + <entity-order-by field-name="accountCode"/> </entity-options> </drop-down> </field> @@ -132,9 +131,8 @@ </field> <field name="parentGlAccountId"> <drop-down allow-empty="true"> - <entity-options key-field-name="glAccountId" entity-name="GlAccount" description="${accountName} [${glAccountId}]-${accountCode}"> - <entity-order-by field-name="accountName"/> - <entity-order-by field-name="glAccountId"/> + <entity-options key-field-name="glAccountId" entity-name="GlAccount" description="${accountCode} - ${accountName} [${glAccountId}]"> + <entity-order-by field-name="accountCode"/> </entity-options> </drop-down> </field> |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |