From: Joe Hunt <joe.hunt.consulting@gmail.com>
Date: Sun, 8 Nov 2015 23:47:57 +0000 (+0100)
Subject: Transaction Inquiry inside Supplier didn't work.
X-Git-Tag: v2.4.2~19^2~128
X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=commitdiff_plain;h=4ca8f82e2c5a8ff989c2abe78b5948f02470bb3d;p=fa-stable.git

Transaction Inquiry inside Supplier didn't work.
---

diff --git a/purchasing/inquiry/supplier_inquiry.php b/purchasing/inquiry/supplier_inquiry.php
index c3f54557..b76c949f 100644
--- a/purchasing/inquiry/supplier_inquiry.php
+++ b/purchasing/inquiry/supplier_inquiry.php
@@ -27,6 +27,7 @@ page(_($help_context = "Supplier Inquiry"), isset($_GET['supplier_id']), false,
 if (isset($_GET['supplier_id'])){
 	$_POST['supplier_id'] = $_GET['supplier_id'];
 }
+
 if (isset($_GET['FromDate'])){
 	$_POST['TransAfterDate'] = $_GET['FromDate'];
 }
@@ -106,7 +107,6 @@ function systype_name($dummy, $type)
 	global $systypes_array;
 	return $systypes_array[$type];
 }
-div_end();
 
 function trans_view($trans)
 {
@@ -163,6 +163,10 @@ function check_overdue($row)
 
 function edit_link($row)
 {
+	global $page_nested;
+
+	if ($page_nested)
+		return '';
 	return trans_editor_link($row['type'], $row['trans_no']);
 }
 //------------------------------------------------------------------------------------------------
diff --git a/purchasing/manage/suppliers.php b/purchasing/manage/suppliers.php
index 6e2867ff..4613de18 100644
--- a/purchasing/manage/suppliers.php
+++ b/purchasing/manage/suppliers.php
@@ -19,7 +19,7 @@ if ($SysPrefs->use_popup_windows)
 if (user_use_date_picker())
 	$js .= get_js_date_picker();
 
-page(_($help_context = "Suppliers"), @$_REQUEST['popup'], false, "", $js);
+page(_($help_context = "Suppliers"), false, false, "", $js);
 
 include_once($path_to_root . "/includes/ui.inc");
 include_once($path_to_root . "/includes/ui/contacts_view.inc");
@@ -322,19 +322,15 @@ tabbed_content_start('tabs', array(
 			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(@$_REQUEST['popup']);
+end_page();