X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=sales%2Fmanage%2Fcustomers.php;h=578fbc5205666d502bd3909de1011406e371579e;hb=47cdc160884d49ca90e9470a609cd42eac0a709e;hp=6eff21173c8a7934ae51924fa627a28516319982;hpb=72c7510d29d26a0ede9cc23ad052b0ed156b1aaf;p=fa-stable.git

diff --git a/sales/manage/customers.php b/sales/manage/customers.php
index 6eff2117..578fbc52 100644
--- a/sales/manage/customers.php
+++ b/sales/manage/customers.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="../..";
 
@@ -78,6 +87,11 @@ function handle_submit()
             WHERE debtor_no = '". $_POST['customer_id'] . "'";
 
 		db_query($sql,"The customer could not be updated");
+
+		update_record_status($_POST['customer_id'], $_POST['inactive'],
+			'debtors_master', 'debtor_no');
+
+		$Ajax->activate('customer_id'); // in case of status change
 		display_notification(_("Customer has been updated."));
 	} 
 	else 
@@ -180,21 +194,22 @@ start_form();
 if (db_has_customers()) 
 {
 	start_table("class = 'tablestyle_noborder'");
-	customer_list_row(_("Select a customer: "), 'customer_id', null,
-	  _('New customer'), true);
+	start_row();
+	customer_list_cells(_("Select a customer: "), 'customer_id', null,
+		_('New customer'), true, check_value('show_inactive'));
+	check_cells(_("Show inactive:"), 'show_inactive', null, true);
+	end_row();
 	end_table();
+	if (get_post('_show_inactive_update')) {
+		$Ajax->activate('customer_id');
+		set_focus('customer_id');
+	}
 } 
 else 
 {
 	hidden('customer_id');
 }
 
-start_table($table_style2, 7, 6);
-echo "<tr valign=top><td>"; // outer table	
-
-
-start_table("class='tablestyle_noborder'");	
-
 if ($new_customer) 
 {
 	$_POST['CustName'] = $_POST['address'] = $_POST['tax_id']  = '';
@@ -207,6 +222,7 @@ if ($new_customer)
 	$_POST['payment_terms']  = '';
 	$_POST['discount']  = $_POST['pymt_discount'] = percent_format(0);
 	$_POST['credit_limit']	= price_format(sys_prefs::default_credit_limit());
+	$_POST['inactive'] = 0;
 } 
 else 
 {
@@ -229,16 +245,20 @@ else
 	$_POST['discount']  = percent_format($myrow["discount"] * 100);
 	$_POST['pymt_discount']  = percent_format($myrow["pymt_discount"] * 100);
 	$_POST['credit_limit']	= price_format($myrow["credit_limit"]);
+	$_POST['inactive'] = $myrow["inactive"];
 }
 
-text_row(_("Customer Name:"), 'CustName', $_POST['CustName'], 40, 40);
+start_outer_table($table_style2, 5);
+table_section(1);
+table_section_title(_("Name and Address"));
+
+text_row(_("Customer Name:"), 'CustName', $_POST['CustName'], 40, 80);
 textarea_row(_("Address:"), 'address', $_POST['address'], 35, 5);
 
-text_row(_("Email:"), 'email', null, 40, 40);
+email_row(_("E-mail:"), 'email', null, 40, 40);
 text_row(_("GSTNo:"), 'tax_id', null, 40, 40);
 
 
-// Sherifoz 23.09.03 currency can't be changed if editing
 if ($new_customer) 
 {
 	currencies_list_row(_("Customer's Currency:"), 'curr_code', $_POST['curr_code']);
@@ -248,13 +268,18 @@ else
 	label_row(_("Customer's Currency:"), $_POST['curr_code']);
 	hidden('curr_code', $_POST['curr_code']);				
 }	
-end_table();
+sales_types_list_row(_("Sales Type/Price List:"), 'sales_type', $_POST['sales_type']);
 
-echo "</td><td class='tableseparator'>"; // outer table
+table_section(2);
 
-start_table("class='tablestyle_noborder'");	
+table_section_title(_("Sales"));
 
-sales_types_list_row(_("Sales Type/Price List:"), 'sales_type', $_POST['sales_type']);
+percent_row(_("Discount Percent:"), 'discount', $_POST['discount']);
+percent_row(_("Prompt Payment Discount Percent:"), 'pymt_discount', $_POST['pymt_discount']);
+amount_row(_("Credit Limit:"), 'credit_limit', $_POST['credit_limit']);
+
+payment_terms_list_row(_("Payment Terms:"), 'payment_terms', $_POST['payment_terms']);
+credit_status_list_row(_("Credit Status:"), 'credit_status', $_POST['credit_status']); 
 $dim = get_company_pref('use_dimension');
 if ($dim >= 1)
 	dimensions_list_row(_("Dimension")." 1:", 'dimension_id', $_POST['dimension_id'], true, " ", false, 1);
@@ -265,12 +290,6 @@ if ($dim < 1)
 if ($dim < 2)
 	hidden('dimension2_id', 0);
 
-percent_row(_("Discount Percent:"), 'discount', $_POST['discount']);
-percent_row(_("Prompt Payment Discount Percent:"), 'pymt_discount', $_POST['pymt_discount']);
-amount_row(_("Credit Limit:"), 'credit_limit', $_POST['credit_limit']);
-
-payment_terms_list_row(_("Payment Terms:"), 'payment_terms', $_POST['payment_terms']);
-credit_status_list_row(_("Credit Status:"), 'credit_status', $_POST['credit_status']); 
 if (!$new_customer)  {
 	start_row();
 	echo '<td>'._('Customer branches').':</td>';
@@ -278,20 +297,22 @@ if (!$new_customer)  {
 		'<b>'. (count($_SESSION['Context']) ?  _("Select or &Add") : _("&Add or Edit ")).'</b>', 
 		"debtor_no=".$_POST['customer_id']);
 	end_row();
+
 }
-end_table();
 
-end_table(1); // outer table	
+record_status_list_row(_("Customer status:"), 'inactive');
+end_outer_table(1);
+
 div_start('controls');
 if ($new_customer)
 {
-	submit_center('submit', _("Add New Customer"), true, '', true);
+	submit_center('submit', _("Add New Customer"), true, '', 'default');
 } 
 else 
 {
 	submit_center_first('submit', _("Update Customer"), 
 	  _('Update customer data'), true);
-	submit_return('select', _("Return"), _("Select this customer and return to document entry."), true);
+	submit_return('select', _("Return"), _("Select this customer and return to document entry."), 'default');
 	submit_center_last('delete', _("Delete Customer"), 
 	  _('Delete customer data if have been never used'), true);
 }