X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=includes%2Fdata_checks.inc;h=633daa87e43a400c9df7403e6ecb8ba62b9bfe49;hb=231addc23887aa8b906dca18ea0b2a6fe63c3c39;hp=37da7a3fc4539f6566a8fdf17d41463cb6dfc3a3;hpb=a5242af68e65661edb7175412444dce536a7f311;p=fa-stable.git

diff --git a/includes/data_checks.inc b/includes/data_checks.inc
index 37da7a3f..633daa87 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)
@@ -385,6 +387,7 @@ function db_has_bank_accounts()
 function check_db_has_bank_accounts($msg)
 {
 	global $path_to_root;
+
     if (!db_has_bank_accounts()) 
     {
     	display_error($msg, true);
@@ -393,6 +396,12 @@ function check_db_has_bank_accounts($msg)
     }	
 }
 
+function db_has_cash_accounts()
+{
+	return check_empty_result("SELECT COUNT(*) FROM ".TB_PREF."bank_accounts
+		WHERE account_type=3");
+}
+
 function db_has_gl_accounts()
 {
 	return check_empty_result("SELECT COUNT(*) FROM ".TB_PREF."chart_master");