projects
/
fa-stable.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Inventory Adjustment: removed movement type, cleanups.
[fa-stable.git]
/
reporting
/
rep706.php
diff --git
a/reporting/rep706.php
b/reporting/rep706.php
index f5f321bf3142f0ad705c03031d7260429cef3e75..07585945b5e50cddd5f9b3708f13068fdded39e6 100644
(file)
--- a/
reporting/rep706.php
+++ b/
reporting/rep706.php
@@
-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];
}
@@
-127,7
+127,7
@@
print_balance_sheet();
function print_balance_sheet()
{
function print_balance_sheet()
{
- global $path_to_root;
+ global $path_to_root
, $SysPrefs
;
$dim = get_company_pref('use_dimension');
$dimension = $dimension2 = 0;
$dim = get_company_pref('use_dimension');
$dimension = $dimension2 = 0;
@@
-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();
@@
-297,18
+303,16
@@
function print_balance_sheet()
$pg->x[] = _('Calculated Return');
$pg->y[] = abs($calc_open);
$pg->z[] = abs($calc_period);
$pg->x[] = _('Calculated Return');
$pg->y[] = abs($calc_open);
$pg->z[] = abs($calc_period);
- global $decseps, $graph_skin;
$pg->title = $rep->title;
$pg->axis_x = _("Group");
$pg->axis_y = _("Amount");
$pg->graphic_1 = $headers[2];
$pg->graphic_2 = $headers[3];
$pg->type = $graphics;
$pg->title = $rep->title;
$pg->axis_x = _("Group");
$pg->axis_y = _("Amount");
$pg->graphic_1 = $headers[2];
$pg->graphic_2 = $headers[3];
$pg->type = $graphics;
- $pg->skin = $graph_skin;
+ $pg->skin = $
SysPrefs->
graph_skin;
$pg->built_in = false;
$pg->built_in = false;
- $pg->fontfile = $path_to_root . "/reporting/fonts/Vera.ttf";
- $pg->latin_notation = ($decseps[$_SESSION["wa_current_user"]->prefs->dec_sep()] != ".");
- $filename = company_path(). "/pdf_files/test.png";
+ $pg->latin_notation = ($SysPrefs->decseps[user_dec_sep()] != ".");
+ $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;
@@
-321,4
+325,3
@@
function print_balance_sheet()
$rep->End();
}
$rep->End();
}
-?>
\ No newline at end of file