X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=sales%2Fmanage%2Fcustomer_branches.php;h=1147dcf36fdcb40d14b9600ad30ed59557a7d932;hb=95303d7b5280820af76ddbd8908b120813f1e763;hp=a9345a0f6af1e2d384e1cce9b86cf77cad380441;hpb=72c7510d29d26a0ede9cc23ad052b0ed156b1aaf;p=fa-stable.git

diff --git a/sales/manage/customer_branches.php b/sales/manage/customer_branches.php
index a9345a0f..1147dcf3 100644
--- a/sales/manage/customer_branches.php
+++ b/sales/manage/customer_branches.php
@@ -1,10 +1,19 @@
 <?php
-
+/**********************************************************************
+    Copyright (C) FrontAccounting, LLC.
+	Released under the terms of the GNU General Public License, GPL, 
+	as published by the Free Software Foundation, either version 3 
+	of the License, or (at your option) any later version.
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  
+    See the License here <http://www.gnu.org/licenses/gpl-3.0.html>.
+***********************************************************************/
 $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");
 
@@ -31,17 +40,11 @@ $_POST['branch_code'] = $selected_id;
 
 if (isset($_GET['SelectedBranch']))
 {
-	$_POST['branch_code'] = strtoupper($_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
+	$br = get_branch($_GET['SelectedBranch']);
+	$_POST['customer_id'] = $br['debtor_no'];
+	$selected_id = $_POST['branch_code'] = $br['branch_code'];
+	$Mode = 'Edit';
 }
-
 //-----------------------------------------------------------------------------------------------
 
 if ($Mode=='ADD_ITEM' || $Mode=='UPDATE_ITEM')
@@ -59,6 +62,13 @@ if ($Mode=='ADD_ITEM' || $Mode=='UPDATE_ITEM')
 		set_focus('br_name');
 	}
 
+	if (strlen($_POST['br_ref']) == 0)
+	{
+		$input_error = 1;
+		display_error(_("The Branch short name cannot be empty."));
+		set_focus('br_ref');
+	}
+
 	if ($input_error != 1)
 	{
 
@@ -67,6 +77,7 @@ if ($Mode=='ADD_ITEM' || $Mode=='UPDATE_ITEM')
 			/*SelectedBranch could also exist if submit had not been clicked this code would not run in this case cos submit is false of course see the 	delete code below*/
 
 			$sql = "UPDATE ".TB_PREF."cust_branch SET br_name = " . db_escape($_POST['br_name']) . ",
+				branch_ref = " . db_escape($_POST['br_ref']) . ",
 				br_address = ".db_escape($_POST['br_address']). ",
     	        phone=".db_escape($_POST['phone']). ",
     	        fax=".db_escape($_POST['fax']).",
@@ -92,11 +103,12 @@ if ($Mode=='ADD_ITEM' || $Mode=='UPDATE_ITEM')
 		else
 		{
 			/*Selected branch is null cos no item selected on first time round so must be adding a	record must be submitting new entries in the new Customer Branches form */
-			$sql = "INSERT INTO ".TB_PREF."cust_branch (debtor_no, br_name, br_address,
+			$sql = "INSERT INTO ".TB_PREF."cust_branch (debtor_no, br_name, branch_ref, br_address,
 				salesman, phone, fax,
 				contact_name, area, email, tax_group_id, sales_account, receivables_account, payment_discount_account, sales_discount_account, default_location,
 				br_post_address, disable_trans, group_no, default_ship_via)
 				VALUES (".db_escape($_POST['customer_id']). ",".db_escape($_POST['br_name']) . ", "
+					.db_escape($_POST['br_ref']) . ", "
 					.db_escape($_POST['br_address']) . ", ".db_escape($_POST['salesman']) . ", "
 					.db_escape($_POST['phone']) . ", ".db_escape($_POST['fax']) . ","
 					.db_escape($_POST['contact_name']) . ", ".db_escape($_POST['area']) . ","
@@ -113,11 +125,14 @@ if ($Mode=='ADD_ITEM' || $Mode=='UPDATE_ITEM')
 
 			$note = _('New customer branch has been added');
 		}
-
 		//run the sql from either of the above possibilites
 		db_query($sql,"The branch record could not be inserted or updated");
 		display_notification($note);
 		$Mode = 'RESET';
+		if (@$_REQUEST['popup']) {
+			set_focus("Select".($_POST['branch_code'] == -1 
+				? db_insert_id(): $_POST['branch_code']));
+		}
 	}
 
 }
@@ -159,7 +174,9 @@ if ($Mode == 'RESET' || get_post('_customer_id_update'))
 {
 	$selected_id = -1;
 	$cust_id = $_POST['customer_id'];
+	$inact = get_post('show_inactive');
 	unset($_POST);
+	$_POST['show_inactive'] = $inact;
 	$_POST['customer_id'] = $cust_id;
 	$Ajax->activate('_page_body');
 }
@@ -167,7 +184,7 @@ start_form();
 
 echo "<center>" . _("Select a customer: ") . "&nbsp;&nbsp;";
 customer_list('customer_id', null, false, true);
-echo "</center><br><br>";
+echo "</center><br>";
 
 $num_branches = db_customer_has_branches($_POST['customer_id']);
 
@@ -182,45 +199,51 @@ if ($num_branches)
 		AND ".TB_PREF."cust_branch.salesman=".TB_PREF."salesman.salesman_code
 		AND ".TB_PREF."cust_branch.debtor_no = '" . $_POST['customer_id']. "'";
 
+	if (!check_value('show_inactive')) $sql .= " AND !".TB_PREF."cust_branch.inactive";
+
 	$result = db_query($sql,"could not get customer branches");
 
 	start_table("$table_style width=60%");
 
-	$th = array(_("Name"), _("Contact"), _("Sales Person"), _("Area"),
+	$th = array(_("Short Name"), _("Name"), _("Contact"), _("Sales Person"), _("Area"),
 		_("Phone No"), _("Fax No"), _("E-mail"), _("Tax Group"), "", "");
-	if (count($_SESSION['Context'])) $th[] = '';
+	inactive_control_column($th);
+	if (@$_REQUEST['popup']) $th[] = '';
+
 	table_header($th);
 
 	while ($myrow = db_fetch($result))
 	{
 		start_row();
+		label_cell($myrow["branch_ref"]);
 		label_cell($myrow["br_name"]);
 		label_cell($myrow["contact_name"]);
 		label_cell($myrow["salesman_name"]);
 		label_cell($myrow["description"]);
 		label_cell($myrow["phone"]);
 		label_cell($myrow["fax"]);
-		label_cell("<a href=mailto:" . $myrow["email"]. ">" . $myrow["email"]. "</a>");
+		email_cell($myrow["email"]);
 		label_cell($myrow["tax_group_name"]);
-		if (count($_SESSION['Context']))
- 			edit_button_cell("Select".$myrow["branch_code"], _("Select"));
+		inactive_control_cell($myrow["branch_code"], $myrow["inactive"],
+			'cust_branch', 'branch_code');
+		if (@$_REQUEST['popup'])
+ 			select_button_cell("Select".$myrow["branch_code"], $myrow["branch_code"], '');
  		edit_button_cell("Edit".$myrow["branch_code"], _("Edit"));
- 		edit_button_cell("Delete".$myrow["branch_code"], _("Delete"));
+ 		delete_button_cell("Delete".$myrow["branch_code"], _("Delete"));
 		end_row();
 	}
-	end_table();
+	inactive_control_row($th);
+	end_table(1);
 	//END WHILE LIST LOOP
 }
 else
 	display_note(_("The selected customer does not have any branches. Please create at least one branch."));
 
-echo "<br>";
-start_table("$table_style2 width=60%", 5);
-echo "<tr valign=top><td>"; // outer table
-
-echo "<table>";
+start_outer_table($table_style2, 5);
 
+table_section(1);
 
+$_POST['email'] = "";
 if ($selected_id != -1)
 {
  	if ($Mode == 'Edit') {
@@ -234,6 +257,7 @@ if ($selected_id != -1)
 		set_focus('br_name');
     	$_POST['branch_code'] = $myrow["branch_code"];
 	    $_POST['br_name']  = $myrow["br_name"];
+	    $_POST['br_ref']  = $myrow["branch_ref"];
 	    $_POST['br_address']  = $myrow["br_address"];
 	    $_POST['br_post_address']  = $myrow["br_post_address"];
 	    $_POST['contact_name'] = $myrow["contact_name"];
@@ -261,6 +285,7 @@ elseif ($Mode != 'ADD_ITEM')
 		$result = db_query($sql,"check failed");
 		$myrow = db_fetch($result);
 		$_POST['br_name'] = $myrow["name"];
+		$_POST['br_ref'] = $myrow["cust_ref"];
 		$_POST['contact_name'] = _('Main Branch');
 		$_POST['br_address'] = $_POST['br_post_address'] = $myrow["address"];
 		$_POST['email'] = $myrow['email'];
@@ -282,16 +307,18 @@ elseif ($Mode != 'ADD_ITEM')
 }
 hidden('selected_id', $selected_id);
 hidden('branch_code');
+hidden('popup', @$_REQUEST['popup']);
 
 table_section_title(_("Name and Contact"));
 
 text_row(_("Branch Name:"), 'br_name', null, 35, 40);
+text_row(_("Branch Short Name:"), 'br_ref', null, 30, 30);
 text_row(_("Contact Person:"), 'contact_name', null, 35, 40);
 
 text_row(_("Phone Number:"), 'phone', null, 20, 20);
 text_row(_("Fax Number:"), 'fax', null, 20, 20);
 
-text_row("<a href='Mailto:'>" . _("E-mail:") . "</a>", 'email', null, 35, 55);
+email_row(_("E-mail:"), 'email', null, 35, 55);
 
 table_section_title(_("Sales"));
 
@@ -299,6 +326,8 @@ sales_persons_list_row( _("Sales Person:"), 'salesman', null);
 
 sales_areas_list_row( _("Sales Area:"), 'area', null);
 
+sales_groups_list_row(_("Sales Group:"), 'group_no', null, true);
+
 locations_list_row(_("Default Inventory Location:"), 'default_location', null);
 
 shippers_list_row(_("Default Shipping Company:"), 'default_ship_via', null);
@@ -307,18 +336,12 @@ tax_groups_list_row(_("Tax Group:"), 'tax_group_id', null);
 
 yesno_list_row(_("Disable this Branch:"), 'disable_trans', null);
 
-sales_groups_list_row(_("Sales Group:"), 'group_no', null, true);
-
-echo "</table>";
-
-echo "</td><td  class='tableseparator'>"; // outer table
-
-echo"<table>";
+table_section(2);
 
 table_section_title(_("GL Accounts"));
 
 // 2006-06-14. Changed gl_al_accounts_list to have an optional all_option 'Use Item Sales Accounts'
-gl_all_accounts_list_row(_("Sales Account:"), 'sales_account', null, false,	false, false, true);
+gl_all_accounts_list_row(_("Sales Account:"), 'sales_account', null, false, false, true);
 
 gl_all_accounts_list_row(_("Sales Discount Account:"), 'sales_discount_account');
 
@@ -332,11 +355,9 @@ textarea_row(_("Mailing Address:"), 'br_post_address', null, 35, 5);
 
 textarea_row(_("Billing Address:"), 'br_address', null, 35, 5);
 
-end_table();
-
-end_table(1); // outer table
+end_outer_table(1);
 
-submit_add_or_update_center($selected_id == -1, '', true);
+submit_add_or_update_center($selected_id == -1, '', 'both');
 
 end_form();