Author: apatel
Date: Mon Nov 9 09:04:25 2009
New Revision: 834000
URL: http://svn.apache.org/viewvc?rev=834000&view=rev
Log:
Update paymentgroupmember list. Now its consistent with pdf version.
Modified:
ofbiz/trunk/applications/accounting/widget/PaymentGroupForms.xml
Modified: ofbiz/trunk/applications/accounting/widget/PaymentGroupForms.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/PaymentGroupForms.xml?rev=834000&r1=833999&r2=834000&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/PaymentGroupForms.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/PaymentGroupForms.xml Mon Nov 9
09:04:25 2009
@@ -92,12 +92,20 @@
</form>
<!-- Payment Group Member -->
- <form name="ListPaymentGroupMember" type="list"
list-name="paymentGroupMembers" target="updatePaymentGroupMember">
+ <form name="ListPaymentGroupMember" type="list"
list-name="paymentGroupMembers" target="updatePaymentGroupMember"
+ odd-row-style="alternate-row" default-table-style="basic-table
hover-bar" header-row-style="header-row">
<row-actions>
<entity-one entity-name="Payment" value-field="payment"/>
<set field="paymentTypeId" from-field="payment.paymentTypeId"/>
<set field="partyIdFrom" from-field="payment.partyIdFrom"/>
<set field="partyIdTo" from-field="payment.partyIdTo"/>
+ <set field="paymentMethodTypeId"
from-field="payment.paymentMethodTypeId"/>
+ <entity-one entity-name="CreditCard" value-field="creditCard">
+ <field-map field-name="paymentMethodId"
from-field="payment.paymentMethodId"/>
+ </entity-one>
+ <set field="cardType" from-field="creditCard.cardType"/>
+ <set field="amount" from-field="payment.amount" type="BigDecimal"/>
+ <set field="paymentRefNum" from-field="payment.paymentRefNum"/>
</row-actions>
<field name="paymentGroupId"><hidden/></field>
<field name="paymentId">
@@ -105,6 +113,7 @@
<parameter param-name="paymentId"/>
</hyperlink>
</field>
+ <field name="paymentRefNum"
title="${uiLabelMap.AccountingReferenceNumber}"><display/></field>
<field name="partyIdFrom" title="${uiLabelMap.AccountingFromParty}">
<display-entity entity-name="PartyNameView"
key-field-name="partyId" description="${groupName} ${lastName} ${firstName}">
<sub-hyperlink target="/partymgr/control/viewprofile"
target-type="inter-app" description="[${partyIdFrom}]" >
@@ -120,6 +129,13 @@
</display-entity>
</field>
<field name="paymentTypeId"
title="${uiLabelMap.OrderPaymentType}"><display-entity
entity-name="PaymentType" description="${description}"/></field>
+ <field name="paymentMethodTypeId" use-when="cardType!=null">
+ <display-entity entity-name="PaymentMethodType"
description="${description} (${cardType})"/>
+ </field>
+ <field name="paymentMethodTypeId" use-when="cardType==null">
+ <display-entity entity-name="PaymentMethodType"
description="${description}"/>
+ </field>
+ <field name="amount"><display currency="${payment.currencyUomId}"
type="currency"/></field>
<field name="fromDate"><display/></field>
<field name="thruDate"><date-time/></field>
<field name="deleteLink" title="" widget-style="buttontext">
