X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;ds=sidebyside;f=sales%2Fmanage%2Fcustomers.php;h=c81f78cbf710ebb1022d1faf143db8b6ebcc58ac;hb=3d95c6844745f183ebab970251cd254dd6cbdcec;hp=e1d36f23104e51ceed6c17623b771f89b87f7aea;hpb=e073ca0a69c2733fda71a0b0f2a23c8d3350b347;p=fa-stable.git diff --git a/sales/manage/customers.php b/sales/manage/customers.php index e1d36f23..c81f78cb 100644 --- a/sales/manage/customers.php +++ b/sales/manage/customers.php @@ -12,20 +12,21 @@ $page_security = 'SA_CUSTOMER'; $path_to_root = "../.."; -include($path_to_root . "/includes/db_pager.inc"); +include_once($path_to_root . "/includes/db_pager.inc"); include_once($path_to_root . "/includes/session.inc"); $js = ""; -if ($use_popup_windows) +if ($SysPrefs->use_popup_windows) $js .= get_js_open_window(900, 500); -if ($use_date_picker) +if (user_use_date_picker()) $js .= get_js_date_picker(); -page(_($help_context = "Customers"), @$_REQUEST['popup'], false, "", $js); +page(_($help_context = "Customers"), false, false, "", $js); include_once($path_to_root . "/includes/date_functions.inc"); include_once($path_to_root . "/includes/banking.inc"); include_once($path_to_root . "/includes/ui.inc"); include_once($path_to_root . "/includes/ui/contacts_view.inc"); +include_once($path_to_root . "/includes/ui/attachment.inc"); if (isset($_GET['debtor_no'])) { @@ -79,7 +80,7 @@ function can_process() function handle_submit(&$selected_id) { - global $path_to_root, $Ajax, $auto_create_branch; + global $path_to_root, $Ajax, $SysPrefs; if (!can_process()) return; @@ -108,25 +109,28 @@ function handle_submit(&$selected_id) $selected_id = $_POST['customer_id'] = db_insert_id(); - if (isset($auto_create_branch) && $auto_create_branch == 1) + if (isset($SysPrefs->auto_create_branch) && $SysPrefs->auto_create_branch == 1) { add_branch($selected_id, $_POST['CustName'], $_POST['cust_ref'], $_POST['address'], $_POST['salesman'], $_POST['area'], $_POST['tax_group_id'], '', get_company_pref('default_sales_discount_act'), get_company_pref('debtors_act'), get_company_pref('default_prompt_payment_act'), - $_POST['location'], $_POST['address'], 0, 0, get_company_pref('default_ship_via'), $_POST['notes']); + $_POST['location'], $_POST['address'], 0, $_POST['ship_via'], $_POST['notes'], $_POST['bank_account']); $selected_branch = db_insert_id(); - add_crm_person($_POST['CustName'], $_POST['cust_ref'], '', $_POST['address'], + add_crm_person($_POST['cust_ref'], $_POST['CustName'], '', $_POST['address'], $_POST['phone'], $_POST['phone2'], $_POST['fax'], $_POST['email'], '', ''); - add_crm_contact('cust_branch', 'general', $selected_branch, db_insert_id()); + $pers_id = db_insert_id(); + add_crm_contact('cust_branch', 'general', $selected_branch, $pers_id); + + add_crm_contact('customer', 'general', $selected_id, $pers_id); } commit_transaction(); display_notification(_("A new customer has been added.")); - if (isset($auto_create_branch) && $auto_create_branch == 1) + if (isset($SysPrefs->auto_create_branch) && $SysPrefs->auto_create_branch == 1) display_notification(_("A default Branch has been automatically created, please check default Branch values by using link below.")); $Ajax->activate('_page_body'); @@ -184,7 +188,7 @@ if (isset($_POST['delete'])) function customer_settings($selected_id) { - global $SysPrefs, $path_to_root, $auto_create_branch; + global $SysPrefs, $path_to_root, $page_nested; if (!$selected_id) { @@ -233,7 +237,8 @@ function customer_settings($selected_id) text_row(_("GSTNo:"), 'tax_id', null, 40, 40); - if (!$selected_id || is_new_customer($selected_id)) + if (!$selected_id || is_new_customer($selected_id) || (!key_in_foreign_table($selected_id, 'debtor_trans', 'debtor_no') && + !key_in_foreign_table($selected_id, 'sales_orders', 'debtor_no'))) { currencies_list_row(_("Customer's Currency:"), 'curr_code', $_POST['curr_code']); } @@ -246,14 +251,15 @@ function customer_settings($selected_id) if($selected_id) record_status_list_row(_("Customer status:"), 'inactive'); - elseif (isset($auto_create_branch) && $auto_create_branch == 1) + elseif (isset($SysPrefs->auto_create_branch) && $SysPrefs->auto_create_branch == 1) { table_section_title(_("Branch")); text_row(_("Phone:"), '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); - locations_list_row(_("Default Inventory Location:"), 'location'); + text_row(_("Bank Account Number:"), 'bank_account', null, 30, 60); + sales_persons_list_row( _("Sales Person:"), 'salesman', null); } table_section(2); @@ -279,30 +285,32 @@ function customer_settings($selected_id) start_row(); echo '