projects
/
fa-stable.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merged changes form stable branch up to 2.3.13
[fa-stable.git]
/
reporting
/
rep706.php
diff --git
a/reporting/rep706.php
b/reporting/rep706.php
index 2fa624a6a21e26ea4bcac2def85d2a5facfd14e4..8a0e4d459c60bdac2f50db7607a3490781c8842a 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];
}
@@
-306,9
+306,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;