Merged changes from main trunk up to 2.2.3

[fa-stable.git] / includes / data_checks.inc

diff --git a/includes/data_checks.inc b/includes/data_checks.inc
index 633daa87e43a400c9df7403e6ecb8ba62b9bfe49..9589f13c9e60d181db3d8b3abef14017c0690969 100644 (file)
--- a/includes/data_checks.inc
+++ b/includes/data_checks.inc
@@ -269,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)
@@ -301,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)
@@ -317,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)
@@ -428,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");     
@@ -459,7 +475,7 @@ function check_num($postname, $min=null, $max=null) {
        if(!isset($_POST[$postname]))
          return 0;
     $num = input_num($postname);
-    if ($num === false) 
+    if ($num === false || $num === null) 
          return 0;
     if (isset($min) && ($num<$min)) 
          return 0;