X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=inventory%2Fincludes%2Fdb%2Fitems_units_db.inc;h=b5c98d9118f7afd5f39d2fcc0f9754618e16a9ed;hb=1a851e527fe366364c6d2baaf2684222f9394b48;hp=05cb544ca86663a5ac6c1d5e22971c604276b086;hpb=46d3debec422c5ad5ee99c4acfe42bfa60308afb;p=fa-stable.git

diff --git a/inventory/includes/db/items_units_db.inc b/inventory/includes/db/items_units_db.inc
index 05cb544c..b5c98d91 100644
--- a/inventory/includes/db/items_units_db.inc
+++ b/inventory/includes/db/items_units_db.inc
@@ -1,17 +1,26 @@
 <?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_quote($abbr).",
-	 	name = ".db_quote($description).",
+	 	abbr = ".db_escape($abbr).",
+	 	name = ".db_escape($description).",
 	 	decimals = $decimals
         	WHERE 	 abbr = '$selected'";
     else
 		$sql = "INSERT INTO ".TB_PREF."item_units
-			(abbr, name, decimals) VALUES( ".db_quote($abbr).",
-	  		".db_quote($description).", $decimals)";
+			(abbr, name, decimals) VALUES( ".db_escape($abbr).",
+	  		".db_escape($description).", $decimals)";
 
 	db_query($sql,"an item unit could not be updated");
 }
@@ -49,8 +58,21 @@ function item_unit_used($unit) {
 	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";
+	$result = db_query($sql, "could not get unit decimals");
+
+	$row = db_fetch_row($result);
+	return $row[0];
+}
+
 ?>
\ No newline at end of file