X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=purchasing%2Fmanage%2Fsuppliers.php;h=2d92edc8ec3a748d11bdac909e89f9c17c411135;hb=8864b1ec0fd3321e510511ef22614bc36845540e;hp=9b657ffdb7375485379e5b3775d996ca05b8373b;hpb=f7c756dac5a70f01550b1fceb99c6858e232faf2;p=fa-stable.git

diff --git a/purchasing/manage/suppliers.php b/purchasing/manage/suppliers.php
index 9b657ffd..2d92edc8 100644
--- a/purchasing/manage/suppliers.php
+++ b/purchasing/manage/suppliers.php
@@ -1,13 +1,13 @@
 <?php
 /**********************************************************************
     Copyright (C) FrontAccounting, LLC.
-	Released under the terms of the GNU Affero General Public License,
-	AGPL, as published by the Free Software Foundation, either version 
-	3 of the License, or (at your option) any later version.
+	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/agpl-3.0.html>.
+    See the License here <http://www.gnu.org/licenses/gpl-3.0.html>.
 ***********************************************************************/
 $page_security=5;
 $path_to_root="../..";
@@ -62,7 +62,7 @@ if (isset($_POST['submit']))
                 contact=".db_escape($_POST['contact']) . ",
                 supp_account_no=".db_escape($_POST['supp_account_no']) . ",
                 bank_account=".db_escape($_POST['bank_account']) . ",
-                credit_limit=".db_escape($_POST['credit_limit']) . ",
+                credit_limit=".input_num('credit_limit', 0) . ",
                 dimension_id=".db_escape($_POST['dimension_id']) . ",
                 dimension2_id=".db_escape($_POST['dimension2_id']) . ",
                 curr_code=".db_escape($_POST['curr_code']).",
@@ -74,6 +74,10 @@ if (isset($_POST['submit']))
 				tax_group_id=".db_escape($_POST['tax_group_id']) . " WHERE supplier_id = '" . $_POST['supplier_id'] . "'";
 
 			db_query($sql,"The supplier could not be updated");
+			update_record_status($_POST['supplier_id'], $_POST['inactive'],
+				'suppliers', 'supplier_id');
+
+			$Ajax->activate('supplier_id'); // in case of status change
 			display_notification(_("Supplier has been updated."));
 		} 
 		else 
@@ -163,9 +167,16 @@ if (db_has_suppliers())
 {
 	start_table("", 3);
 //	start_table("class = 'tablestyle_noborder'");
-	supplier_list_row(_("Select a supplier: "), 'supplier_id', null,
-		  _('New supplier'), true);
+	start_row();
+	supplier_list_cells(_("Select a supplier: "), 'supplier_id', null,
+		  _('New supplier'), 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('supplier_id');
+		set_focus('supplier_id');
+	}
 } 
 else 
 {
@@ -196,13 +207,13 @@ if (!$new_supplier)
 	$_POST['dimension2_id']  = $myrow["dimension2_id"];
 	$_POST['curr_code']  = $myrow["curr_code"];
 	$_POST['payment_terms']  = $myrow["payment_terms"];
-	$_POST['credit_limit']  = $myrow["credit_limit"];
+	$_POST['credit_limit']  = price_format($myrow["credit_limit"]);
 	$_POST['tax_group_id'] = $myrow["tax_group_id"];
 	$_POST['payable_account']  = $myrow["payable_account"];
 	$_POST['purchase_account']  = $myrow["purchase_account"];
 	$_POST['payment_discount_account'] = $myrow["payment_discount_account"];
 	$_POST['notes']  = $myrow["notes"];
-
+ 	$_POST['inactive'] = $myrow["inactive"];
 } 
 else 
 {
@@ -213,13 +224,14 @@ else
 	$_POST['sales_type'] = -1;
 	$_POST['email'] = $_POST['phone'] = $_POST['fax'] = $_POST['gst_no'] = $_POST['contact'] = $_POST['bank_account'] = '';
 	$_POST['payment_terms']  = '';
-	$_POST['credit_limit']	= "";
+	$_POST['credit_limit']	= price_format(0);
 
 	$company_record = get_company_prefs();
 	$_POST['curr_code']  = $company_record["curr_default"];
 	$_POST['payable_account'] = $company_record["creditors_act"];
 	$_POST['purchase_account'] = $company_record["default_cogs_act"];
 	$_POST['payment_discount_account'] = $company_record['pyt_discount_act'];
+ 	$_POST['inactive'] = 0;
 }
 
 table_section_title(_("Name and Contact"));
@@ -232,7 +244,7 @@ text_row(_("Fax Number:"), 'fax', null, 42, 40);
 
 email_row(_("E-mail:"), 'email', null, 35, 55);
 link_row(_("Website:"), 'website', null, 35, 55);
-text_row(_("Supplier Account No.:"), 'supp_account_no', null, 42, 40);
+text_row(_("Our Customer No:"), 'supp_account_no', null, 42, 40);
 
 table_section_title(_("Addresses"));
 textarea_row(_("Mailing Address:"), 'address', null, 35, 5);
@@ -281,6 +293,7 @@ if ($dim < 2)
 	hidden('dimension2_id', 0);
 table_section_title(_("General"));
 textarea_row(_("General Notes:"), 'notes', null, 35, 5);
+record_status_list_row(_("Supplier status:"), 'inactive');
 
 end_outer_table(1);
 
@@ -288,14 +301,14 @@ div_start('controls');
 if (!$new_supplier) 
 {
 	submit_center_first('submit', _("Update Supplier"), 
-	  _('Update supplier data'), true);
-	submit_return('select', _("Return"), _("Select this supplier and return to document entry."), true);
+	  _('Update supplier data'), 'default');
+	submit_return('select', _("Return"), _("Select this supplier and return to document entry."), 'cancel');
 	submit_center_last('delete', _("Delete Supplier"), 
 	  _('Delete supplier data if have been never used'), true);
 }
 else 
 {
-	submit_center('submit', _("Add New Supplier Details"), true, '', true);
+	submit_center('submit', _("Add New Supplier Details"), true, '', 'default');
 }
 div_end();
 end_form();