X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=purchasing%2Fincludes%2Fdb%2Fsuppliers_db.inc;h=602b86bf60049a52f50d3c385785510480909acb;hb=2f3375b4493c1b1e0b17c2801298275f22f8d76e;hp=e0f8078ea51e1bd0c5a3963cb72eb1cb4b266190;hpb=107a22ab168c1102f3f534a22cd5b8290331f17d;p=fa-stable.git

diff --git a/purchasing/includes/db/suppliers_db.inc b/purchasing/includes/db/suppliers_db.inc
index e0f8078e..602b86bf 100644
--- a/purchasing/includes/db/suppliers_db.inc
+++ b/purchasing/includes/db/suppliers_db.inc
@@ -27,7 +27,7 @@ function add_supplier($supp_name, $supp_ref, $address, $supp_address, $gst_no,
 		.db_escape($website). ", "
 		.db_escape($supp_account_no). ", "
 		.db_escape($bank_account). ", "
-		.db_escape($credit_limit). ", "
+		.$credit_limit. ", "
 		.db_escape($dimension_id). ", "
 		.db_escape($dimension2_id). ", "
 		.db_escape($curr_code). ", "
@@ -84,25 +84,25 @@ function get_supplier_details($supplier_id, $to=null, $all=true)
 		$todate = date("Y-m-d");
 	else
 		$todate = date2sql($to);
-	$current = 1;	
-	$past1 = get_company_pref('past_due_days') + $current;
-	$past2 = 2 * $past1 + $current;
+	$past1 = get_company_pref('past_due_days');
+	$past2 = 2 * $past1;
 	// removed - supp_trans.alloc from all summations
 
 	if ($all)
     	$value = "(trans.ov_amount + trans.ov_gst + trans.ov_discount)";
     else	
-    	$value = "IF (trans.type=".ST_SUPPINVOICE." OR trans.type=".ST_BANKDEPOSIT.",
-    		(trans.ov_amount + trans.ov_gst + trans.ov_discount - trans.alloc),
-    		(trans.ov_amount + trans.ov_gst + trans.ov_discount + trans.alloc))";
+    	$value = "IF (trans.type=".ST_SUPPINVOICE." OR trans.type=".ST_BANKDEPOSIT."
+  	OR (trans.type=".ST_JOURNAL." AND (trans.ov_amount + trans.ov_gst + trans.ov_discount)>0), 1, -1)*
+    		ABS(trans.ov_amount + trans.ov_gst + trans.ov_discount) - trans.alloc";
+
 	$due = "IF (trans.type=".ST_SUPPINVOICE." OR trans.type=".ST_SUPPCREDIT.",trans.due_date,trans.tran_date)";
     $sql = "SELECT supp.supp_name, supp.curr_code, ".TB_PREF."payment_terms.terms,
 
 		Sum(IFNULL($value,0)) AS Balance,
 
-		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,
+		Sum(IF ((TO_DAYS('$todate') - TO_DAYS($due)) > 0,$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) 
 			* (ov_amount + ov_gst + ov_discount),0)) as cur_credit,
 		supp.tax_group_id
@@ -121,7 +121,6 @@ function get_supplier_details($supplier_id, $to=null, $all=true)
 			  ".TB_PREF."payment_terms.terms,
 			  ".TB_PREF."payment_terms.days_before_due,
 			  ".TB_PREF."payment_terms.day_in_following_month";
-
     $result = db_query($sql,"The customer details could not be retrieved");
     $supp = db_fetch($result);
 
@@ -150,7 +149,7 @@ function get_supplier_name($supplier_id)
 
 function get_supplier_accounts($supplier_id)
 {
-	$sql = "SELECT payable_account,purchase_account,payment_discount_account FROM ".TB_PREF."suppliers WHERE supplier_id=".db_escape($supplier_id);
+	$sql = "SELECT payable_account,purchase_account,payment_discount_account, dimension_id, dimension2_id FROM ".TB_PREF."suppliers WHERE supplier_id=".db_escape($supplier_id);
 
 	$result = db_query($sql, "could not get supplier");
 
@@ -180,4 +179,34 @@ function is_new_supplier($id)
 
 	return !key_in_foreign_table($id, $tables, 'supplier_id');
 }
-?>
\ No newline at end of file
+
+function get_supplier_currency($supplier_id)
+{
+    $sql = "SELECT curr_code FROM ".TB_PREF."suppliers WHERE supplier_id = ".db_escape($supplier_id);
+
+	$result = db_query($sql, "Retreive currency of supplier $supplier_id");
+
+	$myrow=db_fetch_row($result);
+	return $myrow ? $myrow[0] : get_company_currency();
+}
+
+function get_suppliers_search($supplier)
+{
+	global $SysPrefs;
+
+	if (isset($SysPrefs->max_rows_in_search))
+		$limit = $SysPrefs->max_rows_in_search;
+	else
+		$limit = 10;
+
+	$sql = "SELECT supplier_id, supp_name, supp_ref, address, gst_no
+		FROM ".TB_PREF."suppliers
+		WHERE (supp_name LIKE " . db_escape("%" . $supplier. "%") . " OR 
+			supp_ref LIKE " . db_escape("%" . $supplier. "%") . " OR 
+			address LIKE " . db_escape("%" . $supplier. "%") . " OR 
+			gst_no LIKE " . db_escape("%" . $supplier. "%") . ")
+		ORDER BY supp_name LIMIT 0,".(int)($limit);
+
+	return db_query($sql, "Failed in retreiving supplier list.");
+}
+