X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=sales%2Fincludes%2Fdb%2Fbranches_db.inc;h=09b1fbe4f28af171c013cd574c5bbc028b5bdf9c;hb=91bede4226ba8b45151f0501ac88eb946ed5f2a1;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..09b1fbe4 100644 --- a/sales/includes/db/branches_db.inc +++ b/sales/includes/db/branches_db.inc @@ -12,12 +12,12 @@ 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) + $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, disable_trans, 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) . ", " @@ -32,14 +32,15 @@ function add_branch($customer_id, $br_name, $br_ref, $br_address, $salesman, $ar .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) + $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) . ", @@ -56,7 +57,8 @@ function update_branch($customer_id, $branch_code, $br_name, $br_ref, $br_addres 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"); @@ -164,7 +166,7 @@ function get_sql_for_customer_branches() AND b.debtor_no = ".db_escape($_POST['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; }