X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=sales%2Fmanage%2Fcustomers.php;h=e5ea837ab7228c08f75c2ca6d5efe089d31f4017;hb=f58466eea31b624deacaf5e5cd4b9de7995e0373;hp=16581f55f2d5dc5f774c38e21c523a27d51b20bc;hpb=8864b1ec0fd3321e510511ef22614bc36845540e;p=fa-stable.git

diff --git a/sales/manage/customers.php b/sales/manage/customers.php
index 16581f55..e5ea837a 100644
--- a/sales/manage/customers.php
+++ b/sales/manage/customers.php
@@ -13,7 +13,7 @@ $page_security = 3;
 $path_to_root="../..";
 
 include_once($path_to_root . "/includes/session.inc");
-page(_("Customers")); 
+page(_("Customers"), @$_REQUEST['popup']); 
 
 include_once($path_to_root . "/includes/date_functions.inc");
 include_once($path_to_root . "/includes/banking.inc");
@@ -127,13 +127,6 @@ if (isset($_POST['submit']))
 }
 //-------------------------------------------------------------------------------------------- 
 
-if (isset($_POST['select']))
-{
-	context_return(array('customer_id' => $_POST['customer_id'], 
-		'branch_id' => '')); // this fires customer history checks
-}
-//-------------------------------------------------------------------------------------------- 
-
 if (isset($_POST['delete'])) 
 {
 
@@ -294,8 +287,8 @@ if (!$new_customer)  {
 	start_row();
 	echo '<td>'._('Customer branches').':</td>';
   	hyperlink_params_td($path_to_root . "/sales/manage/customer_branches.php",
-		'<b>'. (count($_SESSION['Context']) ?  _("Select or &Add") : _("&Add or Edit ")).'</b>', 
-		"debtor_no=".$_POST['customer_id']);
+		'<b>'. (@$_REQUEST['popup'] ?  _("Select or &Add") : _("&Add or Edit ")).'</b>', 
+		"debtor_no=".$_POST['customer_id'].(@$_REQUEST['popup'] ? '&popup=1':''));
 	end_row();
 
 }
@@ -312,11 +305,12 @@ else
 {
 	submit_center_first('submit', _("Update Customer"), 
 	  _('Update customer data'), true);
-	submit_return('select', _("Return"), _("Select this customer and return to document entry."), 'default');
+	submit_return('select', get_post('customer_id'), _("Select this customer and return to document entry."));
 	submit_center_last('delete', _("Delete Customer"), 
 	  _('Delete customer data if have been never used'), true);
 }
 div_end();
+hidden('popup', @$_REQUEST['popup']);
 end_form();
 end_page();