projects
/
fa-stable.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Rerun of implemented Selectable Print Orientation (Portrait, Landscape) for all repor...
[fa-stable.git]
/
reporting
/
rep706.php
diff --git
a/reporting/rep706.php
b/reporting/rep706.php
index 2fa624a6a21e26ea4bcac2def85d2a5facfd14e4..ebb9cd8328416852d555f88b0dac053dc731adda 100644
(file)
--- a/
reporting/rep706.php
+++ b/
reporting/rep706.php
@@
-40,7
+40,7
@@
function display_type ($type, $typename, $from, $to, $convert, &$dec, &$rep, $di
$result = get_gl_accounts(null, null, $type);
while ($account=db_fetch($result))
{
$result = get_gl_accounts(null, null, $type);
while ($account=db_fetch($result))
{
- if ($tags != -1)
+ if ($tags != -1
&& is_array($tags) && $tags[0] != false
)
{
if (!is_record_in_tags($tags, TAG_ACCOUNT, $account['account_code']))
continue;
{
if (!is_record_in_tags($tags, TAG_ACCOUNT, $account['account_code']))
continue;
@@
-92,7
+92,7
@@
function display_type ($type, $typename, $from, $to, $convert, &$dec, &$rep, $di
}
$totals_arr = display_type($accounttype["id"], $accounttype["name"], $from, $to, $convert, $dec,
}
$totals_arr = display_type($accounttype["id"], $accounttype["name"], $from, $to, $convert, $dec,
- $rep, $dimension, $dimension2, $pg, $graphics);
+ $rep, $dimension, $dimension2, $
tags, $
pg, $graphics);
$open_balance_total += $totals_arr[0];
$period_balance_total += $totals_arr[1];
}
$open_balance_total += $totals_arr[0];
$period_balance_total += $totals_arr[1];
}
@@
-142,7
+142,8
@@
function print_balance_sheet()
$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 if ($dim == 1)
{
}
else if ($dim == 1)
{
@@
-151,7
+152,8
@@
function print_balance_sheet()
$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'];
}
else
{
}
else
{
@@
-159,12
+161,14
@@
function print_balance_sheet()
$decimals = $_POST['PARAM_3'];
$graphics = $_POST['PARAM_4'];
$comments = $_POST['PARAM_5'];
$decimals = $_POST['PARAM_3'];
$graphics = $_POST['PARAM_4'];
$comments = $_POST['PARAM_5'];
- $destination = $_POST['PARAM_6'];
+ $orientation = $_POST['PARAM_6'];
+ $destination = $_POST['PARAM_7'];
}
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");
@@
-208,7
+212,9
@@
function print_balance_sheet()
2 => array('text' => _('Tags'), 'from' => get_tag_names($tags), 'to' => ''));
}
2 => array('text' => _('Tags'), 'from' => get_tag_names($tags), 'to' => ''));
}
- $rep = new FrontReport(_('Balance Sheet'), "BalanceSheet", user_pagesize());
+ $rep = new FrontReport(_('Balance Sheet'), "BalanceSheet", user_pagesize(), 9, $orientation);
+ if ($orientation == 'L')
+ recalculate_cols($cols);
$rep->Font();
$rep->Info($params, $cols, $headers, $aligns);
$rep->NewPage();
$rep->Font();
$rep->Info($params, $cols, $headers, $aligns);
$rep->NewPage();
@@
-306,9
+312,8
@@
function print_balance_sheet()
$pg->type = $graphics;
$pg->skin = $graph_skin;
$pg->built_in = false;
$pg->type = $graphics;
$pg->skin = $graph_skin;
$pg->built_in = false;
- $pg->fontfile = $path_to_root . "/reporting/fonts/Vera.ttf";
$pg->latin_notation = ($decseps[$_SESSION["wa_current_user"]->prefs->dec_sep()] != ".");
$pg->latin_notation = ($decseps[$_SESSION["wa_current_user"]->prefs->dec_sep()] != ".");
- $filename = company_path(). "/pdf_files/
test
.png";
+ $filename = company_path(). "/pdf_files/
". uniqid("")."
.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;