X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=sales%2Fmanage%2Fcustomers.php;h=6515b8af9624371435d1cc13b82ed522ac4d4ad8;hb=fbf51ab0febfd0885620abcab8738339d156ff45;hp=69422a8c0b6bd6127a78d8e0918edb49dfe68756;hpb=0633c80c829ea9dce559043806ec82982696c661;p=fa-stable.git

diff --git a/sales/manage/customers.php b/sales/manage/customers.php
index 69422a8c..6515b8af 100644
--- a/sales/manage/customers.php
+++ b/sales/manage/customers.php
@@ -12,7 +12,7 @@
 $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)
@@ -110,23 +110,20 @@ function handle_submit(&$selected_id)
          
 		if (isset($auto_create_branch) && $auto_create_branch == 1)
 		{
-			$result = get_item_locations(false);
-			$loc = db_fetch($result);
-			if ($loc === false)
-				$location = "";
-			else
-				$location = $loc['loc_code'];
         	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'),
-                $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();
 
@@ -239,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']);
 	} 
@@ -259,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);
 
@@ -293,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);
 	}
@@ -341,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(
@@ -362,12 +362,10 @@ tabbed_content_start('tabs', array(
 			break;
 		case 'transactions':
 			$_GET['customer_id'] = $selected_id;
-			$_GET['popup'] = 1;
 			include_once($path_to_root."/sales/inquiry/customer_inquiry.php");
 			break;
 		case 'orders':
 			$_GET['customer_id'] = $selected_id;
-			$_GET['popup'] = 1;
 			include_once($path_to_root."/sales/inquiry/sales_orders_view.php");
 			break;
 	};