Fixed Next bug for pagers in customers and suppliers transactions.

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

diff --git a/sales/manage/customers.php b/sales/manage/customers.php
index d8b85dfdb2e7dc8b4623bcd91658ec4fcf69dae6..7df12402b17207d54156ec2cd320d0c3802a6068 100644 (file)
--- a/sales/manage/customers.php
+++ b/sales/manage/customers.php
@@ -12,8 +12,12 @@
 $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);
+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");
@@ -118,6 +122,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 +242,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"));
@@ -341,6 +338,8 @@ if (!$selected_id)
 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,7 +351,16 @@ 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();