[Frontaccounting-cvs_updates] /hg/p/frontaccounting/mercurial: The aging reports / inquiries h...
Brought to you by:
frontaccounting,
itronics
Menu
▾
▴
[Frontaccounting-cvs_updates] /hg/p/frontaccounting/mercurial: The aging reports / inquiries h...
|
From: FrontAccounting <fro...@us...> - 2015-02-19 16:49:06
|
details: http://frontaccounting.hg.sourceforge.net:8000/hgroot/frontaccounting/frontaccounting/hg/p/frontaccounting/mercurial/rev/a8bd2384ce22 changeset: 3514:a8bd2384ce22 user: Joe date: Thu Feb 19 17:48:05 2015 +0100 description: The aging reports / inquiries had a 1 day error in presentation. Fixed. diffstat: purchasing/includes/db/suppliers_db.inc | 7 ++++--- reporting/rep102.php | 7 ++++--- reporting/rep202.php | 7 ++++--- sales/includes/db/customers_db.inc | 7 ++++--- 4 files changed, 16 insertions(+), 12 deletions(-) diffs (96 lines): diff -r d3ce812b8a08 -r a8bd2384ce22 purchasing/includes/db/suppliers_db.inc --- a/purchasing/includes/db/suppliers_db.inc Thu Feb 19 10:17:41 2015 +0100 +++ b/purchasing/includes/db/suppliers_db.inc Thu Feb 19 17:48:05 2015 +0100 @@ -84,8 +84,9 @@ $todate = date("Y-m-d"); else $todate = date2sql($to); - $past1 = get_company_pref('past_due_days'); - $past2 = 2 * $past1; + $current = 1; + $past1 = get_company_pref('past_due_days') + $current; + $past2 = 2 * $past1 + $current; // removed - supp_trans.alloc from all summations if ($all) @@ -99,7 +100,7 @@ Sum(IFNULL($value,0)) AS Balance, - Sum(IF ((TO_DAYS('$todate') - TO_DAYS($due)) >= 0,$value,0)) AS Due, + Sum(IF ((TO_DAYS('$todate') - TO_DAYS($due)) >= $current,$value,0)) AS Due, Sum(IF ((TO_DAYS('$todate') - TO_DAYS($due)) >= $past1,$value,0)) AS Overdue1, Sum(IF ((TO_DAYS('$todate') - TO_DAYS($due)) >= $past2,$value,0)) AS Overdue2, supp.credit_limit - Sum(IFNULL(IF(trans.type=".ST_SUPPCREDIT.", -1, 1) diff -r d3ce812b8a08 -r a8bd2384ce22 reporting/rep102.php --- a/reporting/rep102.php Thu Feb 19 10:17:41 2015 +0100 +++ b/reporting/rep102.php Thu Feb 19 17:48:05 2015 +0100 @@ -30,8 +30,9 @@ function get_invoices($customer_id, $to, $all=true) { $todate = date2sql($to); - $PastDueDays1 = get_company_pref('past_due_days'); - $PastDueDays2 = 2 * $PastDueDays1; + $current = 1; + $PastDueDays1 = get_company_pref('past_due_days') + $current; + $PastDueDays2 = 2 * $PastDueDays1 + $current; // Revomed allocated from sql if ($all) @@ -46,7 +47,7 @@ $sql = "SELECT ".TB_PREF."debtor_trans.type, ".TB_PREF."debtor_trans.reference, ".TB_PREF."debtor_trans.tran_date, $value as Balance, - IF ((TO_DAYS('$todate') - TO_DAYS($due)) >= 0,$value,0) AS Due, + IF ((TO_DAYS('$todate') - TO_DAYS($due)) >= $current,$value,0) AS Due, IF ((TO_DAYS('$todate') - TO_DAYS($due)) >= $PastDueDays1,$value,0) AS Overdue1, IF ((TO_DAYS('$todate') - TO_DAYS($due)) >= $PastDueDays2,$value,0) AS Overdue2 diff -r d3ce812b8a08 -r a8bd2384ce22 reporting/rep202.php --- a/reporting/rep202.php Thu Feb 19 10:17:41 2015 +0100 +++ b/reporting/rep202.php Thu Feb 19 17:48:05 2015 +0100 @@ -32,8 +32,9 @@ function get_invoices($supplier_id, $to, $all=true) { $todate = date2sql($to); - $PastDueDays1 = get_company_pref('past_due_days'); - $PastDueDays2 = 2 * $PastDueDays1; + $current = 1; + $PastDueDays1 = get_company_pref('past_due_days') + $current; + $PastDueDays2 = 2 * $PastDueDays1 + $current; // Revomed allocated from sql if ($all) @@ -47,7 +48,7 @@ ".TB_PREF."supp_trans.reference, ".TB_PREF."supp_trans.tran_date, $value as Balance, - IF ((TO_DAYS('$todate') - TO_DAYS($due)) >= 0,$value,0) AS Due, + IF ((TO_DAYS('$todate') - TO_DAYS($due)) >= $current,$value,0) AS Due, IF ((TO_DAYS('$todate') - TO_DAYS($due)) >= $PastDueDays1,$value,0) AS Overdue1, IF ((TO_DAYS('$todate') - TO_DAYS($due)) >= $PastDueDays2,$value,0) AS Overdue2 diff -r d3ce812b8a08 -r a8bd2384ce22 sales/includes/db/customers_db.inc --- a/sales/includes/db/customers_db.inc Thu Feb 19 10:17:41 2015 +0100 +++ b/sales/includes/db/customers_db.inc Thu Feb 19 17:48:05 2015 +0100 @@ -68,8 +68,9 @@ $todate = date("Y-m-d"); else $todate = date2sql($to); - $past1 = get_company_pref('past_due_days'); - $past2 = 2 * $past1; + $current = 1; + $past1 = get_company_pref('past_due_days') + $current; + $past2 = 2 * $past1 + $current; // removed - debtor_trans.alloc from all summations if ($all) $value = "IFNULL(IF(trans.type=11 OR trans.type=12 OR trans.type=2, -1, 1) @@ -83,7 +84,7 @@ ".TB_PREF."debtors_master.credit_limit, ".TB_PREF."credit_status.dissallow_invoices, ".TB_PREF."credit_status.reason_description, Sum(IFNULL($value,0)) AS Balance, - Sum(IF ((TO_DAYS('$todate') - TO_DAYS($due)) >= 0,$value,0)) AS Due, + Sum(IF ((TO_DAYS('$todate') - TO_DAYS($due)) >= $current,$value,0)) AS Due, Sum(IF ((TO_DAYS('$todate') - TO_DAYS($due)) >= $past1,$value,0)) AS Overdue1, Sum(IF ((TO_DAYS('$todate') - TO_DAYS($due)) >= $past2,$value,0)) AS Overdue2 |