X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;ds=sidebyside;f=purchasing%2Fincludes%2Fdb%2Fsuppliers_db.inc;h=04228e9d5a721dd5fc5a12fc22421d0662fb6cee;hb=c696fcc9ed013beb349faca8a5ea95d0632d66b7;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..04228e9d 100644
--- a/purchasing/includes/db/suppliers_db.inc
+++ b/purchasing/includes/db/suppliers_db.inc
@@ -13,11 +13,12 @@
 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)
+		payment_terms, payable_account, purchase_account, payment_discount_account, notes, 
+		tax_group_id, tax_included, tax_algorithm)
 		VALUES (".db_escape($_POST['supp_name']). ", "
 		.db_escape($supp_ref). ", "
 		.db_escape($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");
@@ -112,7 +117,7 @@ function get_supplier_details($supplier_id, $to=null)
 			  ".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");
+    $result = db_query($sql,"The supplier details could not be retrieved");
     $supp = db_fetch($result);
 
     return $supp;
@@ -170,4 +175,12 @@ function is_new_supplier($id)
 
 	return !key_in_foreign_table($id, $tables, 'supplier_id');
 }
+
+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");
+}
+
 ?>
\ No newline at end of file