X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=purchasing%2Fmanage%2Fsuppliers.php;h=e5da178a8ac6d52b3c6084650215e96df5f64dc3;hb=e4d4ced43ebacbfd1a11022dc9711c3fcc5f1e71;hp=64b2cb5c9d0115e19160d7a7307ba927820ea6ed;hpb=ef5133a65092c38f70278a2ed22952e3625855dc;p=fa-stable.git

diff --git a/purchasing/manage/suppliers.php b/purchasing/manage/suppliers.php
index 64b2cb5c..e5da178a 100644
--- a/purchasing/manage/suppliers.php
+++ b/purchasing/manage/suppliers.php
@@ -11,10 +11,13 @@
 ***********************************************************************/
 $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'], false, "", $js);
 
@@ -90,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']);
@@ -149,17 +153,7 @@ function supplier_settings(&$supplier_id)
 	table_section_title(_("General"));
 	textarea_row(_("General Notes:"), 'notes', null, 35, 5);
 	if ($supplier_id)
-	{
 		record_status_list_row(_("Supplier status:"), 'inactive');
-		if (!@$_REQUEST['popup'])
-		{
-			start_row();
-			echo '<td class="label"> </td><td>';
-			echo viewer_link('<b>'. _('Supplier Inquiry').'</b>', "purchasing/inquiry/supplier_inquiry.php?supplier_id=$supplier_id&popup=1"); 
-			echo "</td>\n";	
-			end_row();
-		}	
-	}
 	else {
 		table_section_title(_("Contact Data"));
 		text_row(_("Contact Person:"), 'contact', null, 42, 40);
@@ -221,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');
 
@@ -312,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')) {
@@ -323,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']);
 
 ?>