projects
/
fa-stable.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Improved entropy for report file urls.
[fa-stable.git]
/
reporting
/
rep707.php
diff --git
a/reporting/rep707.php
b/reporting/rep707.php
index 211e504fe473aa04a68eca5a7cd2d4de2f09d60a..e05c4fe8338b88ecc29aca6d1e3b9eb9df846dbc 100644
(file)
--- a/
reporting/rep707.php
+++ b/
reporting/rep707.php
@@
-166,7
+166,8
@@
function print_profit_and_loss_statement()
$decimals = $_POST['PARAM_6'];
$graphics = $_POST['PARAM_7'];
$comments = $_POST['PARAM_8'];
$decimals = $_POST['PARAM_6'];
$graphics = $_POST['PARAM_7'];
$comments = $_POST['PARAM_8'];
- $destination = $_POST['PARAM_9'];
+ $orientation = $_POST['PARAM_9'];
+ $destination = $_POST['PARAM_10'];
}
else if ($dim == 1)
{
}
else if ($dim == 1)
{
@@
-175,7
+176,8
@@
function print_profit_and_loss_statement()
$decimals = $_POST['PARAM_5'];
$graphics = $_POST['PARAM_6'];
$comments = $_POST['PARAM_7'];
$decimals = $_POST['PARAM_5'];
$graphics = $_POST['PARAM_6'];
$comments = $_POST['PARAM_7'];
- $destination = $_POST['PARAM_8'];
+ $orientation = $_POST['PARAM_8'];
+ $destination = $_POST['PARAM_9'];
}
else
{
}
else
{
@@
-183,12
+185,14
@@
function print_profit_and_loss_statement()
$decimals = $_POST['PARAM_4'];
$graphics = $_POST['PARAM_5'];
$comments = $_POST['PARAM_6'];
$decimals = $_POST['PARAM_4'];
$graphics = $_POST['PARAM_5'];
$comments = $_POST['PARAM_6'];
- $destination = $_POST['PARAM_7'];
+ $orientation = $_POST['PARAM_7'];
+ $destination = $_POST['PARAM_8'];
}
if ($destination)
include_once($path_to_root . "/reporting/includes/excel_report.inc");
else
include_once($path_to_root . "/reporting/includes/pdf_report.inc");
}
if ($destination)
include_once($path_to_root . "/reporting/includes/excel_report.inc");
else
include_once($path_to_root . "/reporting/includes/pdf_report.inc");
+ $orientation = ($orientation ? 'L' : 'P');
if ($graphics)
{
include_once($path_to_root . "/reporting/includes/class.graphic.inc");
if ($graphics)
{
include_once($path_to_root . "/reporting/includes/class.graphic.inc");
@@
-251,7
+255,9
@@
function print_profit_and_loss_statement()
$headers[3] = _('Period Y-1');
}
$headers[3] = _('Period Y-1');
}
- $rep = new FrontReport(_('Profit and Loss Statement'), "ProfitAndLoss", user_pagesize());
+ $rep = new FrontReport(_('Profit and Loss Statement'), "ProfitAndLoss", user_pagesize(), 9, $orientation);
+ if ($orientation == 'L')
+ recalculate_cols($cols);
$rep->Font();
$rep->Info($params, $cols, $headers, $aligns);
$rep->Font();
$rep->Info($params, $cols, $headers, $aligns);
@@
-325,7
+331,7
@@
function print_profit_and_loss_statement()
$pg->skin = $graph_skin;
$pg->built_in = false;
$pg->latin_notation = ($decseps[$_SESSION["wa_current_user"]->prefs->dec_sep()] != ".");
$pg->skin = $graph_skin;
$pg->built_in = false;
$pg->latin_notation = ($decseps[$_SESSION["wa_current_user"]->prefs->dec_sep()] != ".");
- $filename = company_path(). "/pdf_files/".
uniqid(""
).".png";
+ $filename = company_path(). "/pdf_files/".
random_id(
).".png";
$pg->display($filename, true);
$w = $pg->width / 1.5;
$h = $pg->height / 1.5;
$pg->display($filename, true);
$w = $pg->width / 1.5;
$h = $pg->height / 1.5;