X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=sales%2Fincludes%2Fdb%2Fsales_order_db.inc;h=c6408bd9688cf19fa73aee2b6cd0e6e754f9622b;hb=37f4a02e0f4bea58e5b2097d583bf9395ffc515f;hp=58c98999064c0d3d43c1a3a753fc424c426b9c43;hpb=97023f8706bb7149c62ca49eaec123cca3c51fa0;p=fa-stable.git

diff --git a/sales/includes/db/sales_order_db.inc b/sales/includes/db/sales_order_db.inc
index 58c98999..c6408bd9 100644
--- a/sales/includes/db/sales_order_db.inc
+++ b/sales/includes/db/sales_order_db.inc
@@ -236,7 +236,6 @@ function get_invoice_duedate($debtorno, $invdate)
 	{
 		return Today();
 	}
-	$disp = user_date_display();
     $sql = "SELECT ".TB_PREF."debtors_master.debtor_no, ".TB_PREF."debtors_master.payment_terms, ".TB_PREF."payment_terms.* FROM ".TB_PREF."debtors_master,
 	   	".TB_PREF."payment_terms WHERE ".TB_PREF."debtors_master.payment_terms = ".TB_PREF."payment_terms.terms_indicator AND
 	   	".TB_PREF."debtors_master.debtor_no = '$debtorno'";
@@ -246,11 +245,10 @@ function get_invoice_duedate($debtorno, $invdate)
 
     if (db_num_rows($result) == 0)
     	return $invdate;
-    $date_array = explode_date_to_dmy($invdate);
     if ($myrow['day_in_following_month'] > 0)
-    	$duedate = date($disp, Mktime(0,0,0,$date_array[1]+1, $myrow['day_in_following_month'],$date_array[2]));
+    	$duedate = add_days(end_month($invdate), $myrow['day_in_following_month']);
 	else
-		$duedate = date($disp, Mktime(0,0,0,$date_array[1],$date_array[0] + (int) $myrow['days_before_due'],$date_array[2]));
+    	$duedate = add_days($invdate, $myrow['days_before_due']);
     return $duedate;
 }