X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=inventory%2Fincludes%2Fdb%2Fitems_category_db.inc;h=8b6d872aefaec0eb1bd5a9d442ae5c6fcccf3d38;hb=15ceade075f08d00f299129499197b1358fd63f4;hp=014b75208c48f3505ec03a75d94aa6a46608a449;hpb=a5242af68e65661edb7175412444dce536a7f311;p=fa-stable.git

diff --git a/inventory/includes/db/items_category_db.inc b/inventory/includes/db/items_category_db.inc
index 014b7520..8b6d872a 100644
--- a/inventory/includes/db/items_category_db.inc
+++ b/inventory/includes/db/items_category_db.inc
@@ -9,34 +9,82 @@
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  
     See the License here <http://www.gnu.org/licenses/gpl-3.0.html>.
 ***********************************************************************/
-function add_item_category($description)
-
+function add_item_category($description, $tax_type_id, $sales_account, 
+	$cogs_account, $inventory_account, $adjustment_account, $wip_account, 
+	$units, $mb_flag, $dim1, $dim2, $no_sale, $no_purchase)
 {
-	$sql = "INSERT INTO ".TB_PREF."stock_category (description)
-		VALUES (".db_escape($description).")";
+	$sql = "INSERT INTO ".TB_PREF."stock_category (description, dflt_tax_type,
+			dflt_units, dflt_mb_flag, dflt_sales_act, dflt_cogs_act, 
+			dflt_inventory_act, dflt_adjustment_act, dflt_wip_act, 
+			dflt_dim1, dflt_dim2, dflt_no_sale, dflt_no_purchase)
+		VALUES ("
+		.db_escape($description).","
+		.db_escape($tax_type_id).","
+		.db_escape($units).","
+		.db_escape($mb_flag).","
+		.db_escape($sales_account).","
+		.db_escape($cogs_account).","
+		.db_escape($inventory_account).","
+		.db_escape($adjustment_account).","
+		.db_escape($wip_account).","
+		.db_escape($dim1).","
+		.db_escape($dim2).","
+		.db_escape($no_sale).","
+		.db_escape($no_purchase).")";
 
 	db_query($sql,"an item category could not be added");
 }
 
-function update_item_category($ItemCategory, $description)
+function update_item_category($id, $description, $tax_type_id, 
+	$sales_account, $cogs_account, $inventory_account, $adjustment_account, 
+	$wip_account, $units, $mb_flag, $dim1, $dim2, $no_sale, $no_purchase)
 
 {
-	$sql = "UPDATE ".TB_PREF."stock_category SET description = ".db_escape($description)."
-        WHERE category_id = '$ItemCategory'";
+	$sql = "UPDATE ".TB_PREF."stock_category SET "
+		."description = ".db_escape($description).","
+		."dflt_tax_type = ".db_escape($tax_type_id).","
+		."dflt_units = ".db_escape($units).","
+		."dflt_mb_flag = ".db_escape($mb_flag).","
+		."dflt_sales_act = ".db_escape($sales_account).","
+		."dflt_cogs_act = ".db_escape($cogs_account).","
+		."dflt_inventory_act = ".db_escape($inventory_account).","
+		."dflt_adjustment_act = ".db_escape($adjustment_account).","
+		."dflt_wip_act = ".db_escape($wip_account).","
+		."dflt_dim1 = ".db_escape($dim1).","
+		."dflt_dim2 = ".db_escape($dim2).","
+		."dflt_no_sale = ".db_escape($no_sale).","
+		."dflt_no_purchase = ".db_escape($no_purchase)
+        ."WHERE category_id = ".db_escape($id);
 
 	db_query($sql,"an item category could not be updated");
 }
 
-function delete_item_category($ItemCategory)
+function delete_item_category($id)
 {
-	$sql="DELETE FROM ".TB_PREF."stock_category WHERE category_id='$ItemCategory'";
+	$sql="DELETE FROM ".TB_PREF."stock_category WHERE category_id=".db_escape($id);
 
 	db_query($sql,"an item category could not be deleted");
 }
 
-function get_item_category($ItemCategory)
+function get_item_categories($show_inactive, $fixed_asset=false)
+{
+	$sql = "SELECT c.*, t.name as tax_name FROM ".TB_PREF."stock_category c, "
+		.TB_PREF."item_tax_types t WHERE c.dflt_tax_type=t.id";
+	if (!$show_inactive)
+		$sql .= " AND !c.inactive";
+	if ($fixed_asset)
+		$sql .= " AND c.dflt_mb_flag='F'";
+	else
+		$sql .= " AND c.dflt_mb_flag!='F'";
+
+	$sql .= " ORDER by description";
+
+	return db_query($sql, "could not get stock categories");
+}
+
+function get_item_category($id)
 {
-	$sql="SELECT * FROM ".TB_PREF."stock_category WHERE category_id='$ItemCategory'";
+	$sql="SELECT * FROM ".TB_PREF."stock_category WHERE category_id=".db_escape($id);
 
 	$result = db_query($sql,"an item category could not be retrieved");
 
@@ -45,7 +93,7 @@ function get_item_category($ItemCategory)
 
 function get_category_name($id)
 {
-	$sql = "SELECT description FROM ".TB_PREF."stock_category WHERE category_id=$id";
+	$sql = "SELECT description FROM ".TB_PREF."stock_category WHERE category_id=".db_escape($id);
 
 	$result = db_query($sql, "could not get sales type");
 
@@ -53,4 +101,3 @@ function get_category_name($id)
 	return $row[0];
 }
 
-?>
\ No newline at end of file