X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=sales%2Fmanage%2Fcustomer_branches.php;h=e2a73af9007a1fd00426206f04598b0eade9b065;hb=f58466eea31b624deacaf5e5cd4b9de7995e0373;hp=25bd391543b3f5f677f438275cea64aa7d9af72e;hpb=2383d33373d6ddec06906658a0ed6398077c1147;p=fa-stable.git

diff --git a/sales/manage/customer_branches.php b/sales/manage/customer_branches.php
index 25bd3915..e2a73af9 100644
--- a/sales/manage/customer_branches.php
+++ b/sales/manage/customer_branches.php
@@ -13,7 +13,7 @@ $page_security = 3;
 $path_to_root="../..";
 include($path_to_root . "/includes/session.inc");
 
-page(_("Customer Branches"));
+page(_("Customer Branches"), @$_REQUEST['popup']);
 
 include($path_to_root . "/includes/ui.inc");
 
@@ -40,17 +40,11 @@ $_POST['branch_code'] = $selected_id;
 
 if (isset($_GET['SelectedBranch']))
 {
-	$_POST['branch_code'] = strtoupper($_GET['SelectedBranch']);
-	$selected_id = $_GET['SelectedBranch'];
+	$br = get_branch($_GET['SelectedBranch']);
+	$_POST['customer_id'] = $br['debtor_no'];
+	$selected_id = $_POST['branch_code'] = $br['branch_code'];
+	$Mode = 'Edit';
 }
-
-$id = find_submit('Select');
-if ($id != -1)
-{
-	context_return(array('customer_id' => $_POST['customer_id'],
-		'branch_id' => $id)); // return to sales document
-}
-
 //-----------------------------------------------------------------------------------------------
 
 if ($Mode=='ADD_ITEM' || $Mode=='UPDATE_ITEM')
@@ -202,7 +196,7 @@ if ($num_branches)
 	$th = array(_("Name"), _("Contact"), _("Sales Person"), _("Area"),
 		_("Phone No"), _("Fax No"), _("E-mail"), _("Tax Group"), "", "");
 	inactive_control_column($th);
-	if (count($_SESSION['Context'])) $th[] = '';
+	if (@$_REQUEST['popup']) $th[] = '';
 
 	table_header($th);
 
@@ -219,8 +213,8 @@ if ($num_branches)
 		label_cell($myrow["tax_group_name"]);
 		inactive_control_cell($myrow["branch_code"], $myrow["inactive"],
 			'cust_branch', 'branch_code');
-		if (count($_SESSION['Context']))
- 			button_cell("Select".$myrow["branch_code"], _("Select"), '', ICON_ADD);
+		if (@$_REQUEST['popup'])
+ 			select_button_cell("Select".$myrow["branch_code"], $myrow["branch_code"], '');
  		edit_button_cell("Edit".$myrow["branch_code"], _("Edit"));
  		delete_button_cell("Delete".$myrow["branch_code"], _("Delete"));
 		end_row();
@@ -298,6 +292,7 @@ elseif ($Mode != 'ADD_ITEM')
 }
 hidden('selected_id', $selected_id);
 hidden('branch_code');
+hidden('popup', @$_REQUEST['popup']);
 
 table_section_title(_("Name and Contact"));