Author: apatel
Date: Thu Jul 30 10:55:37 2009
New Revision: 799235
URL: http://svn.apache.org/viewvc?rev=799235&view=rev
Log:
Adding from and to party information to list of payments for deposit. Patch
from OFBIZ-2773. Thanks Sumit and Satyam for contribution.
Modified:
ofbiz/trunk/applications/accounting/webapp/accounting/payment/depositWithdrawPayments.ftl
Modified:
ofbiz/trunk/applications/accounting/webapp/accounting/payment/depositWithdrawPayments.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/webapp/accounting/payment/depositWithdrawPayments.ftl?rev=799235&r1=799234&r2=799235&view=diff
==============================================================================
---
ofbiz/trunk/applications/accounting/webapp/accounting/payment/depositWithdrawPayments.ftl
(original)
+++
ofbiz/trunk/applications/accounting/webapp/accounting/payment/depositWithdrawPayments.ftl
Thu Jul 30 10:55:37 2009
@@ -87,7 +87,8 @@
<tr class="header-row">
<td>${uiLabelMap.FormFieldTitle_paymentId}</td>
<td>${uiLabelMap.AccountingPaymentType}</td>
- <td>${uiLabelMap.Party}</td>
+ <td>${uiLabelMap.AccountingFromParty}</td>
+ <td>${uiLabelMap.AccountingToParty}</td>
<td>${uiLabelMap.CommonAmount}</td>
<td>${uiLabelMap.CommonDate}</td>
<td align="right">
@@ -105,12 +106,12 @@
${paymentType.description?if_exists}
</td>
<td>
- <#assign partyName =
(delegator.findOne("PartyNameView", {"partyId" : payment.partyIdFrom}, false))!>
- <#if partyName.partyTypeId == "PERSON">
- ${(partyName.firstName)!}
${(partyName.lastName)!}
- <#elseif (partyName.partyTypeId)! ==
"PARTY_GROUP">
- ${(partyName.groupName)!}
- </#if>
+ <#assign partyNameFrom =
(delegator.findOne("PartyNameView", {"partyId" : payment.partyIdFrom}, true))!>
+ ${(partyNameFrom.firstName)!}
${(partyNameFrom.lastName)!} ${(partyNameFrom.groupName)!}
+ </td>
+ <td>
+ <#assign partyNameTo =
(delegator.findOne("PartyNameView", {"partyId" : payment.partyIdTo}, true))!>
+ ${(partyNameTo.firstName)!}
${(partyNameTo.lastName)!} ${(partyNameTo.groupName)!}
</td>
<td><@ofbizCurrency amount=payment.amount
isoCode=payment.currencyUomId/></td>
<td>${payment.effectiveDate?if_exists}</td>
