Author: apatel
Date: Fri Nov 13 04:22:12 2009
New Revision: 835734
URL: http://svn.apache.org/viewvc?rev=835734&view=rev
Log:
Show reconciliation status on finaccount reconciliation screen.
Modified:
ofbiz/trunk/applications/accounting/webapp/accounting/finaccounttrans/GlReconciledFinAccountTrans.ftl
Modified:
ofbiz/trunk/applications/accounting/webapp/accounting/finaccounttrans/GlReconciledFinAccountTrans.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/webapp/accounting/finaccounttrans/GlReconciledFinAccountTrans.ftl?rev=835734&r1=835733&r2=835734&view=diff
==============================================================================
---
ofbiz/trunk/applications/accounting/webapp/accounting/finaccounttrans/GlReconciledFinAccountTrans.ftl
(original)
+++
ofbiz/trunk/applications/accounting/webapp/accounting/finaccounttrans/GlReconciledFinAccountTrans.ftl
Fri Nov 13 04:22:12 2009
@@ -47,13 +47,20 @@
<td>${currentGlReconciliation.reconciledBalance?if_exists}</td>
</tr>
</#if>
+ <#if currentGlReconciliation.statusId?exists>
+ <tr>
+ <td><span class="label">${uiLabelMap.CommonStatus}</span></td>
+ <#assign currentStatus =
currentGlReconciliation.getRelatedOneCache("StatusItem")>
+ <td>${currentStatus.description?if_exists}</td>
+ </tr>
+ </#if>
<tr>
<td><span
class="label">${uiLabelMap.FormFieldTitle_reconciledDate}</span></td>
<td>${currentGlReconciliation.reconciledDate?if_exists}</td>
</tr>
<tr>
<td><span
class="label">${uiLabelMap.AccountingOpeningBalance}</span></td>
- <td><@ofbizCurrency
amount=currentGlReconciliation.openingBalance?default('0')/></td>
+ <td><@ofbizCurrency amount=currentGlReconciliation
.openingBalance?default('0')/></td>
</tr>
</table>
</#if>
@@ -76,6 +83,13 @@
<td>${previousGlReconciliation.reconciledBalance?if_exists}</td>
</tr>
</#if>
+ <#if previousGlReconciliation.statusId?exists>
+ <tr>
+ <td><span class="label">${uiLabelMap.CommonStatus}</span></td>
+ <#assign previousStatus =
previousGlReconciliation.getRelatedOneCache("StatusItem")>
+ <td>${previousStatus.description?if_exists}</td>
+ </tr>
+ </#if>
<tr>
<td><span
class="label">${uiLabelMap.FormFieldTitle_reconciledDate}</span></td>
<td>${previousGlReconciliation.reconciledDate?if_exists}</td>