X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=sales%2Fincludes%2Fdb%2Fbranches_db.inc;h=e51de6f149234bd8004084fa8545d0f0919025ae;hb=80061be53f5f8d6415801e6e411a3891efc128c4;hp=09b1fbe4f28af171c013cd574c5bbc028b5bdf9c;hpb=0b63d898491b6577a5a5bf90e771dca0dcbbcf1f;p=fa-stable.git

diff --git a/sales/includes/db/branches_db.inc b/sales/includes/db/branches_db.inc
index 09b1fbe4..e51de6f1 100644
--- a/sales/includes/db/branches_db.inc
+++ b/sales/includes/db/branches_db.inc
@@ -11,13 +11,13 @@
 ***********************************************************************/
 function add_branch($customer_id, $br_name, $br_ref, $br_address, $salesman, $area, 
 	$tax_group_id, $sales_account, $sales_discount_account, $receivables_account, 
-	$payment_discount_account, $default_location, $br_post_address, $disable_trans, $group_no,
+	$payment_discount_account, $default_location, $br_post_address, $group_no,
 	$default_ship_via, $notes, $bank_account)
 {
 	$sql = "INSERT INTO ".TB_PREF."cust_branch (debtor_no, br_name, branch_ref, br_address,
 		salesman, area, tax_group_id, sales_account, receivables_account, payment_discount_account, 
 		sales_discount_account, default_location,
-		br_post_address, disable_trans, group_no, default_ship_via, notes, bank_account)
+		br_post_address, group_no, default_ship_via, notes, bank_account)
 		VALUES (".db_escape($customer_id). ",".db_escape($br_name) . ", "
 			.db_escape($br_ref) . ", "
 			.db_escape($br_address) . ", ".db_escape($salesman) . ", "
@@ -29,7 +29,6 @@ function add_branch($customer_id, $br_name, $br_ref, $br_address, $salesman, $ar
 			.db_escape($sales_discount_account) . ", "
 			.db_escape($default_location) . ", "
 			.db_escape($br_post_address) . ","
-			.db_escape($disable_trans) . ", "
 			.db_escape($group_no) . ", "
 			.db_escape($default_ship_via). ", "
 			.db_escape($notes). ", "
@@ -39,7 +38,7 @@ function add_branch($customer_id, $br_name, $br_ref, $br_address, $salesman, $ar
 
 function update_branch($customer_id, $branch_code, $br_name, $br_ref, $br_address,
 	$salesman, $area, $tax_group_id, $sales_account, $sales_discount_account, $receivables_account, 
-	$payment_discount_account, $default_location, $br_post_address, $disable_trans, $group_no,
+	$payment_discount_account, $default_location, $br_post_address, $group_no,
 	$default_ship_via, $notes, $bank_account)
 {
 	$sql = "UPDATE ".TB_PREF."cust_branch SET br_name = " . db_escape($br_name) . ",
@@ -54,7 +53,6 @@ function update_branch($customer_id, $branch_code, $br_name, $br_ref, $br_addres
 		payment_discount_account=".db_escape($payment_discount_account) . ",
 		default_location=".db_escape($default_location) . ",
 		br_post_address =".db_escape($br_post_address) . ",
-		disable_trans=".db_escape($disable_trans) . ",
 		group_no=".db_escape($group_no) . ", 
 		default_ship_via=".db_escape($default_ship_via) . ",
 		notes=".db_escape($notes) . ",
@@ -83,13 +81,15 @@ function branch_in_foreign_table($customer_id, $branch_code, $table)
 
 function get_branch($branch_id)
 {
-	$sql = "SELECT ".TB_PREF."cust_branch.*,".TB_PREF."salesman.salesman_name 
-		FROM ".TB_PREF."cust_branch, ".TB_PREF."salesman 
-		WHERE ".TB_PREF."cust_branch.salesman=".TB_PREF."salesman.salesman_code 
-		AND branch_code=".db_escape($branch_id);
-	
+	$sql = "SELECT branch.*, salesman.salesman_name 
+		FROM "
+			.TB_PREF."cust_branch branch,"
+			.TB_PREF."salesman salesman
+		WHERE branch.salesman=salesman.salesman_code 
+			AND branch_code=".db_escape($branch_id);
+
 	$result = db_query($sql, "Cannot retreive a customer branch");
-	
+
 	return db_fetch($result);
 }
 
@@ -139,7 +139,7 @@ function get_default_info_for_branch($customer_id)
 	return db_fetch($result);
 }
 
-function get_sql_for_customer_branches()
+function get_sql_for_customer_branches($customer_id)
 {
 	$sql = "SELECT "
 		."b.branch_code, "
@@ -163,7 +163,7 @@ function get_sql_for_customer_branches()
 		WHERE b.tax_group_id=t.id
 		AND b.area=a.area_code
 		AND b.salesman=s.salesman_code
-		AND b.debtor_no = ".db_escape($_POST['customer_id']);
+		AND b.debtor_no = ".db_escape($customer_id);
 
 	if (!get_post('show_inactive')) $sql .= " AND !b.inactive";
 	$sql .= " GROUP BY b.branch_code ORDER BY branch_ref";
@@ -186,8 +186,10 @@ function get_branch_contacts($branch_code, $action=null, $customer_id=null, $def
 				'customer.general');
 
 	$sql = "SELECT p.*, r.action, r.type, CONCAT(r.type,'.',r.action) as ext_type 
-		FROM ".TB_PREF."crm_persons p,"
-		.TB_PREF."crm_contacts r WHERE r.person_id=p.id AND ((r.type='cust_branch' 
+		FROM "
+			.TB_PREF."crm_persons p,"
+			.TB_PREF."crm_contacts r
+		WHERE r.person_id=p.id AND ((r.type='cust_branch' 
 			AND r.entity_id=".db_escape($branch_code).')';
 	if($customer_id) {
 		$sql .= " OR (r.type='customer' AND r.entity_id=".db_escape($customer_id).")";
@@ -218,7 +220,8 @@ function _get_branch_contacts($branch_code, $action=null, $customer_id=null, $de
 {
 	$sql = "SELECT p.*, r.action, r.type, CONCAT(r.type,'.',r.action) as ext_type 
 		FROM ".TB_PREF."crm_persons p,"
-		.TB_PREF."crm_contacts r WHERE r.person_id=p.id AND r.type='cust_branch' 
+			.TB_PREF."crm_contacts r
+		WHERE r.person_id=p.id AND r.type='cust_branch' 
 			AND r.entity_id=".db_escape($branch_code);
 
 	if ($action)
@@ -227,13 +230,14 @@ function _get_branch_contacts($branch_code, $action=null, $customer_id=null, $de
 	if($customer_id) {
 		$sql = "($sql) UNION (SELECT p.*, r.action, r.type, CONCAT(r.type,'.',r.action) as ext_type
 		FROM ".TB_PREF."crm_persons p,"
-		.TB_PREF."crm_contacts r WHERE r.person_id=p.id AND r.type='customer' 
+			.TB_PREF."crm_contacts r 
+		WHERE r.person_id=p.id AND r.type='customer' 
 			AND r.entity_id=".db_escape($customer_id);
 		if ($action) 
 			$sql .= ' AND (r.action='.db_escape($action).($default ? " OR r.action='general'":'').')';
 		$sql .= ')';
 	}
-	
+
 	$res = db_query($sql, "can't retrieve branch contacts");
 	$results = array();
 	$type = '';
@@ -253,4 +257,39 @@ function _get_branch_contacts($branch_code, $action=null, $customer_id=null, $de
 	return $results;
 }
 
-?>
\ No newline at end of file
+function get_default_branch($customer_id, $ar_account=null)
+{
+	$sql = "SELECT * 
+		FROM ".TB_PREF."cust_branch WHERE debtor_no = ".db_escape($customer_id);
+	if($ar_account)
+		$sql .= " AND receivables_account=".db_escape($ar_account);
+	$result = db_query($sql,"cannot retrieve default branch");
+	return db_fetch($result);
+}
+
+function  get_branches_search($customer, $branch)
+{
+	global $SysPrefs;
+
+	if (isset($SysPrefs->max_rows_in_search))
+		$limit = $SysPrefs->max_rows_in_search;
+	else
+		$limit = 10;
+
+	$sql = "SELECT 
+		    b.branch_code,
+	    	b.branch_ref,
+	    	b.br_name,
+    		p.name as contact_name,
+		    p.phone
+		FROM ".TB_PREF."cust_branch b
+		LEFT JOIN ".TB_PREF."crm_contacts c
+			ON c.entity_id=b.branch_code AND c.type='cust_branch' AND c.action='general'
+		LEFT JOIN ".TB_PREF."crm_persons p ON c.person_id=p.id
+		WHERE b.debtor_no = ".db_escape($customer)."
+			AND b.br_name LIKE " . db_escape("%" . $branch. "%") . "
+		ORDER BY b.br_name LIMIT 0,".(int)($limit);
+
+	return db_query($sql, "Failed in retreiving branches list.");
+}
+