From: Joe Hunt <joe.hunt.consulting@gmail.com>
Date: Wed, 26 Oct 2011 22:36:36 +0000 (+0200)
Subject: Supplier Inquiry link in Supplier form.
X-Git-Tag: 2.3-final~548
X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=commitdiff_plain;h=ef5133a65092c38f70278a2ed22952e3625855dc;p=fa-stable.git

Supplier Inquiry link in Supplier form.
---

diff --git a/purchasing/inquiry/supplier_inquiry.php b/purchasing/inquiry/supplier_inquiry.php
index acac5a13..f07ddec1 100644
--- a/purchasing/inquiry/supplier_inquiry.php
+++ b/purchasing/inquiry/supplier_inquiry.php
@@ -44,7 +44,7 @@ if (!isset($_POST['supplier_id']))
 start_table(TABLESTYLE_NOBORDER);
 start_row();
 
-supplier_list_cells(_("Select a supplier:"), 'supplier_id', null, true);
+supplier_list_cells(_("Select a supplier:"), 'supplier_id', null, true, false, false, !@$_REQUEST['popup']);
 
 date_cells(_("From:"), 'TransAfterDate', '', null, -30);
 date_cells(_("To:"), 'TransToDate');
@@ -190,7 +190,9 @@ $table->width = "85%";
 
 display_db_pager($table);
 
+hidden('popup', @$_REQUEST['popup']);
 end_form();
-end_page();
+
+end_page(@$_REQUEST['popup'], false, false);
 
 ?>
diff --git a/purchasing/manage/suppliers.php b/purchasing/manage/suppliers.php
index a2c2b450..64b2cb5c 100644
--- a/purchasing/manage/suppliers.php
+++ b/purchasing/manage/suppliers.php
@@ -12,8 +12,11 @@
 $page_security = 'SA_SUPPLIER';
 $path_to_root = "../..";
 include($path_to_root . "/includes/session.inc");
+$js = "";
+if ($use_popup_windows)
+	$js .= get_js_open_window(900, 500);
 
-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");
@@ -99,15 +102,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 +121,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');
@@ -150,8 +149,24 @@ 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);
+		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');