Author: ashish
Date: Thu Jun 9 09:08:37 2016
New Revision: 1747514
URL: http://svn.apache.org/viewvc?rev=1747514&view=rev
Log:
Applied patch from jira issue - OFBIZ-7216 - Error with GL Account Trial
Balance pdf.
Thanks Ravi for the contribution.
Modified:
ofbiz/trunk/applications/accounting/template/reports/GlAccountTrialBalanceReport.fo.ftl
Modified:
ofbiz/trunk/applications/accounting/template/reports/GlAccountTrialBalanceReport.fo.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/template/reports/GlAccountTrialBalanceReport.fo.ftl?rev=1747514&r1=1747513&r2=1747514&view=diff
==============================================================================
---
ofbiz/trunk/applications/accounting/template/reports/GlAccountTrialBalanceReport.fo.ftl
(original)
+++
ofbiz/trunk/applications/accounting/template/reports/GlAccountTrialBalanceReport.fo.ftl
Thu Jun 9 09:08:37 2016
@@ -84,7 +84,7 @@ under the License.
</fo:table-cell>
</fo:table-header>
<fo:table-body>
- <fo:table-row border="1pt solid"
border-width=".1mm"><fo:table-cell border="1pt solid" border-width=".1mm"
number-columns-spanned="1"></fo:table-cell><fo:table-cell border="1pt solid"
border-width=".1mm" number-columns-spanned="1"></fo:table-cell><fo:table-cell
border="1pt solid" border-width=".1mm" number-columns-spanned="3"
text-align="center" ><fo:block
text-align="center">${uiLabelMap.AccountingTheBalanceOfLastYear}</fo:block></fo:table-cell><fo:table-cell
border="1pt solid" border-width=".1mm"
number-columns-spanned="1"></fo:table-cell><fo:table-cell border="1pt solid"
border-width=".1mm" number-columns-spanned="1"></fo:table-cell><fo:table-cell
border="1pt solid" border-width=".1mm" number-columns-spanned="1"><fo:block
text-align="center"><#if
(isDebitAccount)>${uiLabelMap.AccountingDebitFlag}<#else>${uiLabelMap.AccountingCreditFlag}</#if></fo:block></fo:table-cell><fo:table-cell
border="1pt solid" border-width=".1mm" number-columns-spanned="1"><fo:block
text-align="center">${(openingBalance)!}</fo:block></fo:table-cell></fo:table-row>
+ <fo:table-row border="1pt solid"
border-width=".1mm"><fo:table-cell border="1pt solid" border-width=".1mm"
number-columns-spanned="1"><fo:block/></fo:table-cell><fo:table-cell
border="1pt solid" border-width=".1mm"
number-columns-spanned="1"><fo:block/></fo:table-cell><fo:table-cell
border="1pt solid" border-width=".1mm" number-columns-spanned="3"
text-align="center" ><fo:block
text-align="center">${uiLabelMap.AccountingTheBalanceOfLastYear}</fo:block></fo:table-cell><fo:table-cell
border="1pt solid" border-width=".1mm"
number-columns-spanned="1"><fo:block/></fo:table-cell><fo:table-cell
border="1pt solid" border-width=".1mm"
number-columns-spanned="1"><fo:block/></fo:table-cell><fo:table-cell
border="1pt solid" border-width=".1mm" number-columns-spanned="1"><fo:block
text-align="center"><#if
(isDebitAccount)>${uiLabelMap.AccountingDebitFlag}<#else>${uiLabelMap.AccountingCreditFlag}</#if></fo:block></fo:table-cell><fo:table-cell
border="1pt solid" border-width=
".1mm" number-columns-spanned="1"><fo:block
text-align="center">${(openingBalance)!}</fo:block></fo:table-cell></fo:table-row>
<#list glAcctgTrialBalanceList as glAcctgTrialBalance>
<#assign acctgTransAndEntries =
glAcctgTrialBalance.acctgTransAndEntries/>
<#if (acctgTransAndEntries)?has_content>
@@ -125,8 +125,8 @@ under the License.
</fo:table-cell>
</fo:table-row>
</#list>
- <fo:table-row border="1pt solid"
border-width=".1mm"><fo:table-cell border="1pt solid" border-width=".1mm"
number-columns-spanned="1"></fo:table-cell><fo:table-cell border="1pt solid"
border-width=".1mm" number-columns-spanned="1"></fo:table-cell><fo:table-cell
border="1pt solid" border-width=".1mm" number-columns-spanned="3"
text-align="center" ><fo:block
text-align="center">${uiLabelMap.AccountingTotalOfTheCurrentMonth}</fo:block></fo:table-cell><fo:table-cell
border="1pt solid" border-width=".1mm" number-columns-spanned="1"><fo:block
text-align="center">${(glAcctgTrialBalance.debitTotal)!}</fo:block></fo:table-cell><fo:table-cell
border="1pt solid" border-width=".1mm" number-columns-spanned="1"><fo:block
text-align="center">${(glAcctgTrialBalance.creditTotal)!}</fo:block></fo:table-cell><fo:table-cell
border="1pt solid" border-width=".1mm" number-columns-spanned="1"><fo:block
text-align="center"><#if (isDebitAccount)>${uiLabelMap.AccountingDebitFlag}
<#else>${uiLabelMap.AccountingCreditFlag}</#if></fo:block></fo:table-cell><fo:table-cell
border="1pt solid" border-width=".1mm" number-columns-spanned="1"><fo:block
text-align="center">${(glAcctgTrialBalance.balance)!}</fo:block></fo:table-cell></fo:table-row>
- <fo:table-row border="1pt solid"
border-width=".1mm"><fo:table-cell border="1pt solid" border-width=".1mm"
number-columns-spanned="1"></fo:table-cell><fo:table-cell border="1pt solid"
border-width=".1mm" number-columns-spanned="1"></fo:table-cell><fo:table-cell
border="1pt solid" border-width=".1mm" number-columns-spanned="3"
text-align="center" ><fo:block
text-align="center">${uiLabelMap.AccountingTotalOfYearToDate}</fo:block></fo:table-cell><fo:table-cell
border="1pt solid" border-width=".1mm" number-columns-spanned="1"><fo:block
text-align="center">${glAcctgTrialBalance.totalOfYearToDateDebit}</fo:block></fo:table-cell><fo:table-cell
border="1pt solid" border-width=".1mm" number-columns-spanned="1"><fo:block
text-align="center">${glAcctgTrialBalance.totalOfYearToDateCredit}</fo:block></fo:table-cell><fo:table-cell
border="1pt solid" border-width=".1mm" number-columns-spanned="1"><fo:block
text-align="center"><#if (isDebitAccount)>${uiLabelMap.Account
ingDebitFlag}<#else>${uiLabelMap.AccountingCreditFlag}</#if></fo:block></fo:table-cell><fo:table-cell
border="1pt solid" border-width=".1mm" number-columns-spanned="1"><fo:block
text-align="center">${(glAcctgTrialBalance.balanceOfTheAcctgForYear)!}</fo:block></fo:table-cell></fo:table-row>
+ <fo:table-row border="1pt solid"
border-width=".1mm"><fo:table-cell border="1pt solid" border-width=".1mm"
number-columns-spanned="1"><fo:block/></fo:table-cell><fo:table-cell
border="1pt solid" border-width=".1mm"
number-columns-spanned="1"><fo:block/></fo:table-cell><fo:table-cell
border="1pt solid" border-width=".1mm" number-columns-spanned="3"
text-align="center" ><fo:block
text-align="center">${uiLabelMap.AccountingTotalOfTheCurrentMonth}</fo:block></fo:table-cell><fo:table-cell
border="1pt solid" border-width=".1mm" number-columns-spanned="1"><fo:block
text-align="center">${(glAcctgTrialBalance.debitTotal)!}</fo:block></fo:table-cell><fo:table-cell
border="1pt solid" border-width=".1mm" number-columns-spanned="1"><fo:block
text-align="center">${(glAcctgTrialBalance.creditTotal)!}</fo:block></fo:table-cell><fo:table-cell
border="1pt solid" border-width=".1mm" number-columns-spanned="1"><fo:block
text-align="center"><#if (isDebitAccount)>${uiLabelMa
p.AccountingDebitFlag}<#else>${uiLabelMap.AccountingCreditFlag}</#if></fo:block></fo:table-cell><fo:table-cell
border="1pt solid" border-width=".1mm" number-columns-spanned="1"><fo:block
text-align="center">${(glAcctgTrialBalance.balance)!}</fo:block></fo:table-cell></fo:table-row>
+ <fo:table-row border="1pt solid"
border-width=".1mm"><fo:table-cell border="1pt solid" border-width=".1mm"
number-columns-spanned="1"><fo:block/></fo:table-cell><fo:table-cell
border="1pt solid" border-width=".1mm"
number-columns-spanned="1"><fo:block/></fo:table-cell><fo:table-cell
border="1pt solid" border-width=".1mm" number-columns-spanned="3"
text-align="center" ><fo:block
text-align="center">${uiLabelMap.AccountingTotalOfYearToDate}</fo:block></fo:table-cell><fo:table-cell
border="1pt solid" border-width=".1mm" number-columns-spanned="1"><fo:block
text-align="center">${glAcctgTrialBalance.totalOfYearToDateDebit}</fo:block></fo:table-cell><fo:table-cell
border="1pt solid" border-width=".1mm" number-columns-spanned="1"><fo:block
text-align="center">${glAcctgTrialBalance.totalOfYearToDateCredit}</fo:block></fo:table-cell><fo:table-cell
border="1pt solid" border-width=".1mm" number-columns-spanned="1"><fo:block
text-align="center"><#if (isDebitAccount
)>${uiLabelMap.AccountingDebitFlag}<#else>${uiLabelMap.AccountingCreditFlag}</#if></fo:block></fo:table-cell><fo:table-cell
border="1pt solid" border-width=".1mm" number-columns-spanned="1"><fo:block
text-align="center">${(glAcctgTrialBalance.balanceOfTheAcctgForYear)!}</fo:block></fo:table-cell></fo:table-row>
</#if>
</#list>
</fo:table-body>
