From 00d6656483e9b0630e325f0772268223b6762ece Mon Sep 17 00:00:00 2001 From: Maxime Bourget Date: Fri, 3 May 2013 20:27:38 +0100 Subject: [PATCH] Fix statement rounding error not filtering some 0.00 transaction --- reporting/rep108.php | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/reporting/rep108.php b/reporting/rep108.php index a64a71b0..894e7f61 100644 --- a/reporting/rep108.php +++ b/reporting/rep108.php @@ -37,15 +37,15 @@ function getTransactions($debtorno, $date, $show_also_allocated) ".TB_PREF."debtor_trans.ov_freight_tax + ".TB_PREF."debtor_trans.ov_discount) AS TotalAmount, ".TB_PREF."debtor_trans.alloc AS Allocated, ((".TB_PREF."debtor_trans.type = ".ST_SALESINVOICE.") - AND ".TB_PREF."debtor_trans.due_date < '$date') AS OverDue - FROM ".TB_PREF."debtor_trans - WHERE ".TB_PREF."debtor_trans.tran_date <= '$date' AND ".TB_PREF."debtor_trans.debtor_no = ".db_escape($debtorno)." + AND ".TB_PREF."debtor_trans.due_date < '$date') AS OverDue + FROM ".TB_PREF."debtor_trans + WHERE ".TB_PREF."debtor_trans.tran_date <= '$date' AND ".TB_PREF."debtor_trans.debtor_no = ".db_escape($debtorno)." AND ".TB_PREF."debtor_trans.type <> ".ST_CUSTDELIVERY." - AND (".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"; + 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) > 1e-6"; if (!$show_also_allocated) - $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) - alloc <> 0"; + $sql .= " AND ABS (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) - alloc) > 1e-6"; $sql .= " ORDER BY ".TB_PREF."debtor_trans.tran_date"; return db_query($sql,"No transactions were returned"); @@ -109,13 +109,15 @@ function print_statements() $rep = new FrontReport("", "", user_pagesize(), 9, $orientation); $rep->title = _('STATEMENT'); $rep->filename = "Statement" . $myrow['debtor_no'] . ".pdf"; - } + $rep->Info($params, $cols, null, $aligns); + } + + $contacts = get_customer_contacts($myrow['debtor_no'], 'invoice'); $rep->SetHeaderType('Header2'); $rep->currency = $cur; $rep->Font(); $rep->Info($params, $cols, null, $aligns); - $contacts = get_customer_contacts($myrow['debtor_no'], 'invoice'); //= get_branch_contacts($branch['branch_code'], 'invoice', $branch['debtor_no']); $rep->SetCommonData($myrow, null, null, $baccount, ST_STATEMENT, $contacts); $rep->NewPage(); @@ -172,4 +174,4 @@ function print_statements() $rep->End(); } -?> \ No newline at end of file +?> -- 2.30.2