X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=sales%2Fmanage%2Fcustomer_branches.php;h=d84f26b1b8c4e78773539b219c78fc1190ed5574;hb=d9b4de9d7e9d3ba77f6ece752fd6cc988effd8f1;hp=fbcbc09ba3960e2f3c7066202fe1820a97dcf4a5;hpb=55fd8ab28fba455e8670a0580b034cb31deb61b8;p=fa-stable.git diff --git a/sales/manage/customer_branches.php b/sales/manage/customer_branches.php index fbcbc09b..d84f26b1 100644 --- a/sales/manage/customer_branches.php +++ b/sales/manage/customer_branches.php @@ -15,7 +15,7 @@ $path_to_root="../.."; include($path_to_root . "/includes/db_pager.inc"); include($path_to_root . "/includes/session.inc"); -page(_("Customer Branches"), @$_REQUEST['popup']); +page(_($help_context = "Customer Branches"), @$_REQUEST['popup']); include($path_to_root . "/includes/ui.inc"); @@ -77,58 +77,27 @@ if ($Mode=='ADD_ITEM' || $Mode=='UPDATE_ITEM') if ($selected_id != -1) { /*SelectedBranch could also exist if submit had not been clicked this code would not run in this case cos submit is false of course see the delete code below*/ - - $sql = "UPDATE ".TB_PREF."cust_branch SET br_name = " . db_escape($_POST['br_name']) . ", - branch_ref = " . db_escape($_POST['br_ref']) . ", - br_address = ".db_escape($_POST['br_address']). ", - phone=".db_escape($_POST['phone']). ", - fax=".db_escape($_POST['fax']).", - contact_name=".db_escape($_POST['contact_name']) . ", - salesman= ".db_escape($_POST['salesman']) . ", - area=".db_escape($_POST['area']) . ", - email=".db_escape($_POST['email']) . ", - tax_group_id=".db_escape($_POST['tax_group_id']). ", - sales_account=".db_escape($_POST['sales_account']) . ", - sales_discount_account=".db_escape($_POST['sales_discount_account']) . ", - receivables_account=".db_escape($_POST['receivables_account']) . ", - payment_discount_account=".db_escape($_POST['payment_discount_account']) . ", - default_location=".db_escape($_POST['default_location']) . ", - br_post_address =".db_escape($_POST['br_post_address']) . ", - disable_trans=".db_escape($_POST['disable_trans']) . ", - group_no=".db_escape($_POST['group_no']) . ", - default_ship_via=".db_escape($_POST['default_ship_via']) . " - WHERE branch_code =".db_escape($_POST['branch_code']) . " - AND debtor_no=".db_escape($_POST['customer_id']); + update_branch($_POST['customer_id'], $_POST['branch_code'], $_POST['br_name'], $_POST['br_ref'], + $_POST['br_address'], $_POST['phone'], $_POST['phone2'], $_POST['fax'], $_POST['contact_name'], + $_POST['salesman'], $_POST['area'], $_POST['email'], $_POST['tax_group_id'], $_POST['sales_account'], + $_POST['sales_discount_account'], $_POST['receivables_account'], $_POST['payment_discount_account'], + $_POST['default_location'], $_POST['br_post_address'], $_POST['disable_trans'], $_POST['group_no'], + $_POST['default_ship_via'], $_POST['notes'], $_POST['rep_lang']); $note =_('Selected customer branch has been updated'); } else { /*Selected branch is null cos no item selected on first time round so must be adding a record must be submitting new entries in the new Customer Branches form */ - $sql = "INSERT INTO ".TB_PREF."cust_branch (debtor_no, br_name, branch_ref, br_address, - salesman, phone, fax, - contact_name, area, email, 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) - VALUES (".db_escape($_POST['customer_id']). ",".db_escape($_POST['br_name']) . ", " - .db_escape($_POST['br_ref']) . ", " - .db_escape($_POST['br_address']) . ", ".db_escape($_POST['salesman']) . ", " - .db_escape($_POST['phone']) . ", ".db_escape($_POST['fax']) . "," - .db_escape($_POST['contact_name']) . ", ".db_escape($_POST['area']) . "," - .db_escape($_POST['email']) . ", ".db_escape($_POST['tax_group_id']) . ", " - .db_escape($_POST['sales_account']) . ", " - .db_escape($_POST['receivables_account']) . ", " - .db_escape($_POST['payment_discount_account']) . ", " - .db_escape($_POST['sales_discount_account']) . ", " - .db_escape($_POST['default_location']) . ", " - .db_escape($_POST['br_post_address']) . "," - .db_escape($_POST['disable_trans']) . ", " - .db_escape($_POST['group_no']) . ", " - .db_escape($_POST['default_ship_via']) . ")"; - + add_branch($_POST['customer_id'], $_POST['br_name'], $_POST['br_ref'], + $_POST['br_address'], $_POST['phone'], $_POST['phone2'], $_POST['fax'], $_POST['contact_name'], + $_POST['salesman'], $_POST['area'], $_POST['email'], $_POST['tax_group_id'], $_POST['sales_account'], + $_POST['sales_discount_account'], $_POST['receivables_account'], $_POST['payment_discount_account'], + $_POST['default_location'], $_POST['br_post_address'], $_POST['disable_trans'], $_POST['group_no'], + $_POST['default_ship_via'], $_POST['notes'], $_POST['rep_lang']); + $note = _('New customer branch has been added'); } - //run the sql from either of the above possibilites - db_query($sql,"The branch record could not be inserted or updated"); display_notification($note); $Mode = 'RESET'; if (@$_REQUEST['popup']) { @@ -144,28 +113,20 @@ elseif ($Mode == 'Delete') // PREVENT DELETES IF DEPENDENT RECORDS IN 'debtor_trans' - $sql= "SELECT COUNT(*) FROM ".TB_PREF."debtor_trans WHERE branch_code='" . $_POST['branch_code']. "' AND debtor_no = '" . $_POST['customer_id']. "'"; - $result = db_query($sql,"could not query debtortrans"); - $myrow = db_fetch_row($result); - if ($myrow[0] > 0) + if (branch_in_foreign_table($_POST['customer_id'], $_POST['branch_code'], 'debtor_trans')) { display_error(_("Cannot delete this branch because customer transactions have been created to this branch.")); } else { - $sql= "SELECT COUNT(*) FROM ".TB_PREF."sales_orders WHERE branch_code='" . $_POST['branch_code']. "' AND debtor_no = '" . $_POST['customer_id']. "'"; - $result = db_query($sql,"could not query sales orders"); - - $myrow = db_fetch_row($result); - if ($myrow[0] > 0) + if (branch_in_foreign_table($_POST['customer_id'], $_POST['branch_code'], 'sales_orders')) { display_error(_("Cannot delete this branch because sales orders exist for it. Purge old sales orders first.")); } else { - $sql="DELETE FROM ".TB_PREF."cust_branch WHERE branch_code='" . $_POST['branch_code']. "' AND debtor_no='" . $_POST['customer_id']. "'"; - db_query($sql,"could not delete branch"); + delete_branch($_POST['customer_id'], $_POST['branch_code']); display_notification(_('Selected customer branch has been deleted')); } } //end ifs to test if the branch can be deleted @@ -196,41 +157,19 @@ function del_link($row) { } function select_link($row) { - return button("Select".$row["branch_code"],_("Select"), '', ICON_ADD, 'selector'); + return button("Select".$row["branch_code"], $row["branch_code"], '', ICON_ADD, 'selector'); } start_form(); echo "
" . _("Select a customer: ") . "  "; -customer_list('customer_id', null, false, true); +echo customer_list('customer_id', null, false, true); echo "

"; $num_branches = db_customer_has_branches($_POST['customer_id']); - $sql = "SELECT " - ."b.branch_code, " - ."b.branch_ref, " - ."b.br_name, " - ."b.contact_name, " - ."s.salesman_name, " - ."a.description, " - ."b.phone, " - ."b.fax, " - ."b.email, " - ."t.name AS tax_group_name, " - ."b.inactive - FROM ".TB_PREF."cust_branch b, " - .TB_PREF."debtors_master c, " - .TB_PREF."areas a, " - .TB_PREF."salesman s, " - .TB_PREF."tax_groups t - WHERE b.debtor_no=c.debtor_no - AND b.tax_group_id=t.id - AND b.area=a.area_code - AND b.salesman=s.salesman_code - AND b.debtor_no = '" . $_POST['customer_id']. "'"; - - if (!get_post('show_inactive')) $sql .= " AND !b.inactive"; +$sql = get_sql_for_customer_branches(); + //------------------------------------------------------------------------------------------------ if ($num_branches) { @@ -265,7 +204,7 @@ display_db_pager($table); else display_note(_("The selected customer does not have any branches. Please create at least one branch.")); -start_outer_table($table_style2, 5); +start_outer_table(TABLESTYLE2); table_section(1); @@ -275,11 +214,7 @@ if ($selected_id != -1) if ($Mode == 'Edit') { //editing an existing branch - $sql = "SELECT * FROM ".TB_PREF."cust_branch - WHERE branch_code='" . $_POST['branch_code'] . "' - AND debtor_no='" . $_POST['customer_id'] . "'"; - $result = db_query($sql,"check failed"); - $myrow = db_fetch($result); + $myrow = get_cust_branch($_POST['customer_id'], $_POST['branch_code']); set_focus('br_name'); $_POST['branch_code'] = $myrow["branch_code"]; $_POST['br_name'] = $myrow["br_name"]; @@ -289,7 +224,9 @@ if ($selected_id != -1) $_POST['contact_name'] = $myrow["contact_name"]; $_POST['salesman'] =$myrow["salesman"]; $_POST['area'] =$myrow["area"]; + $_POST['rep_lang'] =$myrow["rep_lang"]; $_POST['phone'] =$myrow["phone"]; + $_POST['phone2'] =$myrow["phone2"]; $_POST['fax'] =$myrow["fax"]; $_POST['email'] =$myrow["email"]; $_POST['tax_group_id'] = $myrow["tax_group_id"]; @@ -301,15 +238,15 @@ if ($selected_id != -1) $_POST['receivables_account'] = $myrow['receivables_account']; $_POST['payment_discount_account'] = $myrow['payment_discount_account']; $_POST['group_no'] = $myrow["group_no"]; + $_POST['notes'] = $myrow["notes"]; + } } elseif ($Mode != 'ADD_ITEM') { //end of if $SelectedBranch only do the else when a new record is being entered + $myrow = get_default_info_for_branch($_POST['customer_id']); + $_POST['rep_lang'] = $myrow['rep_lang']; if(!$num_branches) { - $sql = "SELECT name, address, email, debtor_ref - FROM ".TB_PREF."debtors_master WHERE debtor_no = '" . $_POST['customer_id']. "'"; - $result = db_query($sql,"check failed"); - $myrow = db_fetch($result); $_POST['br_name'] = $myrow["name"]; $_POST['br_ref'] = $myrow["debtor_ref"]; $_POST['contact_name'] = _('Main Branch'); @@ -323,7 +260,7 @@ elseif ($Mode != 'ADD_ITEM') // We use the Item Sales Account as default! // $_POST['sales_account'] = $company_record["default_sales_act"]; - $_POST['sales_account'] = ""; + $_POST['sales_account'] = $_POST['notes'] = ''; $_POST['sales_discount_account'] = $company_record['default_sales_discount_act']; $_POST['receivables_account'] = $company_record['debtors_act']; $_POST['payment_discount_account'] = $company_record['default_prompt_payment_act']; @@ -341,8 +278,9 @@ text_row(_("Branch Name:"), 'br_name', null, 35, 40); text_row(_("Branch Short Name:"), 'br_ref', null, 30, 30); text_row(_("Contact Person:"), 'contact_name', null, 35, 40); -text_row(_("Phone Number:"), 'phone', null, 20, 20); -text_row(_("Fax Number:"), 'fax', null, 20, 20); +text_row(_("Phone Number:"), 'phone', null, 32, 30); +text_row(_("Secondary Phone Number:"), 'phone2', null, 32, 30); +text_row(_("Fax Number:"), 'fax', null, 32, 30); email_row(_("E-mail:"), 'email', null, 35, 55); @@ -350,6 +288,8 @@ table_section_title(_("Sales")); sales_persons_list_row( _("Sales Person:"), 'salesman', null); +languages_list_row( _("Document Language:"), 'rep_lang', null, _("Customer default")); + sales_areas_list_row( _("Sales Area:"), 'area', null); sales_groups_list_row(_("Sales Group:"), 'group_no', null, true); @@ -377,9 +317,11 @@ gl_all_accounts_list_row(_("Prompt Payment Discount Account:"), 'payment_discoun table_section_title(_("Addresses")); -textarea_row(_("Mailing Address:"), 'br_post_address', null, 35, 5); +textarea_row(_("Mailing Address:"), 'br_post_address', null, 35, 4); + +textarea_row(_("Billing Address:"), 'br_address', null, 35, 4); -textarea_row(_("Billing Address:"), 'br_address', null, 35, 5); +textarea_row(_("General Notes:"), 'notes', null, 35, 4); end_outer_table(1);