X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;ds=sidebyside;f=purchasing%2Fmanage%2Fsuppliers.php;h=e5da178a8ac6d52b3c6084650215e96df5f64dc3;hb=4052beb0e908e206956eee5b479de283173d1801;hp=a2c2b450b15a1e0dd001a9156cbc3eb4ab76c7ac;hpb=46c5f7a65a7659a44ae8254c63152074363d3987;p=fa-stable.git

diff --git a/purchasing/manage/suppliers.php b/purchasing/manage/suppliers.php
index a2c2b450..e5da178a 100644
--- a/purchasing/manage/suppliers.php
+++ b/purchasing/manage/suppliers.php
@@ -11,9 +11,15 @@
 ***********************************************************************/
 $page_security = 'SA_SUPPLIER';
 $path_to_root = "../..";
-include($path_to_root . "/includes/session.inc");
+include($path_to_root . "/includes/db_pager.inc");
+include_once($path_to_root . "/includes/session.inc");
+$js = "";
+if ($use_popup_windows)
+	$js .= get_js_open_window(900, 500);
+if ($use_date_picker)
+	$js .= get_js_date_picker();
 
-page(_($help_context = "Suppliers"), @$_REQUEST['popup']);
+page(_($help_context = "Suppliers"), @$_REQUEST['popup'], false, "", $js);
 
 include_once($path_to_root . "/includes/ui.inc");
 include_once($path_to_root . "/includes/ui/contacts_view.inc");
@@ -87,7 +93,8 @@ function supplier_settings(&$supplier_id)
 
 	text_row(_("GSTNo:"), 'gst_no', null, 42, 40);
 	link_row(_("Website:"), 'website', null, 35, 55);
-	if ($supplier_id && !is_new_supplier($supplier_id)) 
+	if ($supplier_id && !is_new_supplier($supplier_id) && (key_in_foreign_table($_POST['supplier_id'], 'supp_trans', 'supplier_id') ||
+		key_in_foreign_table($_POST['supplier_id'], 'purch_orders', 'supplier_id'))) 
 	{
 		label_row(_("Supplier's Currency:"), $_POST['curr_code']);
 		hidden('curr_code', $_POST['curr_code']);
@@ -99,15 +106,6 @@ function supplier_settings(&$supplier_id)
 	tax_groups_list_row(_("Tax Group:"), 'tax_group_id', null);
 	text_row(_("Our Customer No:"), 'supp_account_no', null, 42, 40);
 
-	if (!$supplier_id) {
-		table_section_title(_("Contact Data"));
-		text_row(_("Contact Person:"), 'contact', null, 42, 40);
-		text_row(_("Phone Number:"), 'phone', null, 32, 30);
-		text_row(_("Secondary Phone Number:"), 'phone2', null, 32, 30);
-		text_row(_("Fax Number:"), 'fax', null, 32, 30);
-		email_row(_("E-mail:"), 'email', null, 35, 55);
-		languages_list_row(_("Document Language:"), 'rep_lang', null, _('System default'));
-	}
 	table_section_title(_("Purchasing"));
 	text_row(_("Bank Name/Account:"), 'bank_account', null, 42, 40);
 	amount_row(_("Credit Limit:"), 'credit_limit', null);
@@ -127,6 +125,11 @@ function supplier_settings(&$supplier_id)
 	gl_all_accounts_list_row(_("Purchase Account:"), 'purchase_account', $_POST['purchase_account'],
 		false, false, _("Use Item Inventory/COGS Account"));
 	gl_all_accounts_list_row(_("Purchase Discount Account:"), 'payment_discount_account', $_POST['payment_discount_account']);
+	if (!$supplier_id) {
+		table_section_title(_("Contact Data"));
+		text_row(_("Phone Number:"), 'phone', null, 32, 30);
+		text_row(_("Secondary Phone Number:"), 'phone2', null, 32, 30);
+	}
 
 	table_section(2);
 	$dim = get_company_pref('use_dimension');
@@ -151,7 +154,13 @@ function supplier_settings(&$supplier_id)
 	textarea_row(_("General Notes:"), 'notes', null, 35, 5);
 	if ($supplier_id)
 		record_status_list_row(_("Supplier status:"), 'inactive');
-
+	else {
+		table_section_title(_("Contact Data"));
+		text_row(_("Contact Person:"), 'contact', null, 42, 40);
+		text_row(_("Fax Number:"), 'fax', null, 32, 30);
+		email_row(_("E-mail:"), 'email', null, 35, 55);
+		languages_list_row(_("Document Language:"), 'rep_lang', null, _('System default'));
+	}
 	end_outer_table(1);
 
 	div_start('controls');
@@ -206,7 +215,7 @@ if (isset($_POST['submit']))
 				$_POST['website'], $_POST['supp_account_no'], $_POST['bank_account'], 
 				input_num('credit_limit', 0), $_POST['dimension_id'], $_POST['dimension2_id'], $_POST['curr_code'],
 				$_POST['payment_terms'], $_POST['payable_account'], $_POST['purchase_account'], $_POST['payment_discount_account'],
-				$_POST['notes'], $_POST['tax_group_id'], @$_POST['tax_included']);
+				$_POST['notes'], $_POST['tax_group_id'], get_post('tax_included', 0));
 			update_record_status($_POST['supplier_id'], $_POST['inactive'],
 				'suppliers', 'supplier_id');
 
@@ -297,6 +306,8 @@ if (!$supplier_id)
 tabbed_content_start('tabs', array(
 		'settings' => array(_('&General settings'), $supplier_id),
 		'contacts' => array(_('&Contacts'), $supplier_id),
+		'transactions' => array(_('&Transactions'), $supplier_id),
+		'orders' => array(_('Purchase &Orders'), $supplier_id),
 	));
 	
 	switch (get_post('_tabs_sel')) {
@@ -308,13 +319,22 @@ tabbed_content_start('tabs', array(
 			$contacts = new contacts('contacts', $supplier_id, 'supplier');
 			$contacts->show();
 			break;
+		case 'transactions':
+			$_GET['supplier_id'] = $supplier_id;
+			$_GET['popup'] = 1;
+			include_once($path_to_root."/purchasing/inquiry/supplier_inquiry.php");
+			break;
 		case 'orders':
+			$_GET['supplier_id'] = $supplier_id;
+			$_GET['popup'] = 1;
+			include_once($path_to_root."/purchasing/inquiry/po_search_completed.php");
+			break;
 	};
 br();
 tabbed_content_end();
 hidden('popup', @$_REQUEST['popup']);
 end_form();
 
-end_page();
+end_page(@$_REQUEST['popup']);
 
 ?>