X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=sales%2Fmanage%2Fcustomer_branches.php;h=48b8e76a4501c31a4904193a35a9e648a2f3a504;hb=2f3375b4493c1b1e0b17c2801298275f22f8d76e;hp=135e54f0c5eb69c542788e1fd43e5d462f385252;hpb=8bd22b7671d18cfdf01b8a0f3f66455d5de28014;p=fa-stable.git diff --git a/sales/manage/customer_branches.php b/sales/manage/customer_branches.php index 135e54f0..48b8e76a 100644 --- a/sales/manage/customer_branches.php +++ b/sales/manage/customer_branches.php @@ -10,14 +10,19 @@ See the License here . ***********************************************************************/ $page_security = 'SA_CUSTOMER'; -//$page_security = 3; $path_to_root="../.."; + include($path_to_root . "/includes/db_pager.inc"); include($path_to_root . "/includes/session.inc"); -page(_($help_context = "Customer Branches"), @$_REQUEST['popup']); +$js = ""; +if ($SysPrefs->use_popup_windows && $SysPrefs->use_popup_search) + $js .= get_js_open_window(900, 500); + +page(_($help_context = "Customer Branches"), @$_REQUEST['popup'], false, "", $js); include($path_to_root . "/includes/ui.inc"); +include($path_to_root . "/includes/ui/contacts_view.inc"); //----------------------------------------------------------------------------------------------- @@ -38,6 +43,7 @@ if (isset($_GET['debtor_no'])) { $_POST['customer_id'] = strtoupper($_GET['debtor_no']); } + $_POST['branch_code'] = $selected_id; if (isset($_GET['SelectedBranch'])) @@ -55,8 +61,6 @@ if ($Mode=='ADD_ITEM' || $Mode=='UPDATE_ITEM') //initialise no input errors assumed initially before we test $input_error = 0; - //first off validate inputs sensible - if (strlen($_POST['br_name']) == 0) { $input_error = 1; @@ -74,44 +78,46 @@ if ($Mode=='ADD_ITEM' || $Mode=='UPDATE_ITEM') if ($input_error != 1) { + begin_transaction(); 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*/ 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['br_address'], $_POST['salesman'], $_POST['area'], $_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']); + $_POST['default_location'], $_POST['br_post_address'], $_POST['group_no'], + $_POST['default_ship_via'], $_POST['notes'], $_POST['bank_account']); $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 */ 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['br_address'], $_POST['salesman'], $_POST['area'], $_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']); - + $_POST['default_location'], $_POST['br_post_address'], $_POST['group_no'], + $_POST['default_ship_via'], $_POST['notes'], $_POST['bank_account']); + $selected_id = db_insert_id(); + + add_crm_person($_POST['contact_name'], $_POST['contact_name'], '', $_POST['br_post_address'], + $_POST['phone'], $_POST['phone2'], $_POST['fax'], $_POST['email'], + $_POST['rep_lang'], ''); + + add_crm_contact('cust_branch', 'general', $selected_id, db_insert_id()); + + $note = _('New customer branch has been added'); } + commit_transaction(); display_notification($note); - $Mode = 'RESET'; + if (@$_REQUEST['popup']) { - set_focus("Select".($_POST['branch_code'] == -1 - ? db_insert_id(): $_POST['branch_code'])); + set_focus("Select".($_POST['branch_code'] == -1 ? $selected_id: $_POST['branch_code'])); } } } elseif ($Mode == 'Delete') { - //the link to delete a selected record was clicked instead of the submit button - - // PREVENT DELETES IF DEPENDENT RECORDS IN 'debtor_trans' if (branch_in_foreign_table($_POST['customer_id'], $_POST['branch_code'], 'debtor_trans')) { @@ -129,7 +135,7 @@ elseif ($Mode == 'Delete') 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 + } $Mode = 'RESET'; } @@ -160,15 +166,114 @@ function select_link($row) { return button("Select".$row["branch_code"], $row["branch_code"], '', ICON_ADD, 'selector'); } +function branch_settings($selected_id, $num_branches) { + global $Mode; + + start_outer_table(TABLESTYLE2); + + table_section(1); + + $_POST['email'] = ""; + if ($selected_id != -1) + { + if ($Mode == 'Edit' || !isset($_POST['br_name'])) { + //editing an existing branch + $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"]; + $_POST['br_ref'] = $myrow["branch_ref"]; + $_POST['br_address'] = $myrow["br_address"]; + $_POST['br_post_address'] = $myrow["br_post_address"]; + $_POST['salesman'] =$myrow["salesman"]; + $_POST['area'] =$myrow["area"]; + $_POST['tax_group_id'] = $myrow["tax_group_id"]; + $_POST['default_location'] = $myrow["default_location"]; + $_POST['default_ship_via'] = $myrow['default_ship_via']; + $_POST['sales_account'] = $myrow["sales_account"]; + $_POST['sales_discount_account'] = $myrow['sales_discount_account']; + $_POST['receivables_account'] = $myrow['receivables_account']; + $_POST['payment_discount_account'] = $myrow['payment_discount_account']; + $_POST['group_no'] = $myrow["group_no"]; + $_POST['notes'] = $myrow["notes"]; + $_POST['bank_account'] = $myrow["bank_account"]; + + } + } + elseif ($Mode != 'ADD_ITEM') + { + $myrow = get_default_info_for_branch($_POST['customer_id']); + if($myrow && !$num_branches) { + $_POST['br_name'] = $myrow["name"]; + $_POST['br_ref'] = $myrow["debtor_ref"]; + $_POST['contact_name'] = _('Main Branch'); + $_POST['br_address'] = $_POST['br_post_address'] = $myrow["address"]; + } + $_POST['branch_code'] = ""; + if (!isset($_POST['sales_account']) || !isset($_POST['sales_discount_account'])) + { + $company_record = get_company_prefs(); + + // We use the Item Sales Account as default! + // $_POST['sales_account'] = $company_record["default_sales_act"]; + $_POST['sales_account'] = $_POST['notes'] = $_POST['bank_account'] = ''; + $_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']; + } + + } + hidden('popup', @$_REQUEST['popup']); + + table_section_title(_("Name and Contact")); + text_row(_("Branch Name:"), 'br_name', null, 50, 60); + text_row(_("Branch Short Name:"), 'br_ref', null, 30, 30); + + table_section_title(_("Sales")); + sales_persons_list_row( _("Sales Person:"), 'salesman', null); + sales_areas_list_row( _("Sales Area:"), 'area', null); + sales_groups_list_row(_("Sales Group:"), 'group_no', null, true); + locations_list_row(_("Default Inventory Location:"), 'default_location', null); + shippers_list_row(_("Default Shipping Company:"), 'default_ship_via', null); + tax_groups_list_row(_("Tax Group:"), 'tax_group_id', null); + + table_section_title(_("GL Accounts")); + + gl_all_accounts_list_row(_("Sales Account:"), 'sales_account', null, false, false, true); + gl_all_accounts_list_row(_("Sales Discount Account:"), 'sales_discount_account'); + gl_all_accounts_list_row(_("Accounts Receivable Account:"), 'receivables_account', null, true); + gl_all_accounts_list_row(_("Prompt Payment Discount Account:"), 'payment_discount_account'); + text_row(_("Bank Account Number:"), 'bank_account', null, 30, 60); + + table_section(2); + + if($selected_id==-1) { + table_section_title(_("General contact data")); + text_row(_("Contact Person:"), 'contact_name', null, 35, 40); + 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); + languages_list_row( _("Document Language:"), 'rep_lang', null, _("Customer default")); + } + table_section_title(_("Addresses")); + textarea_row(_("Mailing Address:"), 'br_post_address', null, 35, 4); + textarea_row(_("Billing Address:"), 'br_address', null, 35, 4); + textarea_row(_("General Notes:"), 'notes', null, 35, 4); + + end_outer_table(1); + submit_add_or_update_center($selected_id == -1, '', 'both'); +} + start_form(); echo "
" . _("Select a customer: ") . "  "; echo customer_list('customer_id', null, false, true); echo "

"; -$num_branches = db_customer_has_branches($_POST['customer_id']); +$num_branches = db_customer_has_branches(get_post('customer_id')); -$sql = get_sql_for_customer_branches(); +$sql = get_sql_for_customer_branches(get_post('customer_id')); //------------------------------------------------------------------------------------------------ if ($num_branches) @@ -185,7 +290,6 @@ $cols = array( _("E-mail") => 'email', _("Tax Group"), _("Inactive") => 'inactive', -// array('fun'=>'inactive'), ' '=> array('insert'=>true, 'fun'=>'select_link'), array('insert'=>true, 'fun'=>'edit_link'), array('insert'=>true, 'fun'=>'del_link') @@ -194,141 +298,38 @@ $cols = array( if (!@$_REQUEST['popup']) { $cols[' '] = 'skip'; } - $table =& new_db_pager('branch_tbl', $sql, $cols, 'cust_branch'); $table->set_inactive_ctrl('cust_branch', 'branch_code'); -//$table->width = "85%"; 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); - -table_section(1); - -$_POST['email'] = ""; -if ($selected_id != -1) -{ - if ($Mode == 'Edit') { - - //editing an existing branch - $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"]; - $_POST['br_ref'] = $myrow["branch_ref"]; - $_POST['br_address'] = $myrow["br_address"]; - $_POST['br_post_address'] = $myrow["br_post_address"]; - $_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"]; - $_POST['disable_trans'] = $myrow['disable_trans']; - $_POST['default_location'] = $myrow["default_location"]; - $_POST['default_ship_via'] = $myrow['default_ship_via']; - $_POST['sales_account'] = $myrow["sales_account"]; - $_POST['sales_discount_account'] = $myrow['sales_discount_account']; - $_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) { - $_POST['br_name'] = $myrow["name"]; - $_POST['br_ref'] = $myrow["debtor_ref"]; - $_POST['contact_name'] = _('Main Branch'); - $_POST['br_address'] = $_POST['br_post_address'] = $myrow["address"]; - $_POST['email'] = $myrow['email']; - } - $_POST['branch_code'] = ""; - if (!isset($_POST['sales_account']) || !isset($_POST['sales_discount_account'])) - { - $company_record = get_company_prefs(); - - // We use the Item Sales Account as default! - // $_POST['sales_account'] = $company_record["default_sales_act"]; - $_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']; - - } - -} -hidden('selected_id', $selected_id); -hidden('branch_code'); -hidden('popup', @$_REQUEST['popup']); - -table_section_title(_("Name and Contact")); - -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, 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); - -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); - -locations_list_row(_("Default Inventory Location:"), 'default_location', null); - -shippers_list_row(_("Default Shipping Company:"), 'default_ship_via', null); - -tax_groups_list_row(_("Tax Group:"), 'tax_group_id', null); - -yesno_list_row(_("Disable this Branch:"), 'disable_trans', null); - -table_section(2); - -table_section_title(_("GL Accounts")); - -// 2006-06-14. Changed gl_al_accounts_list to have an optional all_option 'Use Item Sales Accounts' -gl_all_accounts_list_row(_("Sales Account:"), 'sales_account', null, false, false, true); - -gl_all_accounts_list_row(_("Sales Discount Account:"), 'sales_discount_account'); - -gl_all_accounts_list_row(_("Accounts Receivable Account:"), 'receivables_account'); - -gl_all_accounts_list_row(_("Prompt Payment Discount Account:"), 'payment_discount_account'); - -table_section_title(_("Addresses")); - -textarea_row(_("Mailing Address:"), 'br_post_address', null, 35, 4); - -textarea_row(_("Billing Address:"), 'br_address', null, 35, 4); - -textarea_row(_("General Notes:"), 'notes', null, 35, 4); - -end_outer_table(1); +tabbed_content_start('tabs', array( + 'settings' => array(_('&General settings'), $selected_id!=-1), + 'contacts' => array(_('&Contacts'), $selected_id!=-1), +// 'orders' => array('S&ales orders', $selected_id!=-1) // not implemented + )); + + switch (get_post('_tabs_sel')) { + default: + case 'settings': + branch_settings($selected_id, $num_branches); + break; + case 'contacts': + $contacts = new contacts('contacts', $selected_id, 'cust_branch'); + $contacts->show(); + break; + case 'orders': + }; + hidden('branch_code'); + hidden('selected_id', $selected_id); +br(); +tabbed_content_end(); -submit_add_or_update_center($selected_id == -1, '', 'both'); end_form(); -end_page(); +end_page(@$_REQUEST['popup']); -?>