Cleanup in customers.php and customer_inquiry.php

diff --git a/sales/inquiry/customer_inquiry.php b/sales/inquiry/customer_inquiry.php
index 058c5fa17176f08839ca8bebe31e3cb2f401887b..d3fc6976de51e2e35103a385c475805eaff79e4e 100644 (file)
--- a/sales/inquiry/customer_inquiry.php
+++ b/sales/inquiry/customer_inquiry.php
@@ -41,7 +41,7 @@ if (!isset($_POST['customer_id']))
 start_table(TABLESTYLE_NOBORDER);\r
 start_row();\r
 \r
-customer_list_cells(_("Select a customer: "), 'customer_id', null, true, false, false, true);\r
+customer_list_cells(_("Select a customer: "), 'customer_id', null, true, false, false, !@$_REQUEST['popup']);\r
 \r
 date_cells(_("From:"), 'TransAfterDate', '', null, -30);\r
 date_cells(_("To:"), 'TransToDate', '', null, 1);\r
@@ -246,7 +246,9 @@ $table->width = "85%";
 \r
 display_db_pager($table);\r
 \r
+hidden('popup', @$_REQUEST['popup']);\r
 end_form();\r
-end_page();\r
+\r
+end_page(@$_REQUEST['popup'], false, false);\r
 \r
 ?>\r

diff --git a/sales/manage/customers.php b/sales/manage/customers.php
index d8b85dfdb2e7dc8b4623bcd91658ec4fcf69dae6..8a1066be7fdbd84d34cdf8911df7c905a4d7bd7f 100644 (file)
--- a/sales/manage/customers.php
+++ b/sales/manage/customers.php
@@ -13,7 +13,10 @@ $page_security = 'SA_CUSTOMER';
 $path_to_root = "../..";
 
 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 +121,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');
        }
 }
@@ -235,16 +242,15 @@ function customer_settings($selected_id)
 
        if($selected_id)
        {
+               record_status_list_row(_("Customer status:"), 'inactive');
                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);
+                       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();
                }       
-               record_status_list_row(_("Customer status:"), 'inactive');
        }
        elseif (isset($auto_create_branch) && $auto_create_branch == 1)
        {