From 5713335aa831bf146e72d2310128beaaa00b43c9 Mon Sep 17 00:00:00 2001 From: Joe Hunt Date: Thu, 28 Apr 2011 14:29:32 +0200 Subject: [PATCH] Option for Show Also Allocated in Aged Customer/Supplier List. --- purchasing/includes/db/suppliers_db.inc | 9 ++++--- reporting/rep102.php | 36 ++++++++++++++++--------- reporting/rep202.php | 36 ++++++++++++++++--------- reporting/reports_main.php | 2 ++ sales/includes/db/customers_db.inc | 9 ++++--- 5 files changed, 58 insertions(+), 34 deletions(-) diff --git a/purchasing/includes/db/suppliers_db.inc b/purchasing/includes/db/suppliers_db.inc index 8a0fdca8..17bd33f2 100644 --- a/purchasing/includes/db/suppliers_db.inc +++ b/purchasing/includes/db/suppliers_db.inc @@ -77,7 +77,7 @@ function delete_supplier($supplier_id) db_query($sql,"check failed"); } -function get_supplier_details($supplier_id, $to=null) +function get_supplier_details($supplier_id, $to=null, $all=true) { if ($to == null) @@ -107,9 +107,10 @@ function get_supplier_details($supplier_id, $to=null) WHERE supp.payment_terms = ".TB_PREF."payment_terms.terms_indicator - AND supp.supplier_id = $supplier_id - - GROUP BY + AND supp.supplier_id = $supplier_id "; + if (!$all) + $sql .= "AND ABS(trans.ov_amount + trans.ov_gst + trans.ov_discount - trans.alloc) > 0.004 "; + $sql .= "GROUP BY supp.supp_name, ".TB_PREF."payment_terms.terms, ".TB_PREF."payment_terms.days_before_due, diff --git a/reporting/rep102.php b/reporting/rep102.php index 8bd7714a..b839b6b7 100644 --- a/reporting/rep102.php +++ b/reporting/rep102.php @@ -27,7 +27,7 @@ include_once($path_to_root . "/gl/includes/gl_db.inc"); print_aged_customer_analysis(); -function get_invoices($customer_id, $to) +function get_invoices($customer_id, $to, $all=true) { $todate = date2sql($to); $PastDueDays1 = get_company_pref('past_due_days'); @@ -54,8 +54,10 @@ function get_invoices($customer_id, $to) 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 - ORDER BY ".TB_PREF."debtor_trans.tran_date"; + 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 "; + 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 .= "ORDER BY ".TB_PREF."debtor_trans.tran_date"; return db_query($sql, "The customer details could not be retrieved"); } @@ -69,11 +71,12 @@ function print_aged_customer_analysis() $to = $_POST['PARAM_0']; $fromcust = $_POST['PARAM_1']; $currency = $_POST['PARAM_2']; - $summaryOnly = $_POST['PARAM_3']; - $no_zeros = $_POST['PARAM_4']; - $graphics = $_POST['PARAM_5']; - $comments = $_POST['PARAM_6']; - $destination = $_POST['PARAM_7']; + $show_all = $_POST['PARAM_3']; + $summaryOnly = $_POST['PARAM_4']; + $no_zeros = $_POST['PARAM_5']; + $graphics = $_POST['PARAM_6']; + $comments = $_POST['PARAM_7']; + $destination = $_POST['PARAM_8']; if ($destination) include_once($path_to_root . "/reporting/includes/excel_report.inc"); else @@ -104,6 +107,8 @@ function print_aged_customer_analysis() if ($no_zeros) $nozeros = _('Yes'); else $nozeros = _('No'); + if ($show_all) $show = _('Yes'); + else $show = _('No'); $PastDueDays1 = get_company_pref('past_due_days'); $PastDueDays2 = 2 * $PastDueDays1; @@ -122,7 +127,8 @@ function print_aged_customer_analysis() 2 => array('text' => _('Customer'), 'from' => $from, 'to' => ''), 3 => array('text' => _('Currency'), 'from' => $currency, 'to' => ''), 4 => array('text' => _('Type'), 'from' => $summary,'to' => ''), - 5 => array('text' => _('Suppress Zeros'), 'from' => $nozeros, 'to' => '')); + 5 => array('text' => _('Show Also Allocated'), 'from' => $show, 'to' => ''), + 6 => array('text' => _('Suppress Zeros'), 'from' => $nozeros, 'to' => '')); if ($convert) $headers[2] = _('Currency'); @@ -147,9 +153,13 @@ function print_aged_customer_analysis() if ($convert) $rate = get_exchange_rate_from_home_currency($myrow['curr_code'], $to); else $rate = 1.0; - $custrec = get_customer_details($myrow['debtor_no'], $to); - foreach ($custrec as $i => $value) - $custrec[$i] *= $rate; + $custrec = get_customer_details($myrow['debtor_no'], $to, $show_all); + if (!$custrec) + continue; + $custrec['Balance'] *= $rate; + $custrec['Due'] *= $rate; + $custrec['Overdue1'] *= $rate; + $custrec['Overdue2'] *= $rate; $str = array($custrec["Balance"] - $custrec["Due"], $custrec["Due"]-$custrec["Overdue1"], $custrec["Overdue1"]-$custrec["Overdue2"], @@ -171,7 +181,7 @@ function print_aged_customer_analysis() $rep->NewLine(1, 2); if (!$summaryOnly) { - $res = get_invoices($myrow['debtor_no'], $to); + $res = get_invoices($myrow['debtor_no'], $to, $show_all); if (db_num_rows($res)==0) continue; $rep->Line($rep->row + 4); diff --git a/reporting/rep202.php b/reporting/rep202.php index 08a26651..761186f0 100644 --- a/reporting/rep202.php +++ b/reporting/rep202.php @@ -29,7 +29,7 @@ print_aged_supplier_analysis(); //---------------------------------------------------------------------------------------------------- -function get_invoices($supplier_id, $to) +function get_invoices($supplier_id, $to, $all=true) { $todate = date2sql($to); $PastDueDays1 = get_company_pref('past_due_days'); @@ -54,8 +54,10 @@ function get_invoices($supplier_id, $to) AND ".TB_PREF."suppliers.supplier_id = ".TB_PREF."supp_trans.supplier_id AND ".TB_PREF."supp_trans.supplier_id = $supplier_id AND ".TB_PREF."supp_trans.tran_date <= '$todate' - AND ABS(".TB_PREF."supp_trans.ov_amount + ".TB_PREF."supp_trans.ov_gst + ".TB_PREF."supp_trans.ov_discount) > 0.004 - ORDER BY ".TB_PREF."supp_trans.tran_date"; + AND ABS(".TB_PREF."supp_trans.ov_amount + ".TB_PREF."supp_trans.ov_gst + ".TB_PREF."supp_trans.ov_discount) > 0.004 "; + if (!$all) + $sql .= "AND ABS(".TB_PREF."supp_trans.ov_amount + ".TB_PREF."supp_trans.ov_gst + ".TB_PREF."supp_trans.ov_discount - ".TB_PREF."supp_trans.alloc) > 0.004 "; + $sql .= "ORDER BY ".TB_PREF."supp_trans.tran_date"; return db_query($sql, "The supplier details could not be retrieved"); @@ -70,11 +72,12 @@ function print_aged_supplier_analysis() $to = $_POST['PARAM_0']; $fromsupp = $_POST['PARAM_1']; $currency = $_POST['PARAM_2']; - $summaryOnly = $_POST['PARAM_3']; - $no_zeros = $_POST['PARAM_4']; - $graphics = $_POST['PARAM_5']; - $comments = $_POST['PARAM_6']; - $destination = $_POST['PARAM_7']; + $show_all = $_POST['PARAM_3']; + $summaryOnly = $_POST['PARAM_4']; + $no_zeros = $_POST['PARAM_5']; + $graphics = $_POST['PARAM_6']; + $comments = $_POST['PARAM_7']; + $destination = $_POST['PARAM_8']; if ($destination) include_once($path_to_root . "/reporting/includes/excel_report.inc"); @@ -106,6 +109,8 @@ function print_aged_supplier_analysis() if ($no_zeros) $nozeros = _('Yes'); else $nozeros = _('No'); + if ($show_all) $show = _('Yes'); + else $show = _('No'); $PastDueDays1 = get_company_pref('past_due_days'); $PastDueDays2 = 2 * $PastDueDays1; @@ -125,7 +130,8 @@ function print_aged_supplier_analysis() 2 => array('text' => _('Supplier'), 'from' => $from, 'to' => ''), 3 => array('text' => _('Currency'),'from' => $currency,'to' => ''), 4 => array('text' => _('Type'), 'from' => $summary,'to' => ''), - 5 => array('text' => _('Suppress Zeros'), 'from' => $nozeros, 'to' => '')); + 5 => array('text' => _('Show Also Allocated'), 'from' => $show, 'to' => ''), + 6 => array('text' => _('Suppress Zeros'), 'from' => $nozeros, 'to' => '')); if ($convert) $headers[2] = _('currency'); @@ -157,9 +163,13 @@ function print_aged_supplier_analysis() if ($convert) $rate = get_exchange_rate_from_home_currency($myrow['curr_code'], $to); else $rate = 1.0; - $supprec = get_supplier_details($myrow['supplier_id'], $to); - foreach ($supprec as $i => $value) - $supprec[$i] *= $rate; + $supprec = get_supplier_details($myrow['supplier_id'], $to, $show_all); + if (!$supprec) + continue; + $supprec['Balance'] *= $rate; + $supprec['Due'] *= $rate; + $supprec['Overdue1'] *= $rate; + $supprec['Overdue2'] *= $rate; $str = array($supprec["Balance"] - $supprec["Due"], $supprec["Due"]-$supprec["Overdue1"], @@ -183,7 +193,7 @@ function print_aged_supplier_analysis() $rep->NewLine(1, 2); if (!$summaryOnly) { - $res = get_invoices($myrow['supplier_id'], $to); + $res = get_invoices($myrow['supplier_id'], $to, $show_all); if (db_num_rows($res)==0) continue; $rep->Line($rep->row + 4); diff --git a/reporting/reports_main.php b/reporting/reports_main.php index 2ce0b749..ff4944ec 100644 --- a/reporting/reports_main.php +++ b/reporting/reports_main.php @@ -42,6 +42,7 @@ $reports->addReport(RC_CUSTOMER, 102, _('&Aged Customer Analysis'), array( _('End Date') => 'DATE', _('Customer') => 'CUSTOMERS_NO_FILTER', _('Currency Filter') => 'CURRENCY', + _('Show Also Allocated') => 'YES_NO', _('Summary Only') => 'YES_NO', _('Suppress Zeros') => 'YES_NO', _('Graphics') => 'GRAPHIC', @@ -141,6 +142,7 @@ $reports->addReport(RC_SUPPLIER, 202, _('&Aged Supplier Analyses'), array( _('End Date') => 'DATE', _('Supplier') => 'SUPPLIERS_NO_FILTER', _('Currency Filter') => 'CURRENCY', + _('Show Also Allocated') => 'YES_NO', _('Summary Only') => 'YES_NO', _('Suppress Zeros') => 'YES_NO', _('Graphics') => 'GRAPHIC', diff --git a/sales/includes/db/customers_db.inc b/sales/includes/db/customers_db.inc index bd5b8d34..f1aa87ae 100644 --- a/sales/includes/db/customers_db.inc +++ b/sales/includes/db/customers_db.inc @@ -61,7 +61,7 @@ function delete_customer($customer_id) commit_transaction(); } -function get_customer_details($customer_id, $to=null) +function get_customer_details($customer_id, $to=null, $all=true) { if ($to == null) @@ -94,9 +94,10 @@ function get_customer_details($customer_id, $to=null) WHERE ".TB_PREF."debtors_master.payment_terms = ".TB_PREF."payment_terms.terms_indicator AND ".TB_PREF."debtors_master.credit_status = ".TB_PREF."credit_status.id - AND ".TB_PREF."debtors_master.debtor_no = ".db_escape($customer_id)." - - GROUP BY + AND ".TB_PREF."debtors_master.debtor_no = ".db_escape($customer_id)." "; + if (!$all) + $sql .= "AND ABS(trans.ov_amount + trans.ov_gst + trans.ov_freight + trans.ov_freight_tax + trans.ov_discount - trans.alloc) > 0.004 "; + $sql .= "GROUP BY ".TB_PREF."debtors_master.name, ".TB_PREF."payment_terms.terms, ".TB_PREF."payment_terms.days_before_due, -- 2.30.2