Added sales orders and purchase orders in customer/supplier tabs inquiry.

diff --git a/purchasing/inquiry/po_search_completed.php b/purchasing/inquiry/po_search_completed.php
index ba77bf7a91222026e43ef12ea5b15f57192fb59e..9925ac6399a393387a286074b120a8e11c0e1492 100644 (file)
--- a/purchasing/inquiry/po_search_completed.php
+++ b/purchasing/inquiry/po_search_completed.php
@@ -11,18 +11,20 @@
 ***********************************************************************/
 $page_security = 'SA_SUPPTRANSVIEW';
 $path_to_root="../..";
-include($path_to_root . "/includes/db_pager.inc");
-include($path_to_root . "/includes/session.inc");
+include_once($path_to_root . "/includes/db_pager.inc");
+include_once($path_to_root . "/includes/session.inc");
 
-include($path_to_root . "/purchasing/includes/purchasing_ui.inc");
+include_once($path_to_root . "/purchasing/includes/purchasing_ui.inc");
 include_once($path_to_root . "/reporting/includes/reporting.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 = "Search Purchase Orders"), false, false, "", $js);
-
+if (!@$_GET['popup'])
+{
+       $js = "";
+       if ($use_popup_windows)
+               $js .= get_js_open_window(900, 500);
+       if ($use_date_picker)
+               $js .= get_js_date_picker();
+       page(_($help_context = "Search Purchase Orders"), false, false, "", $js);
+}
 if (isset($_GET['order_number']))
 {
        $order_number = $_GET['order_number'];
@@ -53,7 +55,8 @@ if (get_post('SearchOrders'))
 }
 //---------------------------------------------------------------------------------------------
 
-start_form();
+if (!@$_GET['popup'])
+       start_form();
 
 start_table(TABLESTYLE_NOBORDER);
 start_row();
@@ -98,9 +101,11 @@ function trans_view($trans)
 
 function edit_link($row) 
 {
-  return pager_link( _("Edit"),
-       "/purchasing/po_entry_items.php?" . SID 
-       . "ModifyOrderNumber=" . $row["order_no"], ICON_EDIT);
+       if (@$_GET['popup'])
+               return '';
+       return pager_link( _("Edit"),
+               "/purchasing/po_entry_items.php?" . SID 
+               . "ModifyOrderNumber=" . $row["order_no"], ICON_EDIT);
 }
 
 function prt_link($row)
@@ -136,6 +141,9 @@ $table->width = "80%";
 
 display_db_pager($table);
 
-end_form();
-end_page();
+if (!@$_GET['popup'])
+{
+       end_form();
+       end_page();
+}      
 ?>

diff --git a/purchasing/manage/suppliers.php b/purchasing/manage/suppliers.php
index 34ab0bae116a27349689c65bcead7faa99278895..556d8ec5ff64728c6a4f9427ceb94006c60947cf 100644 (file)
--- a/purchasing/manage/suppliers.php
+++ b/purchasing/manage/suppliers.php
@@ -303,6 +303,7 @@ tabbed_content_start('tabs', array(
                'settings' => array(_('&General settings'), $supplier_id),
                'contacts' => array(_('&Contacts'), $supplier_id),
                'transactions' => array(_('&Supplier Inquiry'), $supplier_id),
+               'orders' => array(_('&Purchase orders'), $supplier_id),
        ));
        
        switch (get_post('_tabs_sel')) {
@@ -321,6 +322,11 @@ tabbed_content_start('tabs', array(
                        include_once($path_to_root."/purchasing/inquiry/supplier_inquiry.php");
                        break;
                case 'orders':
+                       $_GET['supplier_id'] = $supplier_id;
+                       $_GET['popup'] = 1;
+                       $_SERVER['REQUEST_METHOD'] = 'GET';                     
+                       include_once($path_to_root."/purchasing/inquiry/po_search_completed.php");
+                       break;
        };
 br();
 tabbed_content_end();

diff --git a/sales/inquiry/sales_orders_view.php b/sales/inquiry/sales_orders_view.php
index 27892adbcec1384e10c012b4d61777dc6d852106..fbc6a35f88c44498f9c767045eabbd45accdf05f 100644 (file)
--- a/sales/inquiry/sales_orders_view.php
+++ b/sales/inquiry/sales_orders_view.php
@@ -11,9 +11,9 @@
 ***********************************************************************/
 $path_to_root = "../..";
 
-include($path_to_root . "/includes/db_pager.inc");
-include($path_to_root . "/includes/session.inc");
-include($path_to_root . "/sales/includes/sales_ui.inc");
+include_once($path_to_root . "/includes/db_pager.inc");
+include_once($path_to_root . "/includes/session.inc");
+include_once($path_to_root . "/sales/includes/sales_ui.inc");
 include_once($path_to_root . "/reporting/includes/reporting.inc");
 
 $page_security = 'SA_SALESTRANSVIEW';
@@ -24,13 +24,15 @@ set_page_security( @$_POST['order_view_mode'],
        array(  'OutstandingOnly' => 'SA_SALESDELIVERY',
                        'InvoiceTemplates' => 'SA_SALESINVOICE')
 );
-
-$js = "";
-if ($use_popup_windows)
-       $js .= get_js_open_window(900, 600);
-if ($use_date_picker)
-       $js .= get_js_date_picker();
-
+if (!@$_GET['popup'])\r
+{\r
+       $js = "";
+       if ($use_popup_windows)
+               $js .= get_js_open_window(900, 600);
+       if ($use_date_picker)
+               $js .= get_js_date_picker();
+       page($_SESSION['page_title'], false, false, "", $js);\r
+}
 if (get_post('type'))
        $trans_type = $_POST['type'];
 elseif (isset($_GET['type']) && $_GET['type'] == ST_SALESQUOTE)
@@ -66,7 +68,6 @@ else
        $_POST['order_view_mode'] = "Quotations";
        $_SESSION['page_title'] = _($help_context = "Search All Sales Quotations");
 }
-page($_SESSION['page_title'], false, false, "", $js);
 
 if (isset($_GET['selected_customer']))
 {
@@ -118,6 +119,8 @@ function prt_link($row)
 
 function edit_link($row) 
 {
+       if (@$_GET['popup'])\r
+               return '';\r
        global $trans_type;
        $modify = ($trans_type == ST_SALESORDER ? "ModifyOrderNumber" : "ModifyQuotationNumber");
   return pager_link( _("Edit"),
@@ -210,7 +213,8 @@ if (get_post('_OrderNumber_changed') || get_post('_OrderReference_changed')) //
        $Ajax->activate('orders_tbl');
 }
 
-start_form();
+if (!@$_GET['popup'])\r
+       start_form();
 
 start_table(TABLESTYLE_NOBORDER);
 start_row();
@@ -231,7 +235,8 @@ if($show_dates) {
        start_row();
 }
 stock_items_list_cells(_("Item:"), 'SelectStockFromList', null, true);
-customer_list_cells(_("Select a customer: "), 'customer_id', null, true);\r
+if (!@$_GET['popup'])\r
+       customer_list_cells(_("Select a customer: "), 'customer_id', null, true);\r
 if ($trans_type == ST_SALESQUOTE)
        check_cells(_("Show All:"), 'show_all');
 
@@ -313,6 +318,9 @@ $table->width = "80%";
 display_db_pager($table);
 submit_center('Update', _("Update"), true, '', null);
 
-end_form();
-end_page();
+if (!@$_GET['popup'])\r
+{
+       end_form();
+       end_page();
+}\r
 ?>
\ No newline at end of file

diff --git a/sales/manage/customers.php b/sales/manage/customers.php
index 01b167d9855ecb5d4aecba19254af3bf8961b156..8cc3401d9638f0a4117d1e867f99cfef9378d8b2 100644 (file)
--- a/sales/manage/customers.php
+++ b/sales/manage/customers.php
@@ -338,6 +338,7 @@ tabbed_content_start('tabs', array(
                'settings' => array(_('&General settings'), $selected_id),
                'contacts' => array(_('&Contacts'), $selected_id),
                'transactions' => array(_('Customer &Transactions'), $selected_id),
+               'orders' => array(_('&Orders'), $selected_id),
        ));
        
        switch (get_post('_tabs_sel')) {
@@ -356,6 +357,11 @@ tabbed_content_start('tabs', array(
                        include_once($path_to_root."/sales/inquiry/customer_inquiry.php");
                        break;
                case 'orders':
+                       $_GET['customer_id'] = $selected_id;
+                       $_GET['popup'] = 1;
+                       $_SERVER['REQUEST_METHOD'] = 'GET';                     
+                       include_once($path_to_root."/sales/inquiry/sales_orders_view.php");
+                       break;
        };
 br();
 tabbed_content_end();