You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by ja...@apache.org on 2008/04/06 19:08:51 UTC
svn commit: r645270 - in /ofbiz/trunk/applications/accounting/widget:
GlSetupForms.xml GlobalGlAccountsForms.xml
Author: jacopoc
Date: Sun Apr 6 10:08:48 2008
New Revision: 645270
URL: http://svn.apache.org/viewvc?rev=645270&view=rev
Log:
Misc cleanups.
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=645270&r1=645269&r2=645270&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/GlSetupForms.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/GlSetupForms.xml Sun Apr 6 10:08:48 2008
@@ -54,8 +54,8 @@
<field name="organizationPartyId"><hidden/></field>
<field name="glAccountId">
<drop-down>
- <entity-options entity-name="GlAccount" description="${accountName} [${glAccountId}]">
- <entity-order-by field-name="description"/>
+ <entity-options entity-name="GlAccount" description="${glAccountId} ${accountName}">
+ <entity-order-by field-name="glAccountId"/>
</entity-options>
</drop-down>
</field>
@@ -269,9 +269,9 @@
</field>
<field name="glAccountId">
<drop-down>
- <entity-options entity-name="GlAccountOrganizationAndClass" description="${accountName} [${glAccountId}]">
+ <entity-options entity-name="GlAccountOrganizationAndClass" description="${glAccountId} ${accountName}">
<entity-constraint name="organizationPartyId" operator="equals" value="${organizationPartyId}"/>
- <entity-order-by field-name="description"/>
+ <entity-order-by field-name="glAccountId"/>
</entity-options>
</drop-down>
</field>
@@ -312,10 +312,10 @@
</field>
<field name="glAccountId" title="${uiLabelMap.AccountingOverrideRevenueGlAccountId}">
<drop-down>
- <entity-options entity-name="GlAccountOrganizationAndClass" description="${accountName}[${glAccountId}]">
+ <entity-options entity-name="GlAccountOrganizationAndClass" description="${glAccountId} ${accountName}">
<entity-constraint name="organizationPartyId" operator="equals" value="${organizationPartyId}"/>
<entity-constraint name="glAccountClassId" operator="in" env-name="revenueAccountClassIds"></entity-constraint>
- <entity-order-by field-name="description"/>
+ <entity-order-by field-name="glAccountId"/>
</entity-options>
</drop-down>
</field>
@@ -357,10 +357,10 @@
</field>
<field name="glAccountId" title="${uiLabelMap.AccountingInvoiceOverrideExpenseGlAccountId}">
<drop-down>
- <entity-options entity-name="GlAccountOrganizationAndClass" description="${accountName} [${glAccountId}]">
+ <entity-options entity-name="GlAccountOrganizationAndClass" description="${glAccountId} ${accountName}">
<entity-constraint name="organizationPartyId" operator="equals" value="${organizationPartyId}"/>
<entity-constraint name="glAccountClassId" operator="in" env-name="expenseAccountClassIds"></entity-constraint>
- <entity-order-by field-name="description"/>
+ <entity-order-by field-name="glAccountId"/>
</entity-options>
</drop-down>
</field>
@@ -440,9 +440,9 @@
</field>
<field name="glAccountId">
<drop-down>
- <entity-options entity-name="GlAccountOrganizationAndClass" description="${accountName}[${glAccountId}]">
+ <entity-options entity-name="GlAccountOrganizationAndClass" description="${glAccountId} ${accountName}">
<entity-constraint name="organizationPartyId" operator="equals" value="${organizationPartyId}"/>
- <entity-order-by field-name="description"/>
+ <entity-order-by field-name="glAccountId"/>
</entity-options>
</drop-down>
</field>
@@ -534,9 +534,9 @@
<field name="glAccountTypeId"><display-entity entity-name="GlAccountType"/></field>
<field name="glAccountId" title="${uiLabelMap.ProductGlAccount}">
<drop-down allow-empty="false">
- <entity-options description="${accountCode} ${accountName}" entity-name="GlAccountOrganizationAndClass">
+ <entity-options description="${glAccountId} ${accountName}" entity-name="GlAccountOrganizationAndClass">
<entity-constraint name="organizationPartyId" operator="equals" env-name="organizationPartyId"/>
- <entity-order-by field-name="accountCode"/>
+ <entity-order-by field-name="glAccountId"/>
</entity-options>
</drop-down>
</field>
@@ -558,9 +558,9 @@
</field>
<field name="glAccountId" title="${uiLabelMap.ProductGlAccount}">
<drop-down allow-empty="false">
- <entity-options description="${accountCode} ${accountName}" entity-name="GlAccountOrganizationAndClass">
+ <entity-options description="${glAccountId} ${accountName}" entity-name="GlAccountOrganizationAndClass">
<entity-constraint name="organizationPartyId" operator="equals" env-name="organizationPartyId"/>
- <entity-order-by field-name="accountCode"/>
+ <entity-order-by field-name="glAccountId"/>
</entity-options>
</drop-down>
</field>
@@ -577,9 +577,9 @@
<field name="finAccountTypeId"><display-entity entity-name="FinAccountType"/></field>
<field name="glAccountId" title="${uiLabelMap.AccountingGlAccountId}">
<drop-down allow-empty="false">
- <entity-options description="${accountCode} ${accountName}" entity-name="GlAccountOrganizationAndClass">
+ <entity-options description="${glAccountId} ${accountName}" entity-name="GlAccountOrganizationAndClass">
<entity-constraint name="organizationPartyId" operator="equals" env-name="organizationPartyId"/>
- <entity-order-by field-name="accountCode"/>
+ <entity-order-by field-name="glAccountId"/>
</entity-options>
</drop-down>
</field>
@@ -599,9 +599,9 @@
</field>
<field name="glAccountId" title="${uiLabelMap.AccountingGlAccountId}">
<drop-down allow-empty="false">
- <entity-options description="${accountCode} ${accountName}" entity-name="GlAccountOrganizationAndClass">
+ <entity-options description="${glAccountId} ${accountName}" entity-name="GlAccountOrganizationAndClass">
<entity-constraint name="organizationPartyId" operator="equals" env-name="organizationPartyId"/>
- <entity-order-by field-name="accountCode"/>
+ <entity-order-by field-name="glAccountId"/>
</entity-options>
</drop-down>
</field>
@@ -615,9 +615,9 @@
<field name="glAccountTypeId"><display-entity entity-name="GlAccountType"/></field>
<field name="glAccountId" title="${uiLabelMap.ProductGlAccount}">
<drop-down allow-empty="false">
- <entity-options description="${accountCode} ${accountName}" entity-name="GlAccountOrganizationAndClass">
+ <entity-options description="${glAccountId} ${accountName}" entity-name="GlAccountOrganizationAndClass">
<entity-constraint name="organizationPartyId" operator="equals" env-name="organizationPartyId"/>
- <entity-order-by field-name="accountCode"/>
+ <entity-order-by field-name="glAccountId"/>
</entity-options>
</drop-down>
</field>
@@ -639,9 +639,9 @@
</field>
<field name="glAccountId" title="${uiLabelMap.ProductGlAccount}">
<drop-down allow-empty="false">
- <entity-options description="${accountCode} ${accountName}" entity-name="GlAccountOrganizationAndClass">
+ <entity-options description="${glAccountId} ${accountName}" entity-name="GlAccountOrganizationAndClass">
<entity-constraint name="organizationPartyId" operator="equals" env-name="organizationPartyId"/>
- <entity-order-by field-name="accountCode"/>
+ <entity-order-by field-name="glAccountId"/>
</entity-options>
</drop-down>
</field>
@@ -658,9 +658,9 @@
<field name="varianceReasonId"><display-entity entity-name="VarianceReason"/></field>
<field name="glAccountId" title="${uiLabelMap.AccountingGlAccountId}">
<drop-down allow-empty="false">
- <entity-options description="${accountCode} ${accountName}" entity-name="GlAccountOrganizationAndClass">
+ <entity-options description="${glAccountId} ${accountName}" entity-name="GlAccountOrganizationAndClass">
<entity-constraint name="organizationPartyId" operator="equals" env-name="organizationPartyId"/>
- <entity-order-by field-name="accountCode"/>
+ <entity-order-by field-name="glAccountId"/>
</entity-options>
</drop-down>
</field>
@@ -682,9 +682,9 @@
</field>
<field name="glAccountId" title="${uiLabelMap.FormFieldTitle_glAccountTypeId}">
<drop-down allow-empty="false">
- <entity-options description="${accountCode} ${accountName}" entity-name="GlAccountOrganizationAndClass">
+ <entity-options description="${glAccountId} ${accountName}" entity-name="GlAccountOrganizationAndClass">
<entity-constraint name="organizationPartyId" operator="equals" env-name="organizationPartyId"/>
- <entity-order-by field-name="accountCode"/>
+ <entity-order-by field-name="glAccountId"/>
</entity-options>
</drop-down>
</field>
@@ -697,9 +697,9 @@
<field name="organizationPartyId"><hidden/></field>
<field name="glAccountId" title="${uiLabelMap.AccountingGlAccountId}">
<drop-down allow-empty="false">
- <entity-options description="${accountCode} ${accountName}" entity-name="GlAccountOrganizationAndClass">
+ <entity-options description="${glAccountId} ${accountName}" entity-name="GlAccountOrganizationAndClass">
<entity-constraint name="organizationPartyId" operator="equals" env-name="organizationPartyId"/>
- <entity-order-by field-name="accountCode"/>
+ <entity-order-by field-name="glAccountId"/>
</entity-options>
</drop-down>
</field>
@@ -722,9 +722,9 @@
</field>
<field name="glAccountId" title="${uiLabelMap.AccountingGlAccountId}">
<drop-down allow-empty="false">
- <entity-options description="${accountCode} ${accountName}" entity-name="GlAccountOrganizationAndClass">
+ <entity-options description="${glAccountId} ${accountName}" entity-name="GlAccountOrganizationAndClass">
<entity-constraint name="organizationPartyId" operator="equals" env-name="organizationPartyId"/>
- <entity-order-by field-name="accountCode"/>
+ <entity-order-by field-name="glAccountId"/>
</entity-options>
</drop-down>
</field>
@@ -745,9 +745,9 @@
</field>
<field name="glAccountId" title="${uiLabelMap.AccountingGlAccountId}">
<drop-down allow-empty="false">
- <entity-options description="${accountCode} ${accountName}" entity-name="GlAccountOrganizationAndClass">
+ <entity-options description="${glAccountId} ${accountName}" entity-name="GlAccountOrganizationAndClass">
<entity-constraint name="organizationPartyId" operator="equals" env-name="organizationPartyId"/>
- <entity-order-by field-name="accountCode"/>
+ <entity-order-by field-name="glAccountId"/>
</entity-options>
</drop-down>
</field>
@@ -770,9 +770,9 @@
</field>
<field name="glAccountId" title="${uiLabelMap.${uiLabelMap.AccountingGlAccountId}}">
<drop-down allow-empty="false">
- <entity-options description="${accountCode} ${accountName}" entity-name="GlAccountOrganizationAndClass">
+ <entity-options description="${glAccountId} ${accountName}" entity-name="GlAccountOrganizationAndClass">
<entity-constraint name="organizationPartyId" operator="equals" env-name="organizationPartyId"/>
- <entity-order-by field-name="accountCode"/>
+ <entity-order-by field-name="glAccountId"/>
</entity-options>
</drop-down>
</field>
@@ -785,9 +785,9 @@
<field name="organizationPartyId"><hidden/></field>
<field name="glAccountId" title="${uiLabelMap.AccountingGlAccountId}">
<drop-down allow-empty="false">
- <entity-options description="${accountCode} ${accountName}" entity-name="GlAccountOrganizationAndClass">
+ <entity-options description="${glAccountId} ${accountName}" entity-name="GlAccountOrganizationAndClass">
<entity-constraint name="organizationPartyId" operator="equals" env-name="organizationPartyId"/>
- <entity-order-by field-name="accountCode"/>
+ <entity-order-by field-name="glAccountId"/>
</entity-options>
</drop-down>
</field>
@@ -818,12 +818,12 @@
</field>
<field name="glAccountId" title="${uiLabelMap.AccountingGlAccountId}">
<drop-down allow-empty="false">
- <entity-options description="${accountCode} ${accountName}" entity-name="GlAccountOrganizationAndClass">
+ <entity-options description="${glAccountId} ${accountName}" entity-name="GlAccountOrganizationAndClass">
<entity-constraint name="organizationPartyId" operator="equals" env-name="organizationPartyId"/>
- <entity-order-by field-name="accountCode"/>
+ <entity-order-by field-name="glAccountId"/>
</entity-options>
</drop-down>
</field>
<field name="submitButton" title="${uiLabelMap.CommonAdd}"><submit button-type="button"/></field>
</form>
-</forms>
\ No newline at end of file
+</forms>
Modified: ofbiz/trunk/applications/accounting/widget/GlobalGlAccountsForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/GlobalGlAccountsForms.xml?rev=645270&r1=645269&r2=645270&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/GlobalGlAccountsForms.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/GlobalGlAccountsForms.xml Sun Apr 6 10:08:48 2008
@@ -43,7 +43,7 @@
header-row-style="header-row" default-table-style="basic-table">
<field name="glAccountId">
<drop-down>
- <entity-options entity-name="GlAccount" description="${glAccountId}: ${accountName}">
+ <entity-options entity-name="GlAccount" description="${glAccountId} ${accountName}">
<entity-order-by field-name="glAccountId"/>
</entity-options>
</drop-down>