X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=purchasing%2Fmanage%2Fsuppliers.php;h=6a9f3c13be7b9597d94b05e13a5bff93af8dbfaa;hb=fbea22f48cf57c2215076d5c2b84085227ffe0b5;hp=5ab0ea8f00b19c54d4f2616dc9661a63f4ac712a;hpb=d6b7049a37ea1e91a9b17099ea25e06e3347d904;p=fa-stable.git

diff --git a/purchasing/manage/suppliers.php b/purchasing/manage/suppliers.php
index 5ab0ea8f..6a9f3c13 100644
--- a/purchasing/manage/suppliers.php
+++ b/purchasing/manage/suppliers.php
@@ -12,6 +12,10 @@ include($path_to_root . "/includes/ui.inc");
 
 check_db_has_tax_groups(_("There are no tax groups defined in the system. At least one tax group is required before proceeding."));
 
+if (isset($_GET['supplier_id'])) 
+{
+	$_POST['supplier_id'] = $_GET['supplier_id'];
+}
 $new_supplier = get_post('supplier_id') == ''; 
 
 if (isset($_POST['submit'])) 
@@ -40,8 +44,14 @@ if (isset($_POST['submit']))
 
 			$sql = "UPDATE ".TB_PREF."suppliers SET supp_name=".db_escape($_POST['supp_name']) . ",
                 address=".db_escape($_POST['address']) . ",
+                supp_address=".db_escape($_POST['supp_address']) . ",
+                phone=".db_escape($_POST['phone']) . ",
+                fax=".db_escape($_POST['fax']) . ",
+                gst_no=".db_escape($_POST['gst_no']) . ",
                 email=".db_escape($_POST['email']) . ",
+                contact=".db_escape($_POST['contact']) . ",
                 bank_account=".db_escape($_POST['bank_account']) . ",
+                credit_limit=".db_escape($_POST['credit_limit']) . ",
                 dimension_id=".db_escape($_POST['dimension_id']) . ",
                 dimension2_id=".db_escape($_POST['dimension2_id']) . ",
                 curr_code=".db_escape($_POST['curr_code']).",
@@ -57,12 +67,19 @@ if (isset($_POST['submit']))
 		else 
 		{
 
-			$sql = "INSERT INTO ".TB_PREF."suppliers (supp_name, address, email, bank_account, dimension_id, dimension2_id, curr_code,
+			$sql = "INSERT INTO ".TB_PREF."suppliers (supp_name, address, supp_address, phone, fax, gst_no, email, 
+				contact, bank_account, credit_limit, dimension_id, dimension2_id, curr_code,
 				payment_terms, payable_account, purchase_account, payment_discount_account, tax_group_id)
 				VALUES (".db_escape($_POST['supp_name']). ", "
 				.db_escape($_POST['address']) . ", "
+				.db_escape($_POST['supp_address']) . ", "
+				.db_escape($_POST['phone']). ", "
+				.db_escape($_POST['fax']). ", "
+				.db_escape($_POST['gst_no']). ", "
 				.db_escape($_POST['email']). ", "
+				.db_escape($_POST['contact']). ", "
 				.db_escape($_POST['bank_account']). ", "
+				.db_escape($_POST['credit_limit']). ", "
 				.db_escape($_POST['dimension_id']). ", "
 				.db_escape($_POST['dimension2_id']). ", "
 				.db_escape($_POST['curr_code']). ", "
@@ -120,6 +137,10 @@ elseif (isset($_POST['delete']) && $_POST['delete'] != "")
 		$Ajax->activate('_page_body');
 	} //end if Delete supplier
 }
+elseif (isset($_POST['select']))
+{
+	context_return(array('supplier_id' => $_POST['supplier_id']));
+}
 
 start_form();
 
@@ -148,12 +169,18 @@ if (!$new_supplier)
 
 	$_POST['supp_name'] = $myrow["supp_name"];
 	$_POST['address']  = $myrow["address"];
+	$_POST['supp_address']  = $myrow["supp_address"];
+	$_POST['phone']  = $myrow["phone"];
+	$_POST['fax']  = $myrow["fax"];
+	$_POST['gst_no']  = $myrow["gst_no"];
 	$_POST['email']  = $myrow["email"];
+	$_POST['contact']  = $myrow["contact"];
 	$_POST['bank_account']  = $myrow["bank_account"];
 	$_POST['dimension_id']  = $myrow["dimension_id"];
 	$_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['tax_group_id'] = $myrow["tax_group_id"];
 	$_POST['payable_account']  = $myrow["payable_account"];
 	$_POST['purchase_account']  = $myrow["purchase_account"];
@@ -162,13 +189,13 @@ if (!$new_supplier)
 } 
 else 
 {
-	$_POST['supp_name'] = $_POST['address'] = $_POST['tax_group_id']  = '';
+	$_POST['supp_name'] = $_POST['address'] = $_POST['supp_address'] = $_POST['tax_group_id']  = '';
 	$_POST['dimension_id'] = 0;
 	$_POST['dimension2_id'] = 0;
 	$_POST['sales_type'] = -1;
-	$_POST['email'] = $_POST['bank_account'] = '';
+	$_POST['email'] = $_POST['phone'] = $_POST['fax'] = $_POST['gst_no'] = $_POST['contact'] = $_POST['bank_account'] = '';
 	$_POST['payment_terms']  = '';
-	$_POST['credit_limit']	= price_format(sys_prefs::default_credit_limit());
+	$_POST['credit_limit']	= "";
 
 	$company_record = get_company_prefs();
 	$_POST['curr_code']  = $company_record["curr_default"];
@@ -178,10 +205,15 @@ else
 }
 
 text_row(_("Supplier Name:"), 'supp_name', null, 42, 40);
-textarea_row(_("Address:"), 'address', null, 35, 5);
+textarea_row(_("Postal ddress:"), 'address', null, 35, 5);
+textarea_row(_("Physical Address:"), 'supp_address', null, 35, 5);
+text_row(_("Phone:"), 'phone', null, 42, 40);
+text_row(_("Fax:"), 'fax', null, 42, 40);
+text_row(_("GSTNo:"), 'gst_no', null, 42, 40);
 text_row(_("Email:"), 'email', null, 42, 40);
-text_row(_("Bank Account:"), 'bank_account', null, 42, 40);
-
+text_row(_("Contact:"), 'contact', null, 42, 40);
+text_row(_("Bank Name/Account:"), 'bank_account', null, 42, 40);
+amount_row(_("Credit Limit:"), 'credit_limit', null);
 // Sherifoz 23.09.03 currency can't be changed if editing
 if (!$new_supplier) 
 {
@@ -225,6 +257,7 @@ 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);
 	submit_center_last('delete', _("Delete Supplier"), 
 	  _('Delete supplier data if have been never used'), true);
 }