X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=inventory%2Fincludes%2Fdb%2Fitems_units_db.inc;h=ec6b8f5ff2729267e41785ff6f4c96841fac0abc;hb=8ffddf50ffbe93672c769e2cf0501d0f9125e2a0;hp=1f63252a3e932eef412790129c53b1d02165da2b;hpb=c09be0dad6b05131e240349a375af7a4b7bf3444;p=fa-stable.git

diff --git a/inventory/includes/db/items_units_db.inc b/inventory/includes/db/items_units_db.inc
index 1f63252a..ec6b8f5f 100644
--- a/inventory/includes/db/items_units_db.inc
+++ b/inventory/includes/db/items_units_db.inc
@@ -1,31 +1,40 @@
 <?php
-
+/**********************************************************************
+    Copyright (C) FrontAccounting, LLC.
+	Released under the terms of the GNU General Public License, GPL, 
+	as published by the Free Software Foundation, either version 3 
+	of the License, or (at your option) any later version.
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  
+    See the License here <http://www.gnu.org/licenses/gpl-3.0.html>.
+***********************************************************************/
 function write_item_unit($selected, $abbr, $description, $decimals)
 {
     if($selected!='')
 		$sql = "UPDATE ".TB_PREF."item_units SET
 	 	abbr = ".db_escape($abbr).",
 	 	name = ".db_escape($description).",
-	 	decimals = $decimals
-        	WHERE 	 abbr = '$selected'";
+	 	decimals = ".db_escape($decimals)."
+        	WHERE abbr = ".db_escape($selected);
     else
 		$sql = "INSERT INTO ".TB_PREF."item_units
 			(abbr, name, decimals) VALUES( ".db_escape($abbr).",
-	  		".db_escape($description).", $decimals)";
+	  		".db_escape($description).", ".db_escape($decimals).")";
 
 	db_query($sql,"an item unit could not be updated");
 }
 
 function delete_item_unit($unit)
 {
-	$sql="DELETE FROM ".TB_PREF."item_units WHERE abbr='$unit'";
+	$sql="DELETE FROM ".TB_PREF."item_units WHERE abbr=".db_escape($unit);
 
 	db_query($sql,"an unit of measure could not be deleted");
 }
 
 function get_item_unit($unit)
 {
-	$sql="SELECT * FROM ".TB_PREF."item_units WHERE abbr='$unit'";
+	$sql="SELECT * FROM ".TB_PREF."item_units WHERE abbr=".db_escape($unit);
 
 	$result = db_query($sql,"an unit of measure could not be retrieved");
 
@@ -34,7 +43,7 @@ function get_item_unit($unit)
 
 function get_unit_descr($unit)
 {
-	$sql = "SELECT description FROM ".TB_PREF."item_units WHERE abbr='$unit'";
+	$sql = "SELECT description FROM ".TB_PREF."item_units WHERE abbr=".db_escape($unit);
 
 	$result = db_query($sql, "could not unit description");
 
@@ -43,25 +52,26 @@ function get_unit_descr($unit)
 }
 
 function item_unit_used($unit) {
-	$sql= "SELECT COUNT(*) FROM ".TB_PREF."stock_master WHERE units='$unit'";
+	$sql= "SELECT COUNT(*) FROM ".TB_PREF."stock_master WHERE units=".db_escape($unit);
 	$result = db_query($sql, "could not query stock master");
 	$myrow = db_fetch_row($result);
 	return ($myrow[0] > 0);
 }
 
-function get_all_item_units() {
-    $sql = "SELECT * FROM ".TB_PREF."item_units ORDER BY name";
+function get_all_item_units($all=false) {
+    $sql = "SELECT * FROM ".TB_PREF."item_units";
+	if (!$all) $sql .= " WHERE !inactive";
+	$sql .= " ORDER BY name";
     return  db_query($sql, "could not get stock categories");
 }
 // 2008-06-15. Added Joe Hunt to get a measure of unit by given stock_id
 function get_unit_dec($stock_id)
 {
 	$sql = "SELECT decimals FROM ".TB_PREF."item_units,	".TB_PREF."stock_master
-		WHERE abbr=units AND stock_id='$stock_id' LIMIT 1";
+		WHERE abbr=units AND stock_id=".db_escape($stock_id)." LIMIT 1";
 	$result = db_query($sql, "could not get unit decimals");
 
 	$row = db_fetch_row($result);
 	return $row[0];
 }
 
-?>
\ No newline at end of file