X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=purchasing%2Fincludes%2Fdb%2Fsuppliers_db.inc;h=c3a16d21488a9ac516eb55379e87a39b3f18f517;hb=fac01186b3b34ea4cdf20a2f8cea12646cd319d6;hp=c031cede6d186e36703592b81dce2819e7f8ef9b;hpb=70840a5223cf5c9f31d360946225bbad6a2a1943;p=fa-stable.git

diff --git a/purchasing/includes/db/suppliers_db.inc b/purchasing/includes/db/suppliers_db.inc
index c031cede..c3a16d21 100644
--- a/purchasing/includes/db/suppliers_db.inc
+++ b/purchasing/includes/db/suppliers_db.inc
@@ -73,8 +73,12 @@ function update_supplier($supplier_id, $supp_name, $supp_ref, $address, $supp_ad
 
 function delete_supplier($supplier_id)
 {
+	begin_transaction();
+	delete_entity_contacts('supplier', $supplier_id);
 	$sql="DELETE FROM ".TB_PREF."suppliers WHERE supplier_id=".db_escape($supplier_id);
+
 	db_query($sql,"check failed");
+	commit_transaction();
 }
 
 function get_supplier_details($supplier_id, $to=null, $all=true)
@@ -93,7 +97,7 @@ function get_supplier_details($supplier_id, $to=null, $all=true)
     else	
     	$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)";
+    		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,
@@ -144,12 +148,12 @@ function get_supplier_name($supplier_id)
 
 	$row = db_fetch_row($result);
 
-	return $row[0];
+	return is_array($row) ? $row[0] : false;
 }
 
 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");
 
@@ -187,7 +191,7 @@ function get_supplier_currency($supplier_id)
 	$result = db_query($sql, "Retreive currency of supplier $supplier_id");
 
 	$myrow=db_fetch_row($result);
-	return $myrow[0];
+	return $myrow ? $myrow[0] : get_company_currency();
 }
 
 function get_suppliers_search($supplier)