projects
/
fa-stable.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Replaced the Excel Writer engine with XLS driver (the XML driver can later be downloaded)
[fa-stable.git]
/
reporting
/
rep701.php
diff --git
a/reporting/rep701.php
b/reporting/rep701.php
index a0e7600fef528778c31ff94e9d3cc8648c7ff2fd..63c90c39ede42b88b85206d4c4224389b1e33793 100644
(file)
--- a/
reporting/rep701.php
+++ b/
reporting/rep701.php
@@
-25,7
+25,6
@@
include_once($path_to_root . "/gl/includes/gl_db.inc");
//----------------------------------------------------------------------------------------------------
//----------------------------------------------------------------------------------------------------
-// trial_inquiry_controls();
print_Chart_of_Accounts();
//----------------------------------------------------------------------------------------------------
print_Chart_of_Accounts();
//----------------------------------------------------------------------------------------------------
@@
-34,10
+33,14
@@
function print_Chart_of_Accounts()
{
global $path_to_root;
{
global $path_to_root;
- include_once($path_to_root . "/reporting/includes/pdf_report.inc");
-
$showbalance = $_POST['PARAM_0'];
$comments = $_POST['PARAM_1'];
$showbalance = $_POST['PARAM_0'];
$comments = $_POST['PARAM_1'];
+ $destination = $_POST['PARAM_2'];
+ if ($destination)
+ include_once($path_to_root . "/reporting/includes/excel_report.inc");
+ else
+ include_once($path_to_root . "/reporting/includes/pdf_report.inc");
+
$dec = 0;
$cols = array(0, 50, 300, 425, 500);
$dec = 0;
$cols = array(0, 50, 300, 425, 500);
@@
-48,7
+51,7
@@
function print_Chart_of_Accounts()
$params = array(0 => $comments);
$params = array(0 => $comments);
- $rep = new FrontReport(_('Chart of Accounts'), "ChartOfAccounts
.pdf
", user_pagesize());
+ $rep = new FrontReport(_('Chart of Accounts'), "ChartOfAccounts", user_pagesize());
$rep->Font();
$rep->Info($params, $cols, $headers, $aligns);
$rep->Font();
$rep->Info($params, $cols, $headers, $aligns);
@@
-77,12
+80,14
@@
function print_Chart_of_Accounts()
$rep->Font('bold');
$rep->TextCol(0, 4, $account['AccountClassName']);
$rep->Font();
$rep->Font('bold');
$rep->TextCol(0, 4, $account['AccountClassName']);
$rep->Font();
- $rep->row -= ($rep->lineHeight + 4);
+ //$rep->row -= ($rep->lineHeight + 4);
+ $rep->NewLine();
}
$group = $account['AccountTypeName'];
$rep->TextCol(0, 4, $account['AccountTypeName']);
//$rep->Line($rep->row - 4);
}
$group = $account['AccountTypeName'];
$rep->TextCol(0, 4, $account['AccountTypeName']);
//$rep->Line($rep->row - 4);
- $rep->row -= ($rep->lineHeight + 4);
+ //$rep->row -= ($rep->lineHeight + 4);
+ $rep->NewLine();
}
$classname = $account['AccountClassName'];
}
$classname = $account['AccountClassName'];
@@
-90,7
+95,7
@@
function print_Chart_of_Accounts()
$rep->TextCol(1, 2, $account['account_name']);
$rep->TextCol(2, 3, $account['account_code2']);
if ($showbalance == 1)
$rep->TextCol(1, 2, $account['account_name']);
$rep->TextCol(2, 3, $account['account_code2']);
if ($showbalance == 1)
- $rep->
TextCol(3, 4, number_format2($balance, $dec)
);
+ $rep->
AmountCol(3, 4, $balance, $dec
);
$rep->NewLine();
if ($rep->row < $rep->bottomMargin + 3 * $rep->lineHeight)
$rep->NewLine();
if ($rep->row < $rep->bottomMargin + 3 * $rep->lineHeight)