Fixed contact record creation when new customer is added (reference/name were superse...

[fa-stable.git] / sales / manage / customers.php

diff --git a/sales/manage/customers.php b/sales/manage/customers.php
index 7df12402b17207d54156ec2cd320d0c3802a6068..511e8feab60b595e64a7034717f28876620b0cd3 100644 (file)
--- a/sales/manage/customers.php
+++ b/sales/manage/customers.php
@@ -17,6 +17,9 @@ include_once($path_to_root . "/includes/session.inc");
 $js = "";
 if ($use_popup_windows)
        $js .= get_js_open_window(900, 500);
+if ($use_date_picker)
+       $js .= get_js_date_picker();
+       
 page(_($help_context = "Customers"), @$_REQUEST['popup'], false, "", $js); 
 
 include_once($path_to_root . "/includes/date_functions.inc");
@@ -110,14 +113,17 @@ function handle_submit(&$selected_id)
                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'),
-                get_company_pref('default location'), $_POST['address'], 0, 0, get_company_pref('default_ship_via'), $_POST['notes']);
+                $_POST['location'], $_POST['address'], 0, 0, $_POST['ship_via'], $_POST['notes']);
                 
                $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();
 
@@ -230,7 +236,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']);
        } 
@@ -250,6 +257,7 @@ function customer_settings($selected_id)
                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);
+               sales_persons_list_row( _("Sales Person:"), 'salesman', null);
        }
        table_section(2);
 
@@ -284,7 +292,8 @@ function customer_settings($selected_id)
        if (!$selected_id && isset($auto_create_branch) && $auto_create_branch == 1)
        {
                table_section_title(_("Branch"));
-               sales_persons_list_row( _("Sales Person:"), 'salesman', null);
+               locations_list_row(_("Default Inventory Location:"), 'location');
+               shippers_list_row(_("Default Shipping Company:"), 'ship_via');
                sales_areas_list_row( _("Sales Area:"), 'area', null);
                tax_groups_list_row(_("Tax Group:"), 'tax_group_id', null);
        }
@@ -332,7 +341,7 @@ else
        hidden('customer_id');
 }
 
-if (!$selected_id)
+if (!$selected_id || list_updated('customer_id'))
        unset($_POST['_tabs_sel']); // force settings tab for new customer
 
 tabbed_content_start('tabs', array(
@@ -367,6 +376,6 @@ tabbed_content_end();
 
 hidden('popup', @$_REQUEST['popup']);
 end_form();
-end_page();
+end_page(@$_REQUEST['popup']);
 
 ?>