Added detection of partial db upgrade.

diff --git a/sql/alter2.1.php b/sql/alter2.1.php
index 371c3d6a33ec12a3ec562df3a37b6b6459c12c2a..2d5be22d86e656f551f81ee5a19e91263e0cb525 100644 (file)
--- a/sql/alter2.1.php
+++ b/sql/alter2.1.php
@@ -146,13 +146,14 @@ class fa2_1 {
        //      Test if patch was applied before.
        //
        function installed($pref) {
-               if (check_table($pref, 'item_codes')) return false;
-               if (check_table($pref, 'company', 'foreign_codes')) return false;
-               if (check_table($pref, 'suppliers', 'credit_limit')) return false;
-               if (check_table($pref, 'bank_trans', 'reconciled', 
-                       array('Type'=>'date'))) return false;
-               if (check_table($pref, 'trans_tax_details')) return false;
-               return true;
+               $n = 5; // number of features to be installed
+               if (!check_table($pref, 'item_codes')) $n--;
+               if (!check_table($pref, 'company', 'foreign_codes')) $n--;
+               if (!check_table($pref, 'suppliers', 'credit_limit')) $n--;
+               if (!check_table($pref, 'bank_trans', 'reconciled', 
+                       array('Type'=>'date'))) $n--;
+               if (!check_table($pref, 'trans_tax_details')) $n--;
+               return $n == 0 ? true : 5 - $n;
        }
 };