Transaction Inquiry inside Supplier didn't work.

diff --git a/purchasing/inquiry/supplier_inquiry.php b/purchasing/inquiry/supplier_inquiry.php
index c3f54557c665373effdf0278b8e7372f70aa5db6..b76c949fb5f5f3fe4b5c29b554c69e9e10d97c7c 100644 (file)
--- 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 6e2867ffaeb5729983d7f9f650c2bc91d770b39e..4613de18a4000df654e84bc9bdd2c10241696100 100644 (file)
--- 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();