Author: ashish
Date: Fri Jun 26 15:22:52 2009
New Revision: 788738
URL: http://svn.apache.org/viewvc?rev=788738&view=rev
Log:
Trying to make Accountant life easy.
In Manual Accounting Transaction entries its easy to remember words instead of
numbers.
So now anyone doing transaction entries can find General Ledger account by
alphabets.
Modified:
ofbiz/trunk/applications/accounting/widget/GlForms.xml
ofbiz/trunk/applications/accounting/widget/GlSetupForms.xml
Modified: ofbiz/trunk/applications/accounting/widget/GlForms.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/GlForms.xml?rev=788738&r1=788737&r2=788738&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/GlForms.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/GlForms.xml Fri Jun 26 15:22:52
2009
@@ -191,11 +191,11 @@
</field>
<field name="glAccountId">
<drop-down allow-empty="true">
- <entity-options entity-name="GlAccountOrganizationAndClass"
description="[${glAccountId}] ${accountCode} ${accountName}">
+ <entity-options entity-name="GlAccountOrganizationAndClass"
description="${accountName} [${glAccountId}] [${accountCode}]">
<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-order-by field-name="accountName"/>
</entity-options>
</drop-down>
</field>
@@ -454,34 +454,38 @@
<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="${glAccountId} ${accountName}">
+ <entity-options entity-name="GlAccountOrganizationAndClass"
key-field-name="glAccountId" description="${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-options>
</drop-down>
</field>
<field name="debitGlAccountId" use-when="debitGlAccountClassId==null">
<drop-down>
- <entity-options entity-name="GlAccountOrganizationAndClass"
key-field-name="glAccountId" description="${glAccountId} ${accountName}">
+ <entity-options entity-name="GlAccountOrganizationAndClass"
key-field-name="glAccountId" description="${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-options>
</drop-down>
</field>
<field name="creditGlAccountId"
use-when="creditGlAccountClassId!=null">
<drop-down>
- <entity-options entity-name="GlAccountOrganizationAndClass"
key-field-name="glAccountId" description="${glAccountId} ${accountName}">
+ <entity-options entity-name="GlAccountOrganizationAndClass"
key-field-name="glAccountId" description="${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-options>
</drop-down>
</field>
<field name="creditGlAccountId"
use-when="creditGlAccountClassId==null">
<drop-down>
- <entity-options entity-name="GlAccountOrganizationAndClass"
key-field-name="glAccountId" description="${glAccountId} ${accountName}">
+ <entity-options entity-name="GlAccountOrganizationAndClass"
key-field-name="glAccountId" description="${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-options>
</drop-down>
@@ -561,8 +565,9 @@
</field>
<field name="glAccountId">
<drop-down allow-empty="true">
- <entity-options entity-name="GlAccountOrganizationAndClass"
key-field-name="glAccountId" description="${glAccountId} ${accountName}">
+ <entity-options entity-name="GlAccountOrganizationAndClass"
key-field-name="glAccountId" description="${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-options>
</drop-down>
@@ -613,8 +618,9 @@
</field>
<field name="glAccountId">
<drop-down allow-empty="true">
- <entity-options entity-name="GlAccountOrganizationAndClass"
key-field-name="glAccountId" description="${glAccountId} ${accountName}">
+ <entity-options entity-name="GlAccountOrganizationAndClass"
key-field-name="glAccountId" description="${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-options>
</drop-down>
Modified: ofbiz/trunk/applications/accounting/widget/GlSetupForms.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/GlSetupForms.xml?rev=788738&r1=788737&r2=788738&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/GlSetupForms.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/GlSetupForms.xml Fri Jun 26
15:22:52 2009
@@ -374,8 +374,9 @@
</field>
<field name="glAccountId">
<drop-down>
- <entity-options entity-name="GlAccountOrganizationAndClass"
description="${glAccountId} ${accountName}">
+ <entity-options entity-name="GlAccountOrganizationAndClass"
description="${accountName} [${glAccountId}]">
<entity-constraint name="organizationPartyId"
operator="equals" value="${organizationPartyId}"/>
+ <entity-order-by field-name="accountName"/>
<entity-order-by field-name="glAccountId"/>
</entity-options>
</drop-down>
@@ -421,9 +422,10 @@
</field>
<field name="glAccountId"
title="${uiLabelMap.AccountingOverrideRevenueGlAccountId}">
<drop-down>
- <entity-options entity-name="GlAccountOrganizationAndClass"
description="${glAccountId} ${accountName}">
+ <entity-options entity-name="GlAccountOrganizationAndClass"
description="${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-options>
</drop-down>
@@ -471,9 +473,10 @@
</field>
<field name="glAccountId"
title="${uiLabelMap.AccountingInvoiceOverrideExpenseGlAccountId}">
<drop-down>
- <entity-options entity-name="GlAccountOrganizationAndClass"
description="${glAccountId} ${accountName}">
+ <entity-options entity-name="GlAccountOrganizationAndClass"
description="${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-options>
</drop-down>
@@ -562,8 +565,9 @@
</field>
<field name="glAccountId">
<drop-down>
- <entity-options entity-name="GlAccountOrganizationAndClass"
description="${glAccountId} ${accountName}">
+ <entity-options entity-name="GlAccountOrganizationAndClass"
description="${accountName} [${glAccountId}]">
<entity-constraint name="organizationPartyId"
operator="equals" value="${organizationPartyId}"/>
+ <entity-order-by field-name="accountName"/>
<entity-order-by field-name="glAccountId"/>
</entity-options>
</drop-down>
@@ -664,8 +668,9 @@
<field name="glAccountTypeId"><display-entity
entity-name="GlAccountType"/></field>
<field name="glAccountId" title="${uiLabelMap.ProductGlAccount}">
<drop-down allow-empty="false">
- <entity-options description="${glAccountId} ${accountName}"
entity-name="GlAccountOrganizationAndClass">
+ <entity-options description="${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-options>
</drop-down>
@@ -690,8 +695,9 @@
</field>
<field name="glAccountId" title="${uiLabelMap.ProductGlAccount}">
<drop-down allow-empty="false">
- <entity-options description="${glAccountId} ${accountName}"
entity-name="GlAccountOrganizationAndClass">
+ <entity-options description="${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-options>
</drop-down>
@@ -709,8 +715,9 @@
<field name="finAccountTypeId"><display-entity
entity-name="FinAccountType"/></field>
<field name="glAccountId" title="${uiLabelMap.AccountingGlAccountId}">
<drop-down allow-empty="false">
- <entity-options description="${glAccountId} ${accountName}"
entity-name="GlAccountOrganizationAndClass">
+ <entity-options description="${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-options>
</drop-down>
@@ -733,7 +740,7 @@
</field>
<field name="glAccountId" title="${uiLabelMap.AccountingGlAccountId}">
<drop-down allow-empty="false">
- <entity-options description="${glAccountId} ${accountName}"
entity-name="GlAccountOrganizationAndClass">
+ <entity-options description="${accountName} [${glAccountId}]"
entity-name="GlAccountOrganizationAndClass">
<entity-constraint name="organizationPartyId"
operator="equals" env-name="organizationPartyId"/>
<entity-order-by field-name="glAccountId"/>
</entity-options>
@@ -749,7 +756,7 @@
<field name="glAccountTypeId"><display-entity
entity-name="GlAccountType"/></field>
<field name="glAccountId" title="${uiLabelMap.ProductGlAccount}">
<drop-down allow-empty="false">
- <entity-options description="${glAccountId} ${accountName}"
entity-name="GlAccountOrganizationAndClass">
+ <entity-options description="${accountName} [${glAccountId}]"
entity-name="GlAccountOrganizationAndClass">
<entity-constraint name="organizationPartyId"
operator="equals" env-name="organizationPartyId"/>
<entity-order-by field-name="glAccountId"/>
</entity-options>
@@ -775,8 +782,9 @@
</field>
<field name="glAccountId" title="${uiLabelMap.ProductGlAccount}">
<drop-down allow-empty="false">
- <entity-options description="${glAccountId} ${accountName}"
entity-name="GlAccountOrganizationAndClass">
+ <entity-options description="${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-options>
</drop-down>
@@ -794,8 +802,9 @@
<field name="varianceReasonId"><display-entity
entity-name="VarianceReason"/></field>
<field name="glAccountId" title="${uiLabelMap.AccountingGlAccountId}">
<drop-down allow-empty="false">
- <entity-options description="${glAccountId} ${accountName}"
entity-name="GlAccountOrganizationAndClass">
+ <entity-options description="${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-options>
</drop-down>
@@ -820,8 +829,9 @@
</field>
<field name="glAccountId"
title="${uiLabelMap.FormFieldTitle_glAccountTypeId}">
<drop-down allow-empty="false">
- <entity-options description="${glAccountId} ${accountName}"
entity-name="GlAccountOrganizationAndClass">
+ <entity-options description="${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-options>
</drop-down>
@@ -835,7 +845,7 @@
<field name="organizationPartyId"><hidden/></field>
<field name="glAccountId" title="${uiLabelMap.AccountingGlAccountId}">
<drop-down allow-empty="false">
- <entity-options description="${glAccountId} ${accountName}"
entity-name="GlAccountOrganizationAndClass">
+ <entity-options description="${accountName} [${glAccountId}]"
entity-name="GlAccountOrganizationAndClass">
<entity-constraint name="organizationPartyId"
operator="equals" env-name="organizationPartyId"/>
<entity-order-by field-name="glAccountId"/>
</entity-options>
@@ -862,8 +872,9 @@
</field>
<field name="glAccountId" title="${uiLabelMap.AccountingGlAccountId}">
<drop-down allow-empty="false">
- <entity-options description="${glAccountId} ${accountName}"
entity-name="GlAccountOrganizationAndClass">
+ <entity-options description="${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-options>
</drop-down>
@@ -887,8 +898,9 @@
</field>
<field name="glAccountId" title="${uiLabelMap.AccountingGlAccountId}">
<drop-down allow-empty="false">
- <entity-options description="${glAccountId} ${accountName}"
entity-name="GlAccountOrganizationAndClass">
+ <entity-options description="${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-options>
</drop-down>
@@ -916,8 +928,9 @@
</field>
<field name="glAccountId" title="${uiLabelMap.AccountingGlAccountId}">
<drop-down allow-empty="false">
- <entity-options description="${glAccountId} ${accountName}"
entity-name="GlAccountOrganizationAndClass">
+ <entity-options description="${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-options>
</drop-down>
@@ -931,8 +944,9 @@
<field name="organizationPartyId"><hidden/></field>
<field name="glAccountId" title="${uiLabelMap.AccountingGlAccountId}">
<drop-down allow-empty="false">
- <entity-options description="${glAccountId} ${accountName}"
entity-name="GlAccountOrganizationAndClass">
+ <entity-options description="${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-options>
</drop-down>
@@ -966,8 +980,9 @@
</field>
<field name="glAccountId" title="${uiLabelMap.AccountingGlAccountId}">
<drop-down allow-empty="false">
- <entity-options description="${glAccountId} ${accountName}"
entity-name="GlAccountOrganizationAndClass">
+ <entity-options description="${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-options>
</drop-down>
