X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=includes%2Fdata_checks.inc;h=ff316953030d9c322fea21c2a7e3aced11717340;hb=7b9032da05f92d030cf5ba36e1d524d123129159;hp=95bcb2ca68e5c5f16f29417e63769a99232cec8e;hpb=21290a4a16ca78fe736f62cf1cb039c06cb53fca;p=fa-stable.git

diff --git a/includes/data_checks.inc b/includes/data_checks.inc
index 95bcb2ca..ff316953 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");	
@@ -452,12 +470,13 @@ function check_int($postname, $min=null, $max=null) {
 //
 //	Numeric input check.
 //	Return 1 if number has proper form and is within <min, max> range
+//	Empty/not defined fields are defaulted to $dflt value.
 //
-function check_num($postname, $min=null, $max=null) {
+function check_num($postname, $min=null, $max=null, $dflt=0) {
 	if(!isset($_POST[$postname]))
 	  return 0;
-    $num = input_num($postname);
-    if ($num === false) 
+    $num = input_num($postname, $dflt);
+    if ($num === false || $num === null) 
 	  return 0;
     if (isset($min) && ($num<$min)) 
 	  return 0;