X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=includes%2Fdata_checks.inc;h=295a353e1203d2ec1cc484291803d9e8113f7fe7;hb=b3364aceecbf38109924c6ee1d48a28db78ad725;hp=95bcb2ca68e5c5f16f29417e63769a99232cec8e;hpb=390ade73042e4dce7d03b90eaab712717dbe2d78;p=fa-stable.git

diff --git a/includes/data_checks.inc b/includes/data_checks.inc
index 95bcb2ca..295a353e 100644
--- a/includes/data_checks.inc
+++ b/includes/data_checks.inc
@@ -123,12 +123,14 @@ function check_db_has_movement_types($msg)
 
 function db_customer_has_branches($customer_id)
 {
-	return check_empty_result("SELECT COUNT(*) FROM ".TB_PREF."cust_branch WHERE debtor_no='$customer_id'");
+	return check_empty_result("SELECT COUNT(*) FROM ".TB_PREF."cust_branch "
+		."WHERE debtor_no='$customer_id'");
 }
 
 function db_has_customer_branches()
 {
-	return check_empty_result("SELECT COUNT(*) FROM ".TB_PREF."cust_branch");
+	return check_empty_result("SELECT COUNT(*) FROM "
+		.TB_PREF."cust_branch WHERE !inactive");
 }
 
 function check_db_has_customer_branches($msg)
@@ -267,7 +269,7 @@ function check_db_has_stock_items($msg)
 
 function db_has_bom_stock_items()
 {
-	return check_empty_result("SELECT COUNT(*) FROM ".TB_PREF."stock_master WHERE (mb_flag='M' OR mb_flag='K')");
+	return check_empty_result("SELECT COUNT(*) FROM ".TB_PREF."stock_master WHERE mb_flag='M'");
 }
 
 function check_db_has_bom_stock_items($msg)
@@ -299,7 +301,7 @@ function check_db_has_manufacturable_items($msg)
 
 function db_has_purchasable_items()
 {
-	return check_empty_result("SELECT COUNT(*) FROM ".TB_PREF."stock_master WHERE (mb_flag!='M' AND mb_flag!='K')");
+	return check_empty_result("SELECT COUNT(*) FROM ".TB_PREF."stock_master WHERE mb_flag!='M'");
 }
 
 function check_db_has_purchasable_items($msg)
@@ -315,7 +317,7 @@ function check_db_has_purchasable_items($msg)
 
 function db_has_costable_items()
 {
-	return check_empty_result("SELECT COUNT(*) FROM ".TB_PREF."stock_master WHERE (mb_flag!='D' AND mb_flag!='K')");
+	return check_empty_result("SELECT COUNT(*) FROM ".TB_PREF."stock_master WHERE mb_flag!='D'");
 }
 
 function check_db_has_costable_items($msg)
@@ -426,6 +428,22 @@ function db_has_quick_entries()
 	return check_empty_result("SELECT COUNT(*) FROM ".TB_PREF."quick_entries");
 }
 
+function db_has_tags($type)
+{
+	return check_empty_result("SELECT COUNT(*) FROM ".TB_PREF."tags WHERE type=$type");
+}
+
+function check_db_has_tags($type, $msg)
+{
+	global $path_to_root;
+    if (!db_has_tags($type)) 
+    {
+    	display_error($msg, true);
+    	end_page();
+    	exit;	
+    }	
+}
+
 function check_empty_result($sql)
 {
 	$result = db_query($sql, "could not do check empty query");