X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=inventory%2Fincludes%2Fdb%2Fitems_category_db.inc;h=48984bb665a9844c0724166efef9859bfc6071c2;hb=8eb8e44cb90ab144f0849d1ecd2153175b619786;hp=25368ee75e12c1357e0e002e74ab686b952af1c6;hpb=7f5a0ac613cd75593cd441a4c522dee1373fc097;p=fa-stable.git

diff --git a/inventory/includes/db/items_category_db.inc b/inventory/includes/db/items_category_db.inc
index 25368ee7..48984bb6 100644
--- a/inventory/includes/db/items_category_db.inc
+++ b/inventory/includes/db/items_category_db.inc
@@ -10,13 +10,13 @@
     See the License here <http://www.gnu.org/licenses/gpl-3.0.html>.
 ***********************************************************************/
 function add_item_category($description, $tax_type_id, $sales_account, 
-	$cogs_account, $inventory_account, $adjustment_account, $assembly_account, 
-	$units, $mb_flag, $dim1, $dim2, $no_sale, $no_purchase)
+	$cogs_account, $inventory_account, $adjustment_account, $wip_account, 
+	$units, $mb_flag, $dim1, $dim2, $no_sale, $no_purchase, $vat_category)
 {
 	$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_assembly_act, 
-			dflt_dim1, dflt_dim2, dflt_no_sale, dflt_no_purchase)
+			dflt_inventory_act, dflt_adjustment_act, dflt_wip_act, 
+			dflt_dim1, dflt_dim2, dflt_no_sale, dflt_no_purchase, vat_category)
 		VALUES ("
 		.db_escape($description).","
 		.db_escape($tax_type_id).","
@@ -26,18 +26,19 @@ function add_item_category($description, $tax_type_id, $sales_account,
 		.db_escape($cogs_account).","
 		.db_escape($inventory_account).","
 		.db_escape($adjustment_account).","
-		.db_escape($assembly_account).","
+		.db_escape($wip_account).","
 		.db_escape($dim1).","
 		.db_escape($dim2).","
 		.db_escape($no_sale).","
-		.db_escape($no_purchase).")";
+		.db_escape($no_purchase).","
+		.db_escape($vat_category).")";
 
 	db_query($sql,"an item category could not be added");
 }
 
 function update_item_category($id, $description, $tax_type_id, 
 	$sales_account, $cogs_account, $inventory_account, $adjustment_account, 
-	$assembly_account, $units, $mb_flag, $dim1, $dim2, $no_sale, $no_purchase)
+	$wip_account, $units, $mb_flag, $dim1, $dim2, $no_sale, $no_purchase, $vat_category)
 
 {
 	$sql = "UPDATE ".TB_PREF."stock_category SET "
@@ -49,11 +50,12 @@ function update_item_category($id, $description, $tax_type_id,
 		."dflt_cogs_act = ".db_escape($cogs_account).","
 		."dflt_inventory_act = ".db_escape($inventory_account).","
 		."dflt_adjustment_act = ".db_escape($adjustment_account).","
-		."dflt_assembly_act = ".db_escape($assembly_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)
+		."dflt_no_purchase = ".db_escape($no_purchase).","
+		."vat_category = ".db_escape($vat_category)
         ."WHERE category_id = ".db_escape($id);
 
 	db_query($sql,"an item category could not be updated");
@@ -66,11 +68,18 @@ function delete_item_category($id)
 	db_query($sql,"an item category could not be deleted");
 }
 
-function get_item_categories($show_inactive)
+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 (!$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");
 }
@@ -94,4 +103,3 @@ function get_category_name($id)
 	return $row[0];
 }
 
-?>
\ No newline at end of file