Ehen automatic creating a branch the contact is also created on the customer.

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

diff --git a/sales/manage/customers.php b/sales/manage/customers.php
index 8a1066be7fdbd84d34cdf8911df7c905a4d7bd7f..c66649676dd75e9db09961be893e6857ec5c7989 100644 (file)
--- a/sales/manage/customers.php
+++ b/sales/manage/customers.php
@@ -12,10 +12,14 @@
 $page_security = 'SA_CUSTOMER';
 $path_to_root = "../..";
 
+include($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();
         
@@ -117,6 +121,8 @@ function handle_submit(&$selected_id)
                                $_POST['phone'], $_POST['phone2'], $_POST['fax'], $_POST['email'], '', '');
 
                        add_crm_contact('cust_branch', 'general', $selected_branch, db_insert_id());
+
+                       add_crm_contact('customer', 'general', $selected_id, db_insert_id());
                }
                commit_transaction();
 
@@ -241,17 +247,7 @@ function customer_settings($selected_id)
        sales_types_list_row(_("Sales Type/Price List:"), 'sales_type', $_POST['sales_type']);
 
        if($selected_id)
-       {
                record_status_list_row(_("Customer status:"), 'inactive');
-               if (!@$_REQUEST['popup'])
-               {
-                       start_row();
-                       echo '<td class="label"> </td><td>';
-                       echo viewer_link('<b>'. _('Customer Transactions').'</b>', "sales/inquiry/customer_inquiry.php?customer_id=$selected_id&popup=1"); 
-                       echo "</td>\n"; 
-                       end_row();
-               }       
-       }
        elseif (isset($auto_create_branch) && $auto_create_branch == 1)
        {
                table_section_title(_("Branch"));
@@ -259,6 +255,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 +290,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,12 +339,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')) {
@@ -358,13 +358,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']);
 
 ?>