From: Joe Hunt <joe.hunt.consulting@gmail.com>
Date: Wed, 2 Nov 2011 11:04:38 +0000 (+0100)
Subject: Fixed Next bug for pagers in customers and suppliers transactions.
X-Git-Tag: 2.3-final~536
X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=commitdiff_plain;h=37be532e69b2721dcfca923c53babb203a60bba2;p=fa-stable.git

Fixed Next bug for pagers in customers and suppliers transactions.
---

diff --git a/purchasing/includes/db/po_db.inc b/purchasing/includes/db/po_db.inc
index adab9ad3..e841d5e8 100644
--- a/purchasing/includes/db/po_db.inc
+++ b/purchasing/includes/db/po_db.inc
@@ -269,6 +269,8 @@ function get_sql_for_po_search_completed()
 		AND porder.supplier_id = supplier.supplier_id
 		AND location.loc_code = porder.into_stock_location ";
 
+	if (isset($_GET['supplier_id']))
+		$sql .= "AND supplier.supplier_id=".@$_GET['supplier_id']." ";
 	if (isset($order_number) && $order_number != "")
 	{
 		$sql .= "AND porder.reference LIKE ".db_escape('%'. $order_number . '%');
diff --git a/purchasing/manage/suppliers.php b/purchasing/manage/suppliers.php
index 91f16d64..3f2d8566 100644
--- a/purchasing/manage/suppliers.php
+++ b/purchasing/manage/suppliers.php
@@ -11,7 +11,8 @@
 ***********************************************************************/
 $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);
@@ -318,13 +319,11 @@ tabbed_content_start('tabs', array(
 		case 'transactions':
 			$_GET['supplier_id'] = $supplier_id;
 			$_GET['popup'] = 1;
-			$_SERVER['REQUEST_METHOD'] = 'GET';			
 			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;
 	};
diff --git a/sales/inquiry/customer_inquiry.php b/sales/inquiry/customer_inquiry.php
index 877b33e0..67b44745 100644
--- a/sales/inquiry/customer_inquiry.php
+++ b/sales/inquiry/customer_inquiry.php
@@ -11,7 +11,7 @@
 ***********************************************************************/
 $page_security = 'SA_SALESTRANSVIEW';
 $path_to_root = "../..";
-include($path_to_root . "/includes/db_pager.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");
diff --git a/sales/manage/customers.php b/sales/manage/customers.php
index 0a11de23..7df12402 100644
--- a/sales/manage/customers.php
+++ b/sales/manage/customers.php
@@ -12,6 +12,7 @@
 $page_security = 'SA_CUSTOMER';
 $path_to_root = "../..";
 
+include($path_to_root . "/includes/db_pager.inc");
 include_once($path_to_root . "/includes/session.inc");
 $js = "";
 if ($use_popup_windows)
@@ -353,13 +354,11 @@ tabbed_content_start('tabs', array(
 		case 'transactions':
 			$_GET['customer_id'] = $selected_id;
 			$_GET['popup'] = 1;
-			$_SERVER['REQUEST_METHOD'] = 'GET';			
 			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;
 	};