X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;ds=sidebyside;f=sales%2Fincludes%2Fdb%2Fbranches_db.inc;h=80f00a6d253b40969fc9d305a0ac02a1e8c2231e;hb=3b431d909abc53e4a4d712cbafa39ca556409d0e;hp=2688d1b3e2d341e521db4deebfbfaeb753ec1121;hpb=46c5f7a65a7659a44ae8254c63152074363d3987;p=fa-stable.git

diff --git a/sales/includes/db/branches_db.inc b/sales/includes/db/branches_db.inc
index 2688d1b3..80f00a6d 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,
-	$default_ship_via, $notes)
+	$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)
+		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,17 +29,17 @@ 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).")";
+			.db_escape($notes). ", "
+			.db_escape($bank_account, true).")";
 	db_query($sql,"The branch record could not be added");
 }
 
 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,
-	$default_ship_via, $notes)
+	$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) . ",
 		branch_ref = " . db_escape($br_ref) . ",
@@ -53,10 +53,10 @@ 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) . "
+		notes=".db_escape($notes) . ",
+		bank_account=".db_escape($bank_account, true)."
 		WHERE branch_code =".db_escape($branch_code) . "
 		AND debtor_no=".db_escape($customer_id);
 	db_query($sql,"The branch record could not be updated");
@@ -137,7 +137,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, "
@@ -161,10 +161,10 @@ 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 .= " ORDER BY branch_ref";
+	$sql .= " GROUP BY b.branch_code ORDER BY branch_ref";
 
 	return $sql;
 }
@@ -251,4 +251,13 @@ 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);
+}
+