Merged changes up to 2.3.16 into unstable

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

diff --git a/sales/manage/customers.php b/sales/manage/customers.php
index d8b85dfdb2e7dc8b4623bcd91658ec4fcf69dae6..9396aa9137e3712d3a5b28d9470e347358137b17 100644 (file)
--- a/sales/manage/customers.php
+++ b/sales/manage/customers.php
@@ -12,8 +12,15 @@
 $page_security = 'SA_CUSTOMER';
 $path_to_root = "../..";
 
+include_once($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");
@@ -106,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();
         
@@ -118,6 +125,10 @@ function handle_submit(&$selected_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');
        }
 }
@@ -234,18 +245,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 +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);
 
@@ -287,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);
        }
@@ -335,12 +337,14 @@ 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'), $selected_id),
+               'orders' => array(_('Sales &Orders'), $selected_id),
        ));
        
        switch (get_post('_tabs_sel')) {
@@ -352,13 +356,20 @@ tabbed_content_start('tabs', array(
                        $contacts = new contacts('contacts', $selected_id, 'customer');
                        $contacts->show();
                        break;
+               case 'transactions':
+                       $_GET['customer_id'] = $selected_id;
+                       include_once($path_to_root."/sales/inquiry/customer_inquiry.php");
+                       break;
                case 'orders':
+                       $_GET['customer_id'] = $selected_id;
+                       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']);
 
 ?>