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

diff --git a/sales/manage/customers.php b/sales/manage/customers.php
index 69422a8c..31129418 100644
--- a/sales/manage/customers.php
+++ b/sales/manage/customers.php
@@ -110,16 +110,10 @@ 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();
         
@@ -259,6 +253,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 +288,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);
 	}