X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=purchasing%2Fmanage%2Fsuppliers.php;h=fb2a05948f277a9ee449ffc997bc455667784b6e;hb=f894cd3d6fd2f6875382e5cd33020fb14245aa90;hp=3ac981fec411176331a9ca63434ff2a3d0a7c234;hpb=f12dbe7523bb1abc6cd69b009ef8f0be838f5348;p=fa-stable.git

diff --git a/purchasing/manage/suppliers.php b/purchasing/manage/suppliers.php
index 3ac981fe..fb2a0594 100644
--- a/purchasing/manage/suppliers.php
+++ b/purchasing/manage/suppliers.php
@@ -1,5 +1,14 @@
 <?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.
+    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>.
+***********************************************************************/
 $page_security=5;
 $path_to_root="../..";
 include($path_to_root . "/includes/session.inc");
@@ -44,8 +53,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']).",
@@ -61,12 +76,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']). ", "
@@ -144,10 +166,9 @@ else
 	hidden('supplier_id', get_post('supplier_id'));
 }
 
-//start_table("class='tablestyle2'", 0, 3);
-start_table("class='tablestyle'", 3);
+start_outer_table($table_style2, 5);
 
-table_section_title(_("Supplier"));
+table_section(1);
 
 if (!$new_supplier) 
 {
@@ -156,12 +177,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"];
@@ -170,13 +197,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"];
@@ -185,12 +212,26 @@ else
 	$_POST['payment_discount_account'] = $company_record['pyt_discount_act'];
 }
 
+table_section_title(_("Name and Contact"));
+
 text_row(_("Supplier Name:"), 'supp_name', null, 42, 40);
-textarea_row(_("Address:"), 'address', null, 35, 5);
-text_row(_("Email:"), 'email', null, 42, 40);
-text_row(_("Bank Account:"), 'bank_account', null, 42, 40);
+text_row(_("Contact Person:"), 'contact', null, 42, 40);
+
+text_row(_("Phone Number:"), 'phone', null, 42, 40);
+text_row(_("Fax Number:"), 'fax', null, 42, 40);
+
+email_row(_("E-mail:"), 'email', null, 35, 55);
 
-// Sherifoz 23.09.03 currency can't be changed if editing
+table_section_title(_("Addresses"));
+textarea_row(_("Mailing Address:"), 'address', null, 35, 5);
+textarea_row(_("Physical Address:"), 'supp_address', null, 35, 5);
+
+table_section(2);
+
+table_section_title(_("Purchasing"));
+text_row(_("GSTNo:"), 'gst_no', null, 42, 40);
+text_row(_("Bank Name/Account:"), 'bank_account', null, 42, 40);
+amount_row(_("Credit Limit:"), 'credit_limit', null);
 if (!$new_supplier) 
 {
 	label_row(_("Supplier's Currency:"), $_POST['curr_code']);
@@ -227,7 +268,8 @@ if ($dim < 1)
 if ($dim < 2)
 	hidden('dimension2_id', 0);
 
-end_table(1);
+end_outer_table(1);
+
 div_start('controls');
 if (!$new_supplier) 
 {