Author: apatel
Date: Wed Nov 18 10:02:29 2009
New Revision: 881708
URL: http://svn.apache.org/viewvc?rev=881708&view=rev
Log:
[OFBIZ-3213] patch.
Improvements to PaymentGroup UI.
Fixed issue with List of deposit slips displaying under FinAccount tab are not
associated to FinAccount.This list should contain only those deposit slips
which are created for selected FinAccount.
Added ordering, Show deposit slips in search result in descending order of
effective date.
Thanks Sumit Pandit for providing the patch.
Modified:
ofbiz/trunk/applications/accounting/widget/FinAccountForms.xml
ofbiz/trunk/applications/accounting/widget/PaymentGroupForms.xml
Modified: ofbiz/trunk/applications/accounting/widget/FinAccountForms.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/FinAccountForms.xml?rev=881708&r1=881707&r2=881708&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/FinAccountForms.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/FinAccountForms.xml Wed Nov 18
10:02:29 2009
@@ -263,7 +263,7 @@
<parameter param-name="finAccountId"/>
</hyperlink>
</field>
- <field name="deleteLink" title="${uiLabelMap.CommonEmptyHeader}"
widget-style="buttontext" use-when="${paymentGroupTypeId == 'BATCH_PAYMENT'}
@and
${groovy:org.ofbiz.base.util.UtilValidate.isNotEmpty(paymentGroupMembers)}">
+ <field name="deleteLink" title="${uiLabelMap.CommonEmptyHeader}"
widget-style="buttontext" use-when="${paymentGroup.paymentGroupTypeId ==
'BATCH_PAYMENT'} @and
${groovy:org.ofbiz.base.util.UtilValidate.isNotEmpty(paymentGroupMembers)}">
<hyperlink target="deleteDepositSlip"
description="${uiLabelMap.CommonCancel}" also-hidden="false">
<parameter param-name="paymentGroupId"/>
<parameter param-name="finAccountId"/>
Modified: ofbiz/trunk/applications/accounting/widget/PaymentGroupForms.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/PaymentGroupForms.xml?rev=881708&r1=881707&r2=881708&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/PaymentGroupForms.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/PaymentGroupForms.xml Wed Nov 18
10:02:29 2009
@@ -34,12 +34,17 @@
<actions>
<service service-name="performFind" result-map="result"
result-map-list="listIt">
<field-map field-name="inputFields" from-field="parameters"/>
- <field-map field-name="entityName" value="PaymentGroup"/>
+ <field-map field-name="entityName"
value="PmtGrpMembrPaymentAndFinAcctTrans"/>
<field-map field-name="viewIndex" from-field="viewIndex"/>
<field-map field-name="viewSize" from-field="viewSize"/>
+ <field-map field-name="orderBy" value="effectiveDate DESC"/>
</service>
</actions>
<row-actions>
+ <entity-one entity-name="PaymentGroup" value-field="paymentGroup">
+ <field-map field-name="paymentGroupId"/>
+ </entity-one>
+ <set field="paymentGroupTypeId"
from-field="paymentGroup.paymentGroupTypeId"/>
<entity-and entity-name="PaymentGroupMember"
list="paymentGroupMembers" filter-by-date="true">
<field-map field-name="paymentGroupId"/>
</entity-and>
@@ -50,7 +55,7 @@
</hyperlink>
</field>
<field name="paymentGroupTypeId"
title="${uiLabelMap.FormFieldTitle_paymentGroupType}"><display-entity
entity-name="PaymentGroupType"/></field>
- <field name="paymentGroupName"><display/></field>
+ <field name="paymentGroupName"><display
description="${paymentGroup.paymentGroupName}"/></field>
<field name="deleteLink" title="${uiLabelMap.CommonEmptyHeader}"
widget-style="buttontext" use-when="${paymentGroupTypeId == 'BATCH_PAYMENT'}
@and
${groovy:org.ofbiz.base.util.UtilValidate.isNotEmpty(paymentGroupMembers)}">
<hyperlink target="cancelPaymentGroup"
description="${uiLabelMap.CommonCancel}" also-hidden="false">
<parameter param-name="paymentGroupId"/>
