X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=sales%2Fmanage%2Fcustomer_branches.php;h=69ecd9e4059e9845755d1ab6cc0165f9ccb79337;hb=fd59c60718609c1bf3240a303030167a4f1b1885;hp=bd3015695fb75677edb57449a700bba7b320d1e0;hpb=4e8581eb9ae1c83d9deaea66a9542e814132ad62;p=fa-stable.git

diff --git a/sales/manage/customer_branches.php b/sales/manage/customer_branches.php
index bd301569..69ecd9e4 100644
--- a/sales/manage/customer_branches.php
+++ b/sales/manage/customer_branches.php
@@ -35,6 +35,13 @@ if (isset($_GET['SelectedBranch']))
 	$selected_id = $_GET['SelectedBranch'];
 }
 
+$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')
@@ -49,6 +56,7 @@ if ($Mode=='ADD_ITEM' || $Mode=='UPDATE_ITEM')
 	{
 		$input_error = 1;
 		display_error(_("The Branch name cannot be empty."));
+		set_focus('br_name');
 	}
 
 	if ($input_error != 1)
@@ -178,6 +186,7 @@ if ($num_branches)
 
 	$th = array(_("Name"), _("Contact"), _("Sales Person"), _("Area"),
 		_("Phone No"), _("Fax No"), _("E-mail"), _("Tax Group"), "", "");
+	if (count($_SESSION['Context'])) $th[] = '';
 	table_header($th);
 
 	while ($myrow = db_fetch($result))
@@ -191,6 +200,8 @@ if ($num_branches)
 		label_cell($myrow["fax"]);
 		label_cell("<a href=mailto:" . $myrow["email"]. ">" . $myrow["email"]. "</a>");
 		label_cell($myrow["tax_group_name"]);
+		if (count($_SESSION['Context']))
+ 			edit_button_cell("Select".$myrow["branch_code"], _("Select"));
  		edit_button_cell("Edit".$myrow["branch_code"], _("Edit"));
  		edit_button_cell("Delete".$myrow["branch_code"], _("Delete"));
 		end_row();
@@ -289,7 +300,7 @@ locations_list_row(_("Default Inventory Location:"), 'default_location', null);
 
 shippers_list_row(_("Default Shipping Company:"), 'default_ship_via', null);
 
-tax_groups_list_row(_("Tax Group:"), 'tax_group_id', null, 31, 30);
+tax_groups_list_row(_("Tax Group:"), 'tax_group_id', null);
 
 yesno_list_row(_("Disable this Branch:"), 'disable_trans', null);