[wiaflos-devel] COMMIT - r262 - trunk/contrib/templates/reports
svn at linuxrulz.org
svn at linuxrulz.org
Sun Nov 9 12:40:05 GMT 2008
Author: nkukard
Date: 2008-11-09 12:40:05 +0000 (Sun, 09 Nov 2008)
New Revision: 262
Modified:
trunk/contrib/templates/reports/README
trunk/contrib/templates/reports/accountbalances1.tt2
trunk/contrib/templates/reports/balancesheet1.tt2
trunk/contrib/templates/reports/incomestatement1.tt2
trunk/contrib/templates/reports/trialbalance1.tt2
Log:
* Updated reports to use API_RPT_BALANCE_BF if opening balances are needed
* More standards compliance fixes
Modified: trunk/contrib/templates/reports/README
===================================================================
--- trunk/contrib/templates/reports/README 2008-11-09 12:36:00 UTC (rev 261)
+++ trunk/contrib/templates/reports/README 2008-11-09 12:40:05 UTC (rev 262)
@@ -33,6 +33,9 @@
api_account_balances - Return account balances
+ Params: flags
+ API_RPT_BALANCE_BF - Include balance brought forward as opening balance
+ Return hash..
Number: text
- Account number
Name: text
Modified: trunk/contrib/templates/reports/accountbalances1.tt2
===================================================================
--- trunk/contrib/templates/reports/accountbalances1.tt2 2008-11-09 12:36:00 UTC (rev 261)
+++ trunk/contrib/templates/reports/accountbalances1.tt2 2008-11-09 12:40:05 UTC (rev 262)
@@ -8,7 +8,7 @@
<body>
[% # Pull account balances from backend
- SET data = api_account_balances()
+ SET data = api_account_balances(API_RPT_BALANCE_BF)
%]
<table id="page" width="100%">
@@ -19,7 +19,7 @@
<td colspan="2" class="bigtext border centeralign bold">
A C C O U N T B A L A N C E S
<br />
- [% StartDate %] to [% EndDate %]
+ as at [% EndDate %]
</td>
</tr>
<tr>
Modified: trunk/contrib/templates/reports/balancesheet1.tt2
===================================================================
--- trunk/contrib/templates/reports/balancesheet1.tt2 2008-11-09 12:36:00 UTC (rev 261)
+++ trunk/contrib/templates/reports/balancesheet1.tt2 2008-11-09 12:40:05 UTC (rev 262)
@@ -8,7 +8,7 @@
<body>
[% # Pull account balances from backend
- SET data = api_account_balances()
+ SET data = api_account_balances(API_RPT_BALANCE_BF)
%]
<table id="page" width="100%">
@@ -19,7 +19,7 @@
<td colspan="2" class="bigtext border centeralign bold">
B A L A N C E S H E E T
<br />
- [% StartDate %] to [% EndDate %]
+ as at [% EndDate %]
</td>
</tr>
<tr>
Modified: trunk/contrib/templates/reports/incomestatement1.tt2
===================================================================
--- trunk/contrib/templates/reports/incomestatement1.tt2 2008-11-09 12:36:00 UTC (rev 261)
+++ trunk/contrib/templates/reports/incomestatement1.tt2 2008-11-09 12:40:05 UTC (rev 262)
@@ -53,15 +53,15 @@
[% # For income, reverse amount and use brackets
IF rwcatcode == '60'
%]
- [% api_format_amount(item.ClosingBalance,API_FMT_REVERSE + API_FMT_NEGBRACKET) %]
+ [% api_format_amount(item.Balance,API_FMT_REVERSE + API_FMT_NEGBRACKET) %]
[% ELSE %]
- [% api_format_amount(item.ClosingBalance,API_FMT_NEGBRACKET) %]
+ [% api_format_amount(item.Balance,API_FMT_NEGBRACKET) %]
[% END %]
</td>
</tr>
[% # Add amount to variable
- api_variable_add(rwcatcode,item.ClosingBalance)
+ api_variable_add(rwcatcode,item.Balance)
%]
[% # If we have children
@@ -77,9 +77,9 @@
[% # For assets, reverse amount and use brackets
IF rwcatcode == '60'
%]
- [% api_format_amount(child.ClosingBalance,API_FMT_REVERSE + API_FMT_NEGBRACKET) %]
+ [% api_format_amount(child.Balance,API_FMT_REVERSE + API_FMT_NEGBRACKET) %]
[% ELSE %]
- [% api_format_amount(child.ClosingBalance,API_FMT_NEGBRACKET) %]
+ [% api_format_amount(child.Balance,API_FMT_NEGBRACKET) %]
[% END %]
</td>
</tr>
Modified: trunk/contrib/templates/reports/trialbalance1.tt2
===================================================================
--- trunk/contrib/templates/reports/trialbalance1.tt2 2008-11-09 12:36:00 UTC (rev 261)
+++ trunk/contrib/templates/reports/trialbalance1.tt2 2008-11-09 12:40:05 UTC (rev 262)
@@ -8,7 +8,7 @@
<body>
[% # Pull account balances from backend
- SET data = api_account_balances()
+ SET data = api_account_balances(API_RPT_BALANCE_BF)
%]
<table id="page" width="100%">
More information about the wiaflos-devel
mailing list