X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=sales%2Fmanage%2Fcustomers.php;h=9396aa9137e3712d3a5b28d9470e347358137b17;hb=53d942f2a0d20cce5e9c409c6485867ce0869e4d;hp=0a11de23aed9a547cd2f6d337fc136c58e1954cb;hpb=44297f666389bc9b18c1b3739e5cab6cb5da7852;p=fa-stable.git

diff --git a/sales/manage/customers.php b/sales/manage/customers.php
index 0a11de23..9396aa91 100644
--- a/sales/manage/customers.php
+++ b/sales/manage/customers.php
@@ -12,10 +12,14 @@
 $page_security = 'SA_CUSTOMER';
 $path_to_root = "../..";
 
+include_once($path_to_root . "/includes/db_pager.inc");
 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");
@@ -109,7 +113,7 @@ 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();
         
@@ -249,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);
 
@@ -283,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);
 	}
@@ -331,7 +337,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(
@@ -352,14 +358,10 @@ tabbed_content_start('tabs', array(
 			break;
 		case 'transactions':
 			$_GET['customer_id'] = $selected_id;
-			$_GET['popup'] = 1;
-			$_SERVER['REQUEST_METHOD'] = 'GET';			
 			include_once($path_to_root."/sales/inquiry/customer_inquiry.php");
 			break;
 		case 'orders':
 			$_GET['customer_id'] = $selected_id;
-			$_GET['popup'] = 1;
-			$_SERVER['REQUEST_METHOD'] = 'GET';			
 			include_once($path_to_root."/sales/inquiry/sales_orders_view.php");
 			break;
 	};
@@ -368,6 +370,6 @@ tabbed_content_end();
 
 hidden('popup', @$_REQUEST['popup']);
 end_form();
-end_page();
+end_page(@$_REQUEST['popup']);
 
 ?>