From 311454d4c2abd25af80e094e412ae013cdfbc72e Mon Sep 17 00:00:00 2001
From: Regis Houssin <regis@dolibarr.fr>
Date: Sun, 4 Apr 2010 08:15:20 +0000
Subject: [PATCH] =?UTF-8?q?Fix:=20switch=20the=20variables=20"$ver"=20and?=
 =?UTF-8?q?=20=D2$upgrade->{'version'}=D3=20Fix:=20call=20"etape5"=20page?=
 =?UTF-8?q?=20for=20fix=20the=20new=20version?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 build/perl/virtualmin/dolibarr.pl | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/build/perl/virtualmin/dolibarr.pl b/build/perl/virtualmin/dolibarr.pl
index 58be286ee72..6a0c0f5895d 100644
--- a/build/perl/virtualmin/dolibarr.pl
+++ b/build/perl/virtualmin/dolibarr.pl
@@ -209,20 +209,28 @@ if ($upgrade) {
 	
 	# First page (Update database schema)
 	local @params = ( [ "action", "upgrade" ],
-			  [ "versionfrom", $ver ],
-			  [ "versionto", $upgrade->{'version'} ],
+			  [ "versionfrom", $upgrade->{'version'} ],
+			  [ "versionto", $ver ],
 	 		 );
 	local $err = &call_dolibarr_wizard_page(\@params, "upgrade", $d, $opts);
 	return (-1, "Dolibarr wizard failed : $err") if ($err);
 	
 	# Second page (Migrate some data)
 	local @params = ( [ "action", "upgrade" ],
-			  [ "versionfrom", $ver ],
-			  [ "versionto", $upgrade->{'version'} ],
+			  [ "versionfrom", $upgrade->{'version'} ],
+			  [ "versionto", $ver ],
 			 );
 	local $err = &call_dolibarr_wizard_page(\@params, "upgrade2", $d, $opts);
 	return (-1, "Dolibarr wizard failed : $err") if ($err);
 	
+	# Third page (Update version number)
+	local @params = ( [ "action", "upgrade" ],
+			  [ "versionfrom", $upgrade->{'version'} ],
+			  [ "versionto", $ver ],
+			 );
+	local $err = &call_dolibarr_wizard_page(\@params, "etape5", $d, $opts);
+	return (-1, "Dolibarr wizard failed : $err") if ($err);
+	
 	# Remove the installation directory.
 	local $dinstall = "$opts->{'dir'}/install";
 	$dinstall  =~ s/\/$//;