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

diff --git a/inventory/includes/db/movement_types_db.inc b/inventory/includes/db/movement_types_db.inc
index 78e55a97..47164191 100644
--- a/inventory/includes/db/movement_types_db.inc
+++ b/inventory/includes/db/movement_types_db.inc
@@ -20,21 +20,22 @@ function add_movement_type($name)
 function update_movement_type($type_id, $name)
 {
 	$sql = "UPDATE ".TB_PREF."movement_types SET name=".db_escape($name)."
-			WHERE id=$type_id";
+			WHERE id=".db_escape($type_id);
 
 	db_query($sql, "could not update item movement type");
 }
 
-function get_all_movement_type()
+function get_all_movement_type($all=false)
 {
 	$sql = "SELECT * FROM ".TB_PREF."movement_types";
+	if (!$all) $sql .= " WHERE !inactive";
 
 	return db_query($sql, "could not get all item movement type");
 }
 
 function get_movement_type($type_id)
 {
-	$sql = "SELECT * FROM ".TB_PREF."movement_types WHERE id=$type_id";
+	$sql = "SELECT * FROM ".TB_PREF."movement_types WHERE id=".db_escape($type_id);
 
 	$result = db_query($sql, "could not get item movement type");
 
@@ -43,9 +44,53 @@ function get_movement_type($type_id)
 
 function delete_movement_type($type_id)
 {
-	$sql="DELETE FROM ".TB_PREF."movement_types WHERE id=$type_id";
+	$sql="DELETE FROM ".TB_PREF."movement_types WHERE id=".db_escape($type_id);
 
 	db_query($sql, "could not delete item movement type");
 }
 
-?>
\ No newline at end of file
+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";
+
+	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)
+{
+	$after_date = date2sql($AfterDate);
+	$sql = "SELECT SUM(qty) FROM ".TB_PREF."stock_moves WHERE stock_id=".db_escape($stock_id) . "
+		AND loc_code=".db_escape( $StockLocation) . "
+		AND tran_date < '" . $after_date . "'";
+	$before_qty = db_query($sql, "The starting quantity on hand could not be calculated");
+
+	$before_qty_row = db_fetch_row($before_qty);
+	return $before_qty_row[0];
+}
+
+function movement_types_in_stock_moves($selected_id)
+{
+	$sql= "SELECT COUNT(*) FROM ".TB_PREF."stock_moves 
+		WHERE type=" . ST_INVADJUST. " AND person_id=".db_escape($selected_id);
+
+	$result = db_query($sql, "could not query stock moves");
+	$myrow = db_fetch_row($result);
+	return ($myrow[0] > 0); 
+}
+?>