X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=sales%2Fmanage%2Fcustomers.php;h=87953187dd25869c18b6d0a5b2f03011d100df90;hb=ab6e80ccdc767b78bbb4a4a38190f16a77747feb;hp=16c73bc74690ee1d581d1db36de5d75188055cca;hpb=28e02ce39224c6107932e2c5e1b0ec13be90528f;p=fa-stable.git

diff --git a/sales/manage/customers.php b/sales/manage/customers.php
index 16c73bc7..87953187 100644
--- a/sales/manage/customers.php
+++ b/sales/manage/customers.php
@@ -12,8 +12,15 @@
 $page_security = 'SA_CUSTOMER';
 $path_to_root = "../..";
 
+include($path_to_root . "/includes/db_pager.inc");
 include_once($path_to_root . "/includes/session.inc");
-page(_($help_context = "Customers"), @$_REQUEST['popup']); 
+$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");
 include_once($path_to_root . "/includes/banking.inc");
@@ -72,7 +79,7 @@ function can_process()
 
 function handle_submit(&$selected_id)
 {
-	global $path_to_root, $Ajax;
+	global $path_to_root, $Ajax, $auto_create_branch;
 
 	if (!can_process())
 		return;
@@ -106,18 +113,25 @@ 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();
 
 		display_notification(_("A new customer has been added."));
+
+		if (isset($auto_create_branch) && $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');
 	}
 }
@@ -173,7 +187,7 @@ if (isset($_POST['delete']))
 
 function customer_settings($selected_id) 
 {
-	global $SysPrefs, $path_to_root;
+	global $SysPrefs, $path_to_root, $auto_create_branch;
 	
 	if (!$selected_id) 
 	{
@@ -222,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']);
 	} 
@@ -234,18 +249,7 @@ function customer_settings($selected_id)
 	sales_types_list_row(_("Sales Type/Price List:"), 'sales_type', $_POST['sales_type']);
 
 	if($selected_id)
-	{
-		if (!@$_REQUEST['popup'])
-		{
-			start_row();
-			echo '<td class="label">'._('Transactions').':</td>';
-	  		hyperlink_params_td($path_to_root . "/sales/inquiry/customer_inquiry.php",
-				'<b>'. _("Go to Customer Transactions").'</b>', 
-				"customer_id=".$selected_id);
-			end_row();
-		}	
 		record_status_list_row(_("Customer status:"), 'inactive');
-	}
 	elseif (isset($auto_create_branch) && $auto_create_branch == 1)
 	{
 		table_section_title(_("Branch"));
@@ -253,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);
 
@@ -287,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);
 	}
@@ -335,12 +341,15 @@ 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(
 		'settings' => array(_('&General settings'), $selected_id),
 		'contacts' => array(_('&Contacts'), $selected_id),
+		'transactions' => array(_('&Transactions'), 
+			($_SESSION["wa_current_user"]->can_access_page('SA_SALESTRANSVIEW') ? $selected_id : null)),
+		'orders' => array(_('Sales &Orders'), $selected_id),
 	));
 	
 	switch (get_post('_tabs_sel')) {
@@ -352,13 +361,22 @@ tabbed_content_start('tabs', array(
 			$contacts = new contacts('contacts', $selected_id, 'customer');
 			$contacts->show();
 			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;
 	};
 br();
 tabbed_content_end();
 
 hidden('popup', @$_REQUEST['popup']);
 end_form();
-end_page();
+end_page(@$_REQUEST['popup']);
 
 ?>