[wiaflos-devel] COMMIT - r259 - trunk/contrib/templates/reports

svn at linuxrulz.org svn at linuxrulz.org
Sat Nov 8 17:56:30 GMT 2008


Author: nkukard
Date: 2008-11-08 17:56:30 +0000 (Sat, 08 Nov 2008)
New Revision: 259

Removed:
   trunk/contrib/templates/reports/readme.txt
Modified:
   trunk/contrib/templates/reports/README
   trunk/contrib/templates/reports/accountbalances1.tt2
   trunk/contrib/templates/reports/balancesheet1.tt2
   trunk/contrib/templates/reports/chartofaccounts1.tt2
   trunk/contrib/templates/reports/incomestatement1.tt2
   trunk/contrib/templates/reports/inventorystocksheet1.tt2
   trunk/contrib/templates/reports/trialbalance1.tt2
Log:
* Updated reports to be more comformative to standards
* Updated README


Modified: trunk/contrib/templates/reports/README
===================================================================
--- trunk/contrib/templates/reports/README	2008-11-08 16:45:29 UTC (rev 258)
+++ trunk/contrib/templates/reports/README	2008-11-08 17:56:30 UTC (rev 259)
@@ -1,3 +1,34 @@
+Here are the variables defined:
+
+*
+* VARIABLES FOR INVOICE ITSELF
+*
+
+Misc:
+-----
+WiaflosString: text
+	- "Generated by $APPNAME ($APPURL)"
+
+
+
+Report Details:
+----------------
+
+StartDate: text
+	- Report start date
+
+EndDate: text
+	- End date
+
+
+ReportWriterCategoryToAccounts: hash of report writer categories, each item is
+an array of accounts linked to this category code
+
+
+ReportWriterCategories: hash of report writer categories, keyed by the report
+writer category code
+
+
 Reporting API functions:
 
 
@@ -2,2 +33,14 @@
 api_account_balances - Return account balances
+	Number: text
+		- Account number
+	Name: text
+		- Account name
+	CreditAmount: text
+		- Credit amount
+	DebitAmount: text
+		- Debit amount
+	ReportWriterCategoryCode: text
+		- Report writer category code
+	Children: array of hashes
+		- Array of account children
 

Modified: trunk/contrib/templates/reports/accountbalances1.tt2
===================================================================
--- trunk/contrib/templates/reports/accountbalances1.tt2	2008-11-08 16:45:29 UTC (rev 258)
+++ trunk/contrib/templates/reports/accountbalances1.tt2	2008-11-08 17:56:30 UTC (rev 259)
@@ -7,7 +7,9 @@
 
 <body>
 
-[% SET data = api_account_balances() %]
+[% # Pull account balances from backend
+	SET data = api_account_balances() 
+%]
 
 <table id="page" width="100%">
 	<colgroup span="2" width="50%">
@@ -28,11 +30,23 @@
 					<td class="border centeralign">Description</td>
 					<td class="border centeralign">Balance</td>
 				</tr>
-					[% FOREACH item = data.AccountBalances %]
+					[% # Loop with balances
+						FOREACH item = data.AccountBalances 
+					%]
 						<tr>
 							<td class="bold">[% item.value.Number %]</td>
 							<td class="bold">[% item.value.Name %]</td>
-							<td class="rightalign bold">[% item.value.ClosingBalance %]</td>
+							<td class="rightalign bold">
+								[% # For Assets, Liabilities, Equity, Income & Expenses
+									IF item.value.ReportWriterCategoryCode == '20' || 
+										item.value.ReportWriterCategoryCode == '40' || 
+										item.value.ReportWriterCategoryCode == '60'
+								%]
+									[% api_format_amount(item.value.ClosingBalance,API_FMT_REVERSE) %]
+								[% ELSE %]
+									[% item.value.ClosingBalance %]
+								[% END %]
+							</td>
 						</tr>
 					[% END %]
 				<tr>

Modified: trunk/contrib/templates/reports/balancesheet1.tt2
===================================================================
--- trunk/contrib/templates/reports/balancesheet1.tt2	2008-11-08 16:45:29 UTC (rev 258)
+++ trunk/contrib/templates/reports/balancesheet1.tt2	2008-11-08 17:56:30 UTC (rev 259)
@@ -7,7 +7,9 @@
 
 <body>
 
-[% SET data = api_account_balances() %]
+[% # Pull account balances from backend
+	SET data = api_account_balances() 
+%]
 
 <table id="page" width="100%">
 	<colgroup span="2" width="50%">
@@ -28,7 +30,14 @@
 					<td class="border centeralign">Description</td>
 					<td class="border centeralign">Balance</td>
 				</tr>
-					[% FOREACH rwcatcode = [ '00', '20', '40' ] %]
+					[%  # Loop with Assets, Liabilities & Equity
+						FOREACH rwcatcode IN [ '00', '20', '40' ] 
+					%]
+
+						[%  # Create a float to total up this reporting category
+							api_variable_new(rwcatcode,'float') 
+						%]
+
 						<tr>
 							<td class="centeralign bold" colspan="6">
 								[% data.ReportWriterCategories.${rwcatcode}.Code %]
@@ -36,26 +45,73 @@
 								[% data.ReportWriterCategories.${rwcatcode}.Description %]
 							</td>
 						</tr>
-						[% FOREACH item = data.ReportWriterCategoryToAccounts.${rwcatcode} %]
+
+						[% # Loop with main accounts in this category
+							FOREACH item IN data.ReportWriterCategoryToAccounts.${rwcatcode} 
+						%]
 							<tr>
 								<td class="bold">[% item.Number %]</td>
 								<td class="bold">[% item.Name %]</td>
-								<td class="rightalign bold">[% item.ClosingBalance %]</td>
+								<td class="rightalign bold">
+									[% # For liabilities and equity, reverse amount and use brackets
+										IF rwcatcode == '20' || rwcatcode == '40' 
+									%]
+										[% api_format_amount(item.ClosingBalance,API_FMT_REVERSE + API_FMT_NEGBRACKET) %]
+									[% ELSE %]
+										[% api_format_amount(item.ClosingBalance,API_FMT_NEGBRACKET) %]
+									[% END %]
+								</td>
 							</tr>
-							[% IF item.Children %]
-								[% FOREACH child = item.Children %]
+
+							[% # Add amount to variable
+								api_variable_add(rwcatcode,item.ClosingBalance) 
+							%]
+
+							[% # If we have children
+								IF item.Children 
+							%]
+								[% # Loop with children 
+									FOREACH child IN item.Children 
+								%]
 									<tr>
 										<td>[% child.Number %]</td>
 										<td >[% child.Name %]</td>
-										<td class="rightalign">[% child.ClosingBalance %]</td>
+										<td class="rightalign">
+											[% # For liabilities and equity, reverse amount and use brackets
+												IF rwcatcode == '20' || rwcatcode == '40' 
+											%]
+												[% api_format_amount(child.ClosingBalance,API_FMT_REVERSE + API_FMT_NEGBRACKET) %]
+											[% ELSE %]
+												[% api_format_amount(child.ClosingBalance,API_FMT_NEGBRACKET) %]
+											[% END %]
+										</td>
 									</tr>
 								[% END %]
 							[% END %]
 						[% END %]
+						<tr>
+							<td style="border-top: solid 2px black; border-bottom: solid 1px black;" class="bold" colspan="2">
+								[% data.ReportWriterCategories.${rwcatcode}.Description %] Total
+							</td>
+							<td style="border-top: solid 2px black; border-bottom: solid 1px black;" class="rightalign bold">
+								[% # For liabilities and equity, reverse amount and use brackets
+									IF rwcatcode == '20' || rwcatcode == '40' 
+								%]
+									[% api_format_amount(api_variable_getraw(rwcatcode),API_FMT_REVERSE + API_FMT_NEGBRACKET) %]
+								[% ELSE %]
+									[% api_format_amount(api_variable_getraw(rwcatcode),API_FMT_NEGBRACKET) %]
+								[% END %]
+							</td>
+						</tr>
 					[% END %]
 				<tr>
-					<td class="bold" colspan="2">TOTAL LIABILITIES AND EQUITY</td>
-					<td class="rightalign bold">xyz</td>
+					<td style="border-top: double 2px black;" class="bold" colspan="2">TOTAL LIABILITIES AND EQUITY</td>
+					[% api_variable_new('total_liabilities_equity','float') %]
+					[% api_variable_add('total_liabilities_equity',api_variable_getraw('20')) %]
+					[% api_variable_add('total_liabilities_equity',api_variable_getraw('40')) %]
+					<td style="border-top: double 2px black;" class="rightalign bold">
+						[% api_format_amount(api_variable_getraw('total_liabilities_equity'),API_FMT_REVERSE + API_FMT_NEGBRACKET) %]
+					</td>
 				</tr>
 				<tr>
 					<td class="centeralign" colspan="4">All values in <span class="bold">USD</span> funds.</td>

Modified: trunk/contrib/templates/reports/chartofaccounts1.tt2
===================================================================
--- trunk/contrib/templates/reports/chartofaccounts1.tt2	2008-11-08 16:45:29 UTC (rev 258)
+++ trunk/contrib/templates/reports/chartofaccounts1.tt2	2008-11-08 17:56:30 UTC (rev 259)
@@ -7,7 +7,9 @@
 
 <body>
 
-[% SET data = api_account_balances() %]
+[% # Pull account balances from backend
+	SET data = api_account_balances() 
+%]
 
 <table id="page" width="100%">
 	<colgroup span="2" width="50%">
@@ -29,7 +31,13 @@
 					<td class="border centeralign">Debit</td>
 					<td class="border centeralign">Credit</td>
 				</tr>
-					[% FOREACH rwcatcode = [ '00', '20', '40', '60', '80' ] %]
+					[%  # Create a float to total up this reporting category %]
+					[% api_variable_new('debit_balance','float') %]
+					[% api_variable_new('credit_balance','float') %]
+
+					[% # Loop with report categories
+						FOREACH rwcatcode = [ '00', '20', '40', '60', '80' ] 
+					%]
 						<tr>
 							<td class="centeralign bold" colspan="4">
 								[% data.ReportWriterCategories.${rwcatcode}.Code %]
@@ -37,15 +45,26 @@
 								[% data.ReportWriterCategories.${rwcatcode}.Description %]
 							</td>
 						</tr>
-						[% FOREACH item = data.ReportWriterCategoryToAccounts.${rwcatcode} %]
+						[% # Loop with main accounts in this category
+							FOREACH item = data.ReportWriterCategoryToAccounts.${rwcatcode} 
+						%]
 							<tr>
 								<td class="bold">[% item.Number %]</td>
 								<td class="bold">[% item.Name %]</td>
 								<td class="rightalign bold">[% item.DebitAmount %]</td>
 								<td class="rightalign bold">[% item.CreditAmount %]</td>
 							</tr>
-							[% IF item.Children %]
-								[% FOREACH child = item.Children %]
+
+							[% # Add amount to variable %]
+							[% api_variable_add('debit_balance',item.DebitAmount) %]
+							[% api_variable_add('credit_balance',item.CreditAmount) %]
+
+							[% # If we have children
+								IF item.Children 
+							%]
+								[% # Loop with children 
+									FOREACH child = item.Children 
+								%]
 									<tr>
 										<td>[% child.Number %]</td>
 										<td >[% child.Name %]</td>
@@ -57,6 +76,16 @@
 						[% END %]
 					[% END %]
 				<tr>
+						<td></td>
+						<td></td>
+						<td style="border-top: solid 2px black; border-bottom: solid 1px black;" class="rightalign bold">
+								[% api_variable_get('debit_balance') %]
+						</td>
+						<td style="border-top: solid 2px black; border-bottom: solid 1px black;" class="rightalign bold">
+								[% api_variable_get('credit_balance') %]
+						</td>
+				</tr>
+				<tr>
 					<td class="centeralign" colspan="4">All values in <span class="bold">USD</span> funds.</td>
 				</tr>
 			</table>

Modified: trunk/contrib/templates/reports/incomestatement1.tt2
===================================================================
--- trunk/contrib/templates/reports/incomestatement1.tt2	2008-11-08 16:45:29 UTC (rev 258)
+++ trunk/contrib/templates/reports/incomestatement1.tt2	2008-11-08 17:56:30 UTC (rev 259)
@@ -7,7 +7,9 @@
 
 <body>
 
-[% SET data = api_account_balances() %]
+[% # Pull account balances from backend
+	SET data = api_account_balances() 
+%]
 
 <table id="page" width="100%">
 	<colgroup span="2" width="50%">
@@ -27,7 +29,13 @@
 					<td class="border centeralign">Account</td>
 					<td class="border centeralign">Description</td>
 				</tr>
-					[% FOREACH rwcatcode = [ '60', '80' ] %]
+					[%  # Loop with Income and Expenses
+						FOREACH rwcatcode = [ '60', '80' ] 
+					%]
+						[%  # Create a float to total up this reporting category
+							api_variable_new(rwcatcode,'float') 
+						%]
+
 						<tr>
 							<td class="centeralign bold" colspan="6">
 								[% data.ReportWriterCategories.${rwcatcode}.Code %]
@@ -35,26 +43,72 @@
 								[% data.ReportWriterCategories.${rwcatcode}.Description %]
 							</td>
 						</tr>
-						[% FOREACH item = data.ReportWriterCategoryToAccounts.${rwcatcode} %]
+						[% # Loop with main accounts in this category
+							FOREACH item = data.ReportWriterCategoryToAccounts.${rwcatcode} 
+						%]
 							<tr>
 								<td class="bold">[% item.Number %]</td>
 								<td class="bold">[% item.Name %]</td>
-								<td class="rightalign bold">[% item.EndingBalance %]</td>
+								<td class="rightalign bold">
+									[% # For income, reverse amount and use brackets
+										IF rwcatcode == '60'
+									%]
+										[% api_format_amount(item.ClosingBalance,API_FMT_REVERSE + API_FMT_NEGBRACKET) %]
+									[% ELSE %]
+										[% api_format_amount(item.ClosingBalance,API_FMT_NEGBRACKET) %]
+									[% END %]
+								</td>
 							</tr>
-							[% IF item.Children %]
-								[% FOREACH child = item.Children %]
+
+							[% # Add amount to variable
+								api_variable_add(rwcatcode,item.ClosingBalance) 
+							%]
+
+							[% # If we have children
+								IF item.Children 
+							%]
+								[% # Loop with children
+									FOREACH child = item.Children 
+								%]
 									<tr>
 										<td>[% child.Number %]</td>
 										<td >[% child.Name %]</td>
-										<td class="rightalign">[% child.EndingBalance %]</td>
+										<td class="rightalign">
+											[% # For assets, reverse amount and use brackets
+												IF rwcatcode == '60'
+											%]
+												[% api_format_amount(child.ClosingBalance,API_FMT_REVERSE + API_FMT_NEGBRACKET) %]
+											[% ELSE %]
+												[% api_format_amount(child.ClosingBalance,API_FMT_NEGBRACKET) %]
+											[% END %]
+										</td>
 									</tr>
 								[% END %]
 							[% END %]
 						[% END %]
+						<tr>
+							<td style="border-top: solid 2px black; border-bottom: solid 1px black;" class="bold" colspan="2">
+								[% data.ReportWriterCategories.${rwcatcode}.Description %] Total
+							</td>
+							<td style="border-top: solid 2px black; border-bottom: solid 1px black;" class="rightalign bold">
+								[% # For assets, reverse amount and use brackets
+									IF rwcatcode == '60'
+								%]
+									[% api_format_amount(api_variable_getraw(rwcatcode),API_FMT_REVERSE + API_FMT_NEGBRACKET) %]
+								[% ELSE %]
+									[% api_format_amount(api_variable_getraw(rwcatcode),API_FMT_NEGBRACKET) %]
+								[% END %]
+							</td>
+						</tr>
 					[% END %]
 				<tr>
-					<td class="bold" colspan="2">INCOME / (LOSS)</td>
-					<td class="rightalign bold">xyz</td>
+					<td style="border-top: double 2px black;" class="bold" colspan="2">INCOME / (LOSS)</td>
+					[% api_variable_new('income_loss','float') %]
+					[% api_variable_add('income_loss',api_variable_getraw('60')) %]
+					[% api_variable_add('income_loss',api_variable_getraw('80')) %]
+					<td style="border-top: double 2px black;" class="rightalign bold">
+						[% api_format_amount(api_variable_getraw('income_loss'),API_FMT_REVERSE + API_FMT_NEGBRACKET) %]
+					</td>
 				</tr>
 				<tr>
 					<td class="centeralign" colspan="4">All values in <span class="bold">USD</span> funds.</td>

Modified: trunk/contrib/templates/reports/inventorystocksheet1.tt2
===================================================================
--- trunk/contrib/templates/reports/inventorystocksheet1.tt2	2008-11-08 16:45:29 UTC (rev 258)
+++ trunk/contrib/templates/reports/inventorystocksheet1.tt2	2008-11-08 17:56:30 UTC (rev 259)
@@ -7,7 +7,9 @@
 
 <body>
 
-[% SET data = api_inventory_stock_balances() %]
+[% # Grab inventory stock balances
+	SET data = api_inventory_stock_balances() 
+%]
 
 <table id="page" width="100%">
 	<colgroup span="2" width="50%">
@@ -28,7 +30,9 @@
 					<td class="border centeralign">Quantity On Hand</td>
 					<td class="border centeralign">Value Of Stock</td>
 				</tr>
-					[% FOREACH item = data.StockBalances %]
+					[% # Loop with stock balances
+						FOREACH item = data.StockBalances 
+					%]
 						<tr>
 							<td class="bold">[% item.key %]</td>
 							<td class="bold rightalign">[% item.value.TotalQuantity %]</td>

Deleted: trunk/contrib/templates/reports/readme.txt
===================================================================
--- trunk/contrib/templates/reports/readme.txt	2008-11-08 16:45:29 UTC (rev 258)
+++ trunk/contrib/templates/reports/readme.txt	2008-11-08 17:56:30 UTC (rev 259)
@@ -1,55 +0,0 @@
-Here are the variables defined:
-
-*
-* VARIABLES FOR INVOICE ITSELF
-*
-
-Misc:
------
-WiaflosString: text
-	- "Generated by $APPNAME ($APPURL)"
-
-
-
-Report Details:
-----------------
-
-StartDate: text
-	- Report start date
-
-EndDate: text
-	- End date
-
-
-
-Account items:
---------------
-
-AccountBalances: hashes of account numbers
-	Number: text
-		- Account number
-
-	Name: text
-		- Account name
-
-	CreditAmount: text
-		- Credit amount
-
-	DebitAmount: text
-		- Debit amount
-
-	ReportWriterCategoryCode: text
-		- Report writer category code
-
-	Children: array of hashes
-		- Array of account children
-
-
-ReportWriterCategoryToAccounts: hash of report writer categories, each item is
-an array of accounts linked to this category code
-
-
-ReportWriterCategories: hash of report writer categories, keyed by the report
-writer category code
-
-

Modified: trunk/contrib/templates/reports/trialbalance1.tt2
===================================================================
--- trunk/contrib/templates/reports/trialbalance1.tt2	2008-11-08 16:45:29 UTC (rev 258)
+++ trunk/contrib/templates/reports/trialbalance1.tt2	2008-11-08 17:56:30 UTC (rev 259)
@@ -7,7 +7,9 @@
 
 <body>
 
-[% SET data = api_account_balances() %]
+[% # Pull account balances from backend
+	SET data = api_account_balances() 
+%]
 
 <table id="page" width="100%">
 	<colgroup span="2" width="50%">
@@ -31,7 +33,20 @@
 					<td class="border centeralign">Credit</td>
 					<td class="border centeralign">Ending Balance</td>
 				</tr>
-					[% FOREACH rwcatcode = [ '00', '20', '40', '60', '80' ] %]
+					[% # And global %]
+					[% api_variable_new('CreditBalance','float') %]
+					[% api_variable_new('DebitBalance','float') %]
+
+					[%  # Loop with Assets, Liabilities, Equity, Income & Expenses
+						FOREACH rwcatcode IN [ '00', '20', '40', '60', '80' ]
+					%]
+						[%  # Create a float to total up this reporting category %]
+						[% api_variable_new(rwcatcode _ ':OpeningBalance','float') %]
+						[% api_variable_new(rwcatcode _ ':DebitBalance','float') %]
+						[% api_variable_new(rwcatcode _ ':CreditBalance','float') %]
+						[% api_variable_new(rwcatcode _ ':ClosingBalance','float') %]
+						[% api_variable_new(rwcatcode _ ':DebitBalance','float') %]
+
 						<tr>
 							<td class="centeralign bold" colspan="6">
 								[% data.ReportWriterCategories.${rwcatcode}.Code %]
@@ -39,31 +54,120 @@
 								[% data.ReportWriterCategories.${rwcatcode}.Description %]
 							</td>
 						</tr>
-						[% FOREACH item = data.ReportWriterCategoryToAccounts.${rwcatcode} %]
+						[% # Loop with main accounts in this category
+							FOREACH item IN data.ReportWriterCategoryToAccounts.${rwcatcode} 
+						%]
 							<tr>
 								<td class="bold">[% item.Number %]</td>
 								<td class="bold">[% item.Name %]</td>
-								<td class="rightalign bold">[% item.OpeningBalance %]</td>
+								<td class="rightalign bold">
+									[% # For Assets, Liabilities, Equity, Income & Expenses
+										IF rwcatcode == '20' || rwcatcode == '40' || rwcatcode == '60'
+									%]
+										[% api_format_amount(item.OpeningBalance,API_FMT_REVERSE) %]
+									[% ELSE %]
+										[% item.OpeningBalance %]
+									[% END %]
+								</td>
 								<td class="rightalign bold">[% item.DebitBalance %]</td>
 								<td class="rightalign bold">[% item.CreditBalance %]</td>
-								<td class="rightalign bold">[% item.ClosingBalance %]</td>
+								<td class="rightalign bold">
+									[% # For Assets, Liabilities, Equity, Income & Expenses
+										IF rwcatcode == '20' || rwcatcode == '40' || rwcatcode == '60'
+									%]
+										[% api_format_amount(item.ClosingBalance,API_FMT_REVERSE) %]
+									[% ELSE %]
+										[% item.ClosingBalance %]
+									[% END %]
+								</td>
 							</tr>
-							[% IF item.Children %]
-								[% FOREACH child = item.Children %]
+
+							[% # Add amount to variable %]
+							[% api_variable_add(rwcatcode _ ':OpeningBalance',item.OpeningBalance) %]
+							[% api_variable_add(rwcatcode _ ':DebitBalance',item.DebitBalance) %]
+							[% api_variable_add(rwcatcode _ ':CreditBalance',item.CreditBalance) %]
+							[% api_variable_add(rwcatcode _ ':ClosingBalance',item.ClosingBalance) %]
+							[% # Global Vars %]
+							[% api_variable_add('DebitBalance',item.DebitBalance) %]
+							[% api_variable_add('CreditBalance',item.CreditBalance) %]
+
+							[% # If we have children
+								IF item.Children 
+							%]
+								[% # Loop with children 
+									FOREACH child IN item.Children 
+								%]
 									<tr>
 										<td>[% child.Number %]</td>
 										<td >[% child.Name %]</td>
-										<td class="rightalign">[% child.OpeningBalance %]</td>
+										<td class="rightalign">
+											[% # For Assets, Liabilities, Equity, Income & Expenses
+												IF rwcatcode == '20' || rwcatcode == '40' || rwcatcode == '60'
+											%]
+												[% api_format_amount(child.OpeningBalance,API_FMT_REVERSE) %]
+											[% ELSE %]
+												[% child.OpeningBalance %]
+											[% END %]
+										</td>
 										<td class="rightalign">[% child.DebitBalance %]</td>
 										<td class="rightalign">[% child.CreditBalance %]</td>
-										<td class="rightalign">[% child.ClosingBalance %]</td>
+										<td class="rightalign">
+											[% # For Assets, Liabilities, Equity, Income & Expenses
+												IF rwcatcode == '20' || rwcatcode == '40' || rwcatcode == '60'
+											%]
+												[% api_format_amount(child.ClosingBalance,API_FMT_REVERSE) %]
+											[% ELSE %]
+												[% child.ClosingBalance %]
+											[% END %]
+										</td>
 									</tr>
 								[% END %]
 							[% END %]
 						[% END %]
+						<tr>
+							<td style="border-top: solid 2px black; border-bottom: solid 1px black;" class="bold" colspan="2">
+								[% data.ReportWriterCategories.${rwcatcode}.Description %] Total
+							</td>
+							<td style="border-top: solid 2px black; border-bottom: solid 1px black;" class="rightalign bold">
+								[% # For Assets, Liabilities, Equity, Income & Expenses
+									IF rwcatcode == '20' || rwcatcode == '40' || rwcatcode == '60'
+								%]
+									[% api_format_amount(api_variable_getraw(rwcatcode _ ':OpeningBalance'),API_FMT_REVERSE) %]
+								[% ELSE %]
+									[% api_variable_get(rwcatcode _ ':OpeningBalance') %]
+								[% END %]
+							</td>
+							<td style="border-top: solid 2px black; border-bottom: solid 1px black;" class="rightalign bold">
+									[% api_variable_get(rwcatcode _ ':DebitBalance') %]
+							</td>
+							<td style="border-top: solid 2px black; border-bottom: solid 1px black;" class="rightalign bold">
+									[% api_variable_get(rwcatcode _ ':CreditBalance') %]
+							</td>
+							<td style="border-top: solid 2px black; border-bottom: solid 1px black;" class="rightalign bold">
+								[% # For Assets, Liabilities, Equity, Income & Expenses
+									IF rwcatcode == '20' || rwcatcode == '40' || rwcatcode == '60'
+								%]
+									[% api_format_amount(api_variable_getraw(rwcatcode _ ':ClosingBalance'),API_FMT_REVERSE) %]
+								[% ELSE %]
+									[% api_variable_get(rwcatcode _ ':ClosingBalance') %]
+								[% END %]
+							</td>
+						</tr>
 					[% END %]
+					<tr>
+						<td></td>
+						<td></td>
+						<td></td>
+						<td style="border-top: solid 2px black; border-bottom: solid 1px black;" class="rightalign bold">
+								[% api_variable_get('DebitBalance') %]
+						</td>
+						<td style="border-top: solid 2px black; border-bottom: solid 1px black;" class="rightalign bold">
+								[% api_variable_get('CreditBalance') %]
+						</td>
+						<td></td>
+					</tr>
 				<tr>
-					<td class="centeralign" colspan="4">All values in <span class="bold">USD</span> funds.</td>
+					<td class="centeralign" colspan="6">All values in <span class="bold">USD</span> funds.</td>
 				</tr>
 			</table>
 		</td>



More information about the wiaflos-devel mailing list