X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=sql%2Falter2.2.php;h=21fa6822c7f5492f927e7a05739811b0e65c9c9d;hb=11e485e4a7c5f12c9424713b7330815a9cc5e4ae;hp=85a00be5ecc3eceda398d49ce72e6bdca6229393;hpb=aa6b8a25b58b6cbff069e451558ce0b661c5ec1b;p=fa-stable.git

diff --git a/sql/alter2.2.php b/sql/alter2.2.php
index 85a00be5..21fa6822 100644
--- a/sql/alter2.2.php
+++ b/sql/alter2.2.php
@@ -81,7 +81,27 @@ class fa2_2 {
 			}
 		  }
 		}
-*/		
+*/
+	
+	if (!($ret = db_query("SELECT MAX(`order_no`) FROM `{$pref}sales_orders`")) ||
+		!db_num_rows($ret))
+	{
+		display_error(_('Cannot query max sales order number.'));
+		return false;
+	} 
+	$row = db_fetch($ret);
+	$max_order = $row[0];
+	$next_ref = $max_order+1;
+	$sql = "UPDATE `{$pref}sys_types` 
+		SET `type_no`='$max_order', 
+			`next_reference`='$next_ref'
+		WHERE `type_id`=30";
+	if(!db_query($sql))
+	{
+		display_error(_('Cannot store next sales order reference.'));
+		return false;
+	}
+
 	return convert_roles($pref);
 	}
 	//
@@ -96,13 +116,22 @@ class fa2_2 {
 	//	Test if patch was applied before.
 	//
 	function installed($pref) {
-		if (check_table($pref, 'company', 'login_tout')) return false;
-		if (check_table($pref, 'stock_category', 'dflt_dim2')) return false;
-		if (check_table($pref, 'users', 'sticky_doc_date')) return false;
-		if (check_table($pref, 'audit_trail')) return false;
-		if (check_table($pref, 'stock_master','no_sale')) return false;
-		if (check_table($pref, 'users', 'role_id')) return false;
-			return true;
+		$n = 14; // number of features to be installed
+		if (check_table($pref, 'company', 'custom1_name')) $n--;
+		if (!check_table($pref, 'company', 'profit_loss_year_act')) $n--;
+		if (!check_table($pref, 'company', 'login_tout')) $n--;
+		if (!check_table($pref, 'stock_category', 'dflt_no_sale')) $n--;
+		if (!check_table($pref, 'users', 'sticky_doc_date')) $n--;
+		if (!check_table($pref, 'users', 'startup_tab')) $n--;
+		if (!check_table($pref, 'cust_branch', 'inactive')) $n--;
+		if (!check_table($pref, 'chart_class', 'ctype')) $n--;
+		if (!check_table($pref, 'audit_trail')) $n--;
+		if (!check_table($pref, 'currencies', 'auto_update')) $n--;
+		if (!check_table($pref, 'stock_master','no_sale')) $n--;
+		if (!check_table($pref, 'suppliers', 'supp_ref')) $n--;
+		if (!check_table($pref, 'users', 'role_id')) $n--;
+		if (!check_table($pref, 'sales_orders', 'reference')) $n--;
+		return $n == 0 ? true : 14 - $n;
 	}
 };