From: Joe <unknown>
Date: Thu, 19 Feb 2015 16:48:05 +0000 (+0100)
Subject: The aging reports / inquiries had a 1 day error in presentation. Fixed.
X-Git-Tag: 2.3-final~69
X-Git-Url: https://delta.frontaccounting.com/gitweb/?p=fa-stable.git;a=commitdiff_plain;h=107a22ab168c1102f3f534a22cd5b8290331f17d

The aging reports / inquiries had a 1 day error in presentation. Fixed.
---

diff --git a/purchasing/includes/db/suppliers_db.inc b/purchasing/includes/db/suppliers_db.inc
index dd9e49c9..e0f8078e 100644
--- a/purchasing/includes/db/suppliers_db.inc
+++ b/purchasing/includes/db/suppliers_db.inc
@@ -84,8 +84,9 @@ function get_supplier_details($supplier_id, $to=null, $all=true)
 		$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 @@ function get_supplier_details($supplier_id, $to=null, $all=true)
 
 		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 --git a/reporting/rep102.php b/reporting/rep102.php
index beea87bc..90f7db02 100644
--- a/reporting/rep102.php
+++ b/reporting/rep102.php
@@ -30,8 +30,9 @@ print_aged_customer_analysis();
 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 @@ function get_invoices($customer_id, $to, $all=true)
 	$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 --git a/reporting/rep202.php b/reporting/rep202.php
index 7ba8b0d7..4b788eb6 100644
--- a/reporting/rep202.php
+++ b/reporting/rep202.php
@@ -32,8 +32,9 @@ print_aged_supplier_analysis();
 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 @@ function get_invoices($supplier_id, $to, $all=true)
 		".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 --git a/sales/includes/db/customers_db.inc b/sales/includes/db/customers_db.inc
index 36db9e1a..ca940bcd 100644
--- a/sales/includes/db/customers_db.inc
+++ b/sales/includes/db/customers_db.inc
@@ -68,8 +68,9 @@ function get_customer_details($customer_id, $to=null, $all=true)
 		$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 @@ function get_customer_details($customer_id, $to=null, $all=true)
 		".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