Author: jacopoc
Date: Wed Dec 9 16:38:23 2009
New Revision: 888867
URL: http://svn.apache.org/viewvc?rev=888867&view=rev
Log:
Misc cleanups to the Gl Account Trial Balance; the html code was wrong and this
was causing layout issues; now it is better but still needs more love.
Modified:
ofbiz/trunk/applications/accounting/webapp/accounting/reports/GlAccountTrialBalanceReport.fo.ftl
ofbiz/trunk/applications/accounting/webapp/accounting/reports/GlAccountTrialBalanceReport.ftl
Modified:
ofbiz/trunk/applications/accounting/webapp/accounting/reports/GlAccountTrialBalanceReport.fo.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/webapp/accounting/reports/GlAccountTrialBalanceReport.fo.ftl?rev=888867&r1=888866&r2=888867&view=diff
==============================================================================
---
ofbiz/trunk/applications/accounting/webapp/accounting/reports/GlAccountTrialBalanceReport.fo.ftl
(original)
+++
ofbiz/trunk/applications/accounting/webapp/accounting/reports/GlAccountTrialBalanceReport.fo.ftl
Wed Dec 9 16:38:23 2009
@@ -54,12 +54,8 @@
<fo:table-column/>
<fo:table-column/>
<fo:table-column/>
- <fo:table-column/>
<fo:table-header>
<fo:table-cell border="1pt solid" border-width=".1mm">
- <fo:block
text-align="center">${uiLabelMap.Party}</fo:block>
- </fo:table-cell>
- <fo:table-cell border="1pt solid" border-width=".1mm">
<fo:block
text-align="center">${uiLabelMap.FormFieldTitle_transactionDate}</fo:block>
</fo:table-cell>
<fo:table-cell border="1pt solid" border-width=".1mm">
@@ -96,12 +92,6 @@
<fo:table-row border="1pt solid"
border-width=".1mm">
<fo:table-cell border="1pt solid"
border-width=".1mm">
<fo:block text-align="center">
- <#assign partyNameFrom =
(delegator.findOne("PartyNameView", {"partyId" :
acctgTransAndEntry.organizationPartyId}, true))!>
- ${(partyNameFrom.firstName)!}
${(partyNameFrom.lastName)!} ${(partyNameFrom.groupName)!}
- </fo:block>
- </fo:table-cell>
- <fo:table-cell border="1pt solid"
border-width=".1mm">
- <fo:block text-align="center">
<#if
acctgTransAndEntry.transactionDate?has_content>
<#assign dateFormat =
Static["java.text.DateFormat"].LONG/>
<#assign transactionDate =
Static["java.text.DateFormat"].getDateInstance(dateFormat,
locale).format((acctgTransAndEntry.transactionDate)!)/>
Modified:
ofbiz/trunk/applications/accounting/webapp/accounting/reports/GlAccountTrialBalanceReport.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/webapp/accounting/reports/GlAccountTrialBalanceReport.ftl?rev=888867&r1=888866&r2=888867&view=diff
==============================================================================
---
ofbiz/trunk/applications/accounting/webapp/accounting/reports/GlAccountTrialBalanceReport.ftl
(original)
+++
ofbiz/trunk/applications/accounting/webapp/accounting/reports/GlAccountTrialBalanceReport.ftl
Wed Dec 9 16:38:23 2009
@@ -23,49 +23,63 @@
<div>
<a
href="<@ofbizUrl>GlAccountTrialBalanceReportPdf.pdf?organizationPartyId=${organizationPartyId}&timePeriod=${parameters.timePeriod}&isPosted=${parameters.isPosted}&glAccountId=${parameters.glAccountId}</@ofbizUrl>"
class="buttontext">${uiLabelMap.AccountingInvoicePDF}</a>
</div>
+ <h3>${uiLabelMap.AccountingSubsidiaryLedger}</h3>
+ <h3>${uiLabelMap.FormFieldTitle_companyName} :
${(currentOrganization.groupName)!}</h3>
+ <h3>${uiLabelMap.AccountingTimePeriod} : <#if
currentTimePeriod?has_content>${(currentTimePeriod.fromDate)!}
${uiLabelMap.CommonTo} ${(currentTimePeriod.thruDate)!}</#if></h3>
+ <h3>${uiLabelMap.AccountingGlAccountNameAndGlAccountCode} :
${(glAccount.accountCode)!} - ${(glAccount.accountName)!}</h3>
<div style="width: 1210px;">
- <table border=1>
- <tr><th></th></tr>
- <tr><th colspan=9 style="height: 30px;"
ALIGN="center">${uiLabelMap.AccountingSubsidiaryLedger}</th></tr>
- <tr><th colspan=9 style="height: 30px;"
ALIGN="left">${uiLabelMap.FormFieldTitle_companyName} :
${(currentOrganization.groupName)!}</th></tr>
- <tr><th colspan=9 style="height: 30px;"
ALIGN="left">${uiLabelMap.AccountingTimePeriod} : <#if
currentTimePeriod?has_content>${(currentTimePeriod.fromDate)!}
${uiLabelMap.CommonTo} ${(currentTimePeriod.thruDate)!}</#if></th></tr>
- <tr><th colspan=9 style="height: 30px;"
ALIGN="left">${uiLabelMap.AccountingGlAccountNameAndGlAccountCode} :
${(glAccount.accountCode)!} - ${(glAccount.accountName)!}</th></tr>
+ <table border=2>
<tr>
- <th>${uiLabelMap.Party}</th>
-
<th>${uiLabelMap.FormFieldTitle_transactionDate}</th>
-
<th>${uiLabelMap.AccountingAccountTransactionId}</th>
- <th>${uiLabelMap.CommonDescription}</th>
- <th>${uiLabelMap.AccountingTypeOfTheCurrency}</th>
- <th>${uiLabelMap.AccountingOriginalCurrency}</th>
- <th>${uiLabelMap.AccountingDebitAmount}</th>
- <th>${uiLabelMap.AccountingCreditAmount}</th>
-
<th>${uiLabelMap.AccountingDebitOrCreditOfBalance}</th>
-
<th>${uiLabelMap.AccountingBalanceOfTheAccount}</th>
+ <td
align="left"><b>${uiLabelMap.FormFieldTitle_transactionDate}</b></td>
+ <td
align="left"><b>${uiLabelMap.AccountingAccountTransactionId}</b></td>
+ <td
align="left"><b>${uiLabelMap.CommonDescription}</b></td>
+ <td
align="left"><b>${uiLabelMap.AccountingTypeOfTheCurrency}</b></td>
+ <td
align="left"><b>${uiLabelMap.AccountingOriginalCurrency}</b></td>
+ <td
align="right"><b>${uiLabelMap.AccountingDebitAmount}</b></td>
+ <td
align="right"><b>${uiLabelMap.AccountingCreditAmount}</b></td>
+ <td
align="right"><b>${uiLabelMap.AccountingDebitOrCreditOfBalance}</b></td>
+ <td
align="right"><b>${uiLabelMap.AccountingBalanceOfTheAccount}</b></td>
+ </tr>
+ <tr class="header-row">
+ <td colspan=2></td>
+ <td colspan=3
align="center"><b>${uiLabelMap.AccountingTheBalanceOfLastYear}</b></td>
+ <td colspan=2></td>
+ <td ALIGN="right"><b><#if
(isDebitAccount)??>${uiLabelMap.AccountingDebitFlag}<#else>${uiLabelMap.AccountingCreditFlag}</#if></b></td>
+ <td ALIGN="right">${(openingBalance)!}</td>
</tr>
- <tr><th colspan=1><th colspan=1><th
colspan=3>${uiLabelMap.AccountingTheBalanceOfLastYear}<th
colspan=1></th></th></th></th><th></th><th ALIGN="center"><#if
(isDebitAccount)??>${uiLabelMap.AccountingDebitFlag}<#else>${uiLabelMap.AccountingCreditFlag}</#if></th><th
ALIGN="center">${(openingBalance)!}</th></tr>
<#list glAcctgTrialBalanceList as glAcctgTrialBalance>
<#assign acctgTransAndEntries =
glAcctgTrialBalance.acctgTransAndEntries/>
<#if acctgTransAndEntries?has_content>
<#list acctgTransAndEntries as
acctgTransAndEntry>
<tr>
- <td>
- <#assign partyNameFrom =
(delegator.findOne("PartyNameView", {"partyId" :
acctgTransAndEntry.organizationPartyId}, true))!>
- <a
href="/partymgr/control/viewprofile?partyId=${(partyNameFrom.partyId)!}&organizationPartyId=${(partyNameFrom.partyId)!}">${(partyNameFrom.firstName)!}
${(partyNameFrom.lastName)!} ${(partyNameFrom.groupName)!}</a>
- </td>
- <td
ALIGN="center">${(acctgTransAndEntry.transactionDate)!}</td>
- <td
ALIGN="center">${(acctgTransAndEntry.acctgTransId)!}</td>
- <td
ALIGN="center">${(acctgTransAndEntry.transDescription)!}</td>
- <td
ALIGN="center">${(acctgTransAndEntry.currencyUomId)!}</td>
- <td
ALIGN="center">${(acctgTransAndEntry.origCurrencyUomId)!}</td>
- <td ALIGN="center"><#if
(acctgTransAndEntry.debitCreditFlag)! ==
"D">${(acctgTransAndEntry.amount)!}<#else>0</#if></td>
- <td ALIGN="center"><#if
(acctgTransAndEntry.debitCreditFlag)! ==
"C">${(acctgTransAndEntry.amount)!}<#else>0</#if></td>
- <td ALIGN="center"></td>
- <td ALIGN="center"></td>
+ <td
ALIGN="left">${(acctgTransAndEntry.transactionDate)!}</td>
+ <td
ALIGN="left">${(acctgTransAndEntry.acctgTransId)!}</td>
+ <td
ALIGN="left">${(acctgTransAndEntry.transDescription)!}</td>
+ <td
ALIGN="left">${(acctgTransAndEntry.currencyUomId)!}</td>
+ <td
ALIGN="left">${(acctgTransAndEntry.origCurrencyUomId)!}</td>
+ <td ALIGN="right"><#if
(acctgTransAndEntry.debitCreditFlag)! ==
"D">${(acctgTransAndEntry.amount)!}<#else>0</#if></td>
+ <td ALIGN="right"><#if
(acctgTransAndEntry.debitCreditFlag)! ==
"C">${(acctgTransAndEntry.amount)!}<#else>0</#if></td>
+ <td ALIGN="right"></td>
+ <td ALIGN="right"></td>
</tr>
</#list>
- <tr><td colspan = 1 ALIGN="center"
ALIGN="center"><td colspan = 1 ALIGN="center"><td colspan=3
ALIGN="center"><b>${uiLabelMap.AccountingTotalOfTheCurrentMonth}</b></td></td></td><td
ALIGN="center" colspan=1><b>${(glAcctgTrialBalance.debitTotal)!}</b></td><td
ALIGN="center" colspan=1><b>${(glAcctgTrialBalance.creditTotal)!}</b></td><td
ALIGN="center" colspan=1><b><#if
(isDebitAccount)??>${uiLabelMap.AccountingDebitFlag}<#else>${uiLabelMap.AccountingCreditFlag}</#if></b></td><td
ALIGN="center"
colspan=1><b>${(glAcctgTrialBalance.debitCreditDifference)!}</b></td></tr>
- <tr><td colspan = 1 ALIGN="center"><td
ALIGN="center" colspan = 1><td ALIGN="center"
colspan=3><b>${uiLabelMap.AccountingTotalOfYearToDate}</b></td></td></td></td><td
ALIGN="center"
colspan=1><b>${glAcctgTrialBalance.totalOfYearToDateDebit}</b></td><td
ALIGN="center"
colspan=1><b>${glAcctgTrialBalance.totalOfYearToDateCredit}</b></td><td
ALIGN="center" colspan=1><b><#if
(isDebitAccount)??>${uiLabelMap.AccountingDebitFlag}<#else>${uiLabelMap.AccountingCreditFlag}</#if></b></td><td
ALIGN="center"
colspan=1><b>${(glAcctgTrialBalance.balanceOfTheAcctgForYear)!}</b></td></tr>
+ <tr class="header-row">
+ <td colspan=2></td>
+ <td colspan=3
ALIGN="center"><b>${uiLabelMap.AccountingTotalOfTheCurrentMonth}</b></td>
+ <td ALIGN="right"
colspan=1><b>${(glAcctgTrialBalance.debitTotal)!}</b></td>
+ <td ALIGN="right"
colspan=1><b>${(glAcctgTrialBalance.creditTotal)!}</b></td>
+ <td ALIGN="right" colspan=1><b><#if
(isDebitAccount)??>${uiLabelMap.AccountingDebitFlag}<#else>${uiLabelMap.AccountingCreditFlag}</#if></b></td>
+ <td ALIGN="right"
colspan=1><b>${(glAcctgTrialBalance.debitCreditDifference)!}</b></td>
+ </tr>
+ <tr class="header-row">
+ <td colspan=2></td>
+ <td ALIGN="center"
colspan=3><b>${uiLabelMap.AccountingTotalOfYearToDate}</b></td>
+ <td
ALIGN="right"><b>${glAcctgTrialBalance.totalOfYearToDateDebit}</b></td>
+ <td
ALIGN="right"><b>${glAcctgTrialBalance.totalOfYearToDateCredit}</b></td>
+ <td ALIGN="right"><b><#if
(isDebitAccount)??>${uiLabelMap.AccountingDebitFlag}<#else>${uiLabelMap.AccountingCreditFlag}</#if></b></td>
+ <td
ALIGN="right"><b>${(glAcctgTrialBalance.balanceOfTheAcctgForYear)!}</b></td>
+ </tr>
</#if>
</#list>
</table>
