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

diff --git a/sales/manage/customer_branches.php b/sales/manage/customer_branches.php
index a9345a0f..25bd3915 100644
--- a/sales/manage/customer_branches.php
+++ b/sales/manage/customer_branches.php
@@ -1,5 +1,14 @@
 <?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");
@@ -159,7 +168,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 +178,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,13 +193,17 @@ 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"),
 		_("Phone No"), _("Fax No"), _("E-mail"), _("Tax Group"), "", "");
+	inactive_control_column($th);
 	if (count($_SESSION['Context'])) $th[] = '';
+
 	table_header($th);
 
 	while ($myrow = db_fetch($result))
@@ -200,27 +215,28 @@ if ($num_branches)
 		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"]);
+		inactive_control_cell($myrow["branch_code"], $myrow["inactive"],
+			'cust_branch', 'branch_code');
 		if (count($_SESSION['Context']))
- 			edit_button_cell("Select".$myrow["branch_code"], _("Select"));
+ 			button_cell("Select".$myrow["branch_code"], _("Select"), '', ICON_ADD);
  		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') {
@@ -291,7 +307,7 @@ 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 +315,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 +325,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 +344,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();