X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=purchasing%2Fincludes%2Fdb%2Fsuppliers_db.inc;h=6b7d0cde787265665cfc21c5a188a0bf6f5f0f43;hb=3b06c6c4718610a408cae2e9b76c3134ca30b84c;hp=be6eb5b3cd88d37339d8502330d3b421a0b52398;hpb=83086e6733af3dbfd67edcac751dad7daf3a4fae;p=fa-stable.git

diff --git a/purchasing/includes/db/suppliers_db.inc b/purchasing/includes/db/suppliers_db.inc
index be6eb5b3..6b7d0cde 100644
--- a/purchasing/includes/db/suppliers_db.inc
+++ b/purchasing/includes/db/suppliers_db.inc
@@ -13,12 +13,13 @@
 function add_supplier($supp_name, $supp_ref, $address, $supp_address, $gst_no,
 	$website, $supp_account_no, $bank_account, $credit_limit, $dimension_id, $dimension2_id, 
 	$curr_code, $payment_terms, $payable_account, $purchase_account, $payment_discount_account, 
-	$notes, $tax_group_id)
+	$notes, $tax_group_id, $tax_included, $tax_algorithm)
 {
 	$sql = "INSERT INTO ".TB_PREF."suppliers (supp_name, supp_ref, address, supp_address, gst_no, website,
 		supp_account_no, bank_account, credit_limit, dimension_id, dimension2_id, curr_code,
-		payment_terms, payable_account, purchase_account, payment_discount_account, notes, tax_group_id)
-		VALUES (".db_escape($_POST['supp_name']). ", "
+		payment_terms, payable_account, purchase_account, payment_discount_account, notes, 
+		tax_group_id, tax_included, tax_algorithm)
+		VALUES (".db_escape($supp_name). ", "
 		.db_escape($supp_ref). ", "
 		.db_escape($address) . ", "
 		.db_escape($supp_address) . ", "
@@ -35,7 +36,9 @@ function add_supplier($supp_name, $supp_ref, $address, $supp_address, $gst_no,
 		.db_escape($purchase_account). ", "
 		.db_escape($payment_discount_account). ", "
 		.db_escape($notes). ", "
-		.db_escape($tax_group_id). ")";
+		.db_escape($tax_group_id). ", "
+		.db_escape($tax_included). ", "
+		.db_escape($tax_algorithm). ")";
 
 	db_query($sql,"The supplier could not be added");
 }
@@ -43,7 +46,7 @@ function add_supplier($supp_name, $supp_ref, $address, $supp_address, $gst_no,
 function update_supplier($supplier_id, $supp_name, $supp_ref, $address, $supp_address, $gst_no, 
 	$website, $supp_account_no, $bank_account, $credit_limit, $dimension_id, $dimension2_id, 
 	$curr_code, $payment_terms, $payable_account, $purchase_account, $payment_discount_account, 
-	$notes, $tax_group_id)
+	$notes, $tax_group_id, $tax_included, $tax_algorithm)
 {
 	$sql = "UPDATE ".TB_PREF."suppliers SET supp_name=".db_escape($supp_name) . ",
 		supp_ref=".db_escape($supp_ref) . ",
@@ -62,7 +65,9 @@ function update_supplier($supplier_id, $supp_name, $supp_ref, $address, $supp_ad
 		purchase_account=".db_escape($purchase_account) . ",
 		payment_discount_account=".db_escape($payment_discount_account) . ",
 		notes=".db_escape($notes) . ",
-		tax_group_id=".db_escape($tax_group_id)
+		tax_group_id=".db_escape($tax_group_id). ",
+		tax_included=".db_escape($tax_included).",
+		tax_algorithm=".db_escape($tax_algorithm)
 		." WHERE supplier_id = ".db_escape($supplier_id);
 
 	db_query($sql,"The supplier could not be updated");
@@ -74,7 +79,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)
@@ -85,7 +90,12 @@ function get_supplier_details($supplier_id, $to=null)
 	$past2 = 2 * $past1;
 	// removed - supp_trans.alloc from all summations
 
-    $value = "(trans.ov_amount + trans.ov_gst + trans.ov_discount)";
+	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))";
 	$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,
 
@@ -104,14 +114,14 @@ 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 > ".FLOAT_COMP_DELTA." ";  
+	$sql .= "GROUP BY
 			  supp.supp_name,
 			  ".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);
 
@@ -170,4 +180,21 @@ function is_new_supplier($id)
 
 	return !key_in_foreign_table($id, $tables, 'supplier_id');
 }
-?>
\ No newline at end of file
+
+function update_supp_tax_algorithm($supplier_id, $tax_algorithm)
+{
+	$sql = "UPDATE ".TB_PREF."suppliers SET tax_algorithm=".db_escape($tax_algorithm)
+		. " WHERE supplier_id=".db_escape($supplier_id);
+	return db_query($sql, "cannot update supplier's tax calculation algorithm");
+}
+
+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[0];
+}
+