projects
/
fa-stable.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Unnecesary direct access to user setting superseded by calls to user_* functions.
[fa-stable.git]
/
reporting
/
rep102.php
diff --git
a/reporting/rep102.php
b/reporting/rep102.php
index 18fab24d052952aa6649e80e8064fde507fec187..42afc13e9e6a402d625aac1a4407084c77120443 100644
(file)
--- a/
reporting/rep102.php
+++ b/
reporting/rep102.php
@@
-57,9
+57,9
@@
function get_invoices($customer_id, $to, $all=true)
AND ".TB_PREF."debtors_master.debtor_no = ".TB_PREF."debtor_trans.debtor_no
AND ".TB_PREF."debtor_trans.debtor_no = $customer_id
AND ".TB_PREF."debtor_trans.tran_date <= '$todate'
AND ".TB_PREF."debtors_master.debtor_no = ".TB_PREF."debtor_trans.debtor_no
AND ".TB_PREF."debtor_trans.debtor_no = $customer_id
AND ".TB_PREF."debtor_trans.tran_date <= '$todate'
- AND ABS(".TB_PREF."debtor_trans.ov_amount + ".TB_PREF."debtor_trans.ov_gst + ".TB_PREF."debtor_trans.ov_freight + ".TB_PREF."debtor_trans.ov_freight_tax + ".TB_PREF."debtor_trans.ov_discount) >
0.004
";
+ AND ABS(".TB_PREF."debtor_trans.ov_amount + ".TB_PREF."debtor_trans.ov_gst + ".TB_PREF."debtor_trans.ov_freight + ".TB_PREF."debtor_trans.ov_freight_tax + ".TB_PREF."debtor_trans.ov_discount) >
".FLOAT_COMP_DELTA."
";
if (!$all)
if (!$all)
- $sql .= "AND ABS(".TB_PREF."debtor_trans.ov_amount + ".TB_PREF."debtor_trans.ov_gst + ".TB_PREF."debtor_trans.ov_freight + ".TB_PREF."debtor_trans.ov_freight_tax + ".TB_PREF."debtor_trans.ov_discount - ".TB_PREF."debtor_trans.alloc) >
0.004
";
+ $sql .= "AND ABS(".TB_PREF."debtor_trans.ov_amount + ".TB_PREF."debtor_trans.ov_gst + ".TB_PREF."debtor_trans.ov_freight + ".TB_PREF."debtor_trans.ov_freight_tax + ".TB_PREF."debtor_trans.ov_discount - ".TB_PREF."debtor_trans.alloc) >
".FLOAT_COMP_DELTA."
";
$sql .= "ORDER BY ".TB_PREF."debtor_trans.tran_date";
return db_query($sql, "The customer details could not be retrieved");
$sql .= "ORDER BY ".TB_PREF."debtor_trans.tran_date";
return db_query($sql, "The customer details could not be retrieved");
@@
-69,7
+69,7
@@
function get_invoices($customer_id, $to, $all=true)
function print_aged_customer_analysis()
{
function print_aged_customer_analysis()
{
- global $path_to_root, $systypes_array;
+ global $path_to_root, $systypes_array
, $SysPrefs
;
$to = $_POST['PARAM_0'];
$fromcust = $_POST['PARAM_1'];
$to = $_POST['PARAM_0'];
$fromcust = $_POST['PARAM_1'];
@@
-79,11
+79,13
@@
function print_aged_customer_analysis()
$no_zeros = $_POST['PARAM_5'];
$graphics = $_POST['PARAM_6'];
$comments = $_POST['PARAM_7'];
$no_zeros = $_POST['PARAM_5'];
$graphics = $_POST['PARAM_6'];
$comments = $_POST['PARAM_7'];
- $destination = $_POST['PARAM_8'];
+ $orientation = $_POST['PARAM_8'];
+ $destination = $_POST['PARAM_9'];
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");
@@
-135,7
+137,9
@@
function print_aged_customer_analysis()
if ($convert)
$headers[2] = _('Currency');
if ($convert)
$headers[2] = _('Currency');
- $rep = new FrontReport(_('Aged Customer Analysis'), "AgedCustomerAnalysis", user_pagesize());
+ $rep = new FrontReport(_('Aged Customer Analysis'), "AgedCustomerAnalysis", 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);
@@
-168,7
+172,7
@@
function print_aged_customer_analysis()
$custrec["Overdue1"]-$custrec["Overdue2"],
$custrec["Overdue2"],
$custrec["Balance"]);
$custrec["Overdue1"]-$custrec["Overdue2"],
$custrec["Overdue2"],
$custrec["Balance"]);
- if ($no_zeros &&
array_sum($str
) == 0) continue;
+ if ($no_zeros &&
floatcmp(array_sum($str), 0
) == 0) continue;
$rep->fontSize += 2;
$rep->TextCol(0, 2, $myrow['name']);
$rep->fontSize += 2;
$rep->TextCol(0, 2, $myrow['name']);
@@
-234,16
+238,15
@@
function print_aged_customer_analysis()
$rep->Line($rep->row - 8);
if ($graphics)
{
$rep->Line($rep->row - 8);
if ($graphics)
{
- global $decseps, $graph_skin;
$pg->x = array(_('Current'), $nowdue, $pastdue1, $pastdue2);
$pg->title = $rep->title;
$pg->axis_x = _("Days");
$pg->axis_y = _("Amount");
$pg->graphic_1 = $to;
$pg->type = $graphics;
$pg->x = array(_('Current'), $nowdue, $pastdue1, $pastdue2);
$pg->title = $rep->title;
$pg->axis_x = _("Days");
$pg->axis_y = _("Amount");
$pg->graphic_1 = $to;
$pg->type = $graphics;
- $pg->skin = $graph_skin;
+ $pg->skin = $
SysPrefs->
graph_skin;
$pg->built_in = false;
$pg->built_in = false;
- $pg->latin_notation = ($
decseps[$_SESSION["wa_current_user"]->prefs->
dec_sep()] != ".");
+ $pg->latin_notation = ($
SysPrefs->decseps[user_
dec_sep()] != ".");
$filename = company_path(). "/pdf_files/". uniqid("").".png";
$pg->display($filename, true);
$w = $pg->width / 1.5;
$filename = company_path(). "/pdf_files/". uniqid("").".png";
$pg->display($filename, true);
$w = $pg->width / 1.5;
@@
-258,4
+261,3
@@
function print_aged_customer_analysis()
$rep->End();
}
$rep->End();
}
-?>