X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;ds=sidebyside;f=reporting%2Frep303.php;h=e12e5f0f430bdafdaace4fd4f9255a23fbefba81;hb=a53ada1fa7eac32d429456e08f5ac7fb753ebc0d;hp=d9904bfc101b368d51663183b24f306e65438e1d;hpb=ce5156cda28617e8fe6387c2a2be4fa7b7e703d0;p=fa-stable.git

diff --git a/reporting/rep303.php b/reporting/rep303.php
index d9904bfc..e12e5f0f 100644
--- a/reporting/rep303.php
+++ b/reporting/rep303.php
@@ -29,7 +29,7 @@ include_once($path_to_root . "/includes/db/manufacturing_db.inc");
 
 print_stock_check();
 
-function getTransactions($category, $location)
+function getTransactions($category, $location, $item_like)
 {
 	$sql = "SELECT ".TB_PREF."stock_master.category_id,
 			".TB_PREF."stock_category.description AS cat_description,
@@ -41,13 +41,22 @@ function getTransactions($category, $location)
 		FROM (".TB_PREF."stock_master,
 			".TB_PREF."stock_category)
 		LEFT JOIN ".TB_PREF."stock_moves ON
-			(".TB_PREF."stock_master.stock_id=".TB_PREF."stock_moves.stock_id OR ".TB_PREF."stock_master.stock_id IS NULL)
+			(".TB_PREF."stock_master.stock_id=".TB_PREF."stock_moves.stock_id)
 		WHERE ".TB_PREF."stock_master.category_id=".TB_PREF."stock_category.category_id
 		AND (".TB_PREF."stock_master.mb_flag='B' OR ".TB_PREF."stock_master.mb_flag='M')";
 	if ($category != 0)
 		$sql .= " AND ".TB_PREF."stock_master.category_id = ".db_escape($category);
 	if ($location != 'all')
 		$sql .= " AND IF(".TB_PREF."stock_moves.stock_id IS NULL, '1=1',".TB_PREF."stock_moves.loc_code = ".db_escape($location).")";
+  if($item_like)
+  {
+    $regexp = null;
+
+    if(sscanf($item_like, "/%s", $regexp)==1)
+      $sql .= " AND ".TB_PREF."stock_master.stock_id RLIKE ".db_escape($regexp);
+    else
+      $sql .= " AND ".TB_PREF."stock_master.stock_id LIKE ".db_escape($item_like);
+  }
 	$sql .= " GROUP BY ".TB_PREF."stock_master.category_id,
 		".TB_PREF."stock_category.description,
 		".TB_PREF."stock_master.stock_id,
@@ -70,14 +79,17 @@ function print_stock_check()
     	$check    = $_POST['PARAM_3'];
     	$shortage = $_POST['PARAM_4'];
     	$no_zeros = $_POST['PARAM_5'];
-    	$comments = $_POST['PARAM_6'];
-		$destination = $_POST['PARAM_7'];
+    	$like     = $_POST['PARAM_6']; 
+    	$comments = $_POST['PARAM_7'];
+	$orientation = $_POST['PARAM_8'];
+	$destination = $_POST['PARAM_9'];
 
 	if ($destination)
 		include_once($path_to_root . "/reporting/includes/excel_report.inc");
 	else
 		include_once($path_to_root . "/reporting/includes/pdf_report.inc");
 
+	$orientation = ($orientation ? 'L' : 'P');
 	if ($category == ALL_NUMERIC)
 		$category = 0;
 	if ($category == 0)
@@ -128,13 +140,15 @@ function print_stock_check()
 	else
 		$user_comp = "";
 
-   	$rep = new FrontReport(_('Stock Check Sheets'), "StockCheckSheet", user_pagesize());
+   	$rep = new FrontReport(_('Stock Check Sheets'), "StockCheckSheet", user_pagesize(), 9, $orientation);
+    if ($orientation == 'L')
+    	recalculate_cols($cols);
 
     $rep->Font();
     $rep->Info($params, $cols, $headers, $aligns);
     $rep->NewPage();
 
-	$res = getTransactions($category, $location);
+	$res = getTransactions($category, $location, $like);
 	$catt = '';
 	while ($trans=db_fetch($res))
 	{