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 2014/07/14 10:46:50 UTC
svn commit: r1610357 - in /ofbiz/branches/release12.04: ./
applications/accounting/widget/GlForms.xml
Author: jacopoc
Date: Mon Jul 14 08:46:50 2014
New Revision: 1610357
URL: http://svn.apache.org/r1610357
Log:
Applied fix from trunk for revision: 1610355
===
Applied another contribution from Anahita Goljahani to OFBIZ-5592: UX improvement - aligment Chart of Account.
Modified:
ofbiz/branches/release12.04/ (props changed)
ofbiz/branches/release12.04/applications/accounting/widget/GlForms.xml
Propchange: ofbiz/branches/release12.04/
------------------------------------------------------------------------------
Merged /ofbiz/trunk:r1610355
Modified: ofbiz/branches/release12.04/applications/accounting/widget/GlForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release12.04/applications/accounting/widget/GlForms.xml?rev=1610357&r1=1610356&r2=1610357&view=diff
==============================================================================
--- ofbiz/branches/release12.04/applications/accounting/widget/GlForms.xml (original)
+++ ofbiz/branches/release12.04/applications/accounting/widget/GlForms.xml Mon Jul 14 08:46:50 2014
@@ -270,16 +270,16 @@ under the License.
<condition-expr field-name="transactionDate" operator="greater-equals" from-field="parameters.fromDate" ignore-if-empty="true"/>
<condition-expr field-name="transactionDate" operator="less" from-field="parameters.thruDate" ignore-if-empty="true"/>
</condition-list>
- <order-by field-name="glAccountId"/>
+ <order-by field-name="accountCode"/>
<order-by field-name="-transactionDate"/>
</entity-condition>
</actions>
<row-actions>
<set field="showPosition1" value="${groovy:String prev=(String)previousItem.get("glAccountId");return new Boolean(!(prev!=null&&prev.equals(glAccountId)));}" type="Boolean"/>
</row-actions>
- <field name="glAccountId" position="1" use-when="showPosition1"><display/></field>
+ <field name="accountCode" position="1" use-when="showPosition1"><display/></field>
<field name="glAccountDescription" title="${uiLabelMap.CommonDescription}" position="1" use-when="showPosition1">
- <display description="${accountCode} ${accountName}"/>
+ <display description="${accountName}"/>
</field>
<field name="glAccountClassId" position="1" use-when="showPosition1">
<display-entity entity-name="GlAccountClass"/>