X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;ds=sidebyside;f=inventory%2Fincludes%2Fdb%2Fmovement_types_db.inc;h=47164191daa20f02dd2a2993d126b23ea8ad088b;hb=1571869d54be48452fdbe08f25130972ff0a7b5a;hp=1862f7b16822139fa944016c2862ea2ec850f3fc;hpb=46c5f7a65a7659a44ae8254c63152074363d3987;p=fa-stable.git

diff --git a/inventory/includes/db/movement_types_db.inc b/inventory/includes/db/movement_types_db.inc
index 1862f7b1..47164191 100644
--- a/inventory/includes/db/movement_types_db.inc
+++ b/inventory/includes/db/movement_types_db.inc
@@ -53,13 +53,23 @@ function get_stock_movements($stock_id, $StockLocation,	$BeforeDate, $AfterDate)
 {
 	$before_date = date2sql($BeforeDate);
 	$after_date = date2sql($AfterDate);
-	$sql = "SELECT type, trans_no, tran_date, person_id, qty, reference
-		FROM ".TB_PREF."stock_moves
-		WHERE loc_code=".db_escape($StockLocation)."
-		AND tran_date >= '". $after_date . "'
-		AND tran_date <= '" . $before_date . "'
-		AND stock_id = ".db_escape($stock_id) . " ORDER BY tran_date,trans_id";
-	return db_query($sql, "could not query stock moves");
+  $sql = "SELECT type, trans_no, tran_date, person_id, qty, reference";
+
+	if(!$StockLocation) {
+		 $sql .= ", loc_code";
+	}
+  $sql.=    " FROM ".TB_PREF."stock_moves
+		WHERE";
+
+  if ($StockLocation) {
+    $sql.= " loc_code=".db_escape($StockLocation)." AND";
+	}
+
+	$sql.= " tran_date >= '". $after_date . "'
+	AND tran_date <= '" . $before_date . "'
+	AND stock_id = ".db_escape($stock_id) . " ORDER BY tran_date,trans_id";
+
+  return db_query($sql, "could not query stock moves");
 }
 
 function get_stock_movements_before($stock_id, $StockLocation, $AfterDate)
@@ -83,4 +93,4 @@ function movement_types_in_stock_moves($selected_id)
 	$myrow = db_fetch_row($result);
 	return ($myrow[0] > 0); 
 }
-?>
\ No newline at end of file
+?>