diff --git a/.travis.yml b/.travis.yml
index d660f89e79d..b4621de8a81 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -342,6 +342,9 @@ script:
php upgrade.php 8.0.0 9.0.0 ignoredbversion > $TRAVIS_BUILD_DIR/upgrade800900.log
php upgrade2.php 8.0.0 9.0.0 > $TRAVIS_BUILD_DIR/upgrade800900-2.log
php step5.php 8.0.0 9.0.0 > $TRAVIS_BUILD_DIR/upgrade800900-3.log
+ php upgrade.php 9.0.0 10.0.0 ignoredbversion > $TRAVIS_BUILD_DIR/upgrade9001000.log
+ php upgrade2.php 9.0.0 10.0.0 > $TRAVIS_BUILD_DIR/upgrade9001000-2.log
+ php step5.php 9.0.0 10.0.0 > $TRAVIS_BUILD_DIR/upgrade9001000-3.log
cd -
set +e
echo
diff --git a/README.md b/README.md
index c38d0ca7dd1..bcff409035f 100644
--- a/README.md
+++ b/README.md
@@ -3,9 +3,9 @@

[](https://houndci.com)
-|6|7|8|develop|
-|----------|----------|----------|----------|
-|||||
+|6|7|8|9|develop|
+|----------|----------|----------|----------|----------|
+||||||
Dolibarr ERP & CRM is a modern software package to manage your organization's activity (contacts, suppliers, invoices, orders, stocks, agenda…).
diff --git a/build/debian/source/include-binaries b/build/debian/source/include-binaries
new file mode 100644
index 00000000000..401eae93712
--- /dev/null
+++ b/build/debian/source/include-binaries
@@ -0,0 +1 @@
+htdocs/install/doctemplates/websites/website_template-corporate.zip
\ No newline at end of file
diff --git a/build/perl/virtualmin/dolibarr.pl b/build/perl/virtualmin/dolibarr.pl
index 589e2a3f55c..a28fc430caa 100644
--- a/build/perl/virtualmin/dolibarr.pl
+++ b/build/perl/virtualmin/dolibarr.pl
@@ -30,7 +30,7 @@ return "Regis Houssin";
# script_dolibarr_versions()
sub script_dolibarr_versions
{
-return ( "7.0.0", "6.0.5", "5.0.7" );
+return ( "9.0.0", "8.0.3", "7.0.4", "6.0.8", "5.0.7" );
}
sub script_dolibarr_release
@@ -263,15 +263,16 @@ if ($upgrade) {
local @params = ( [ "action", "upgrade" ],
[ "versionfrom", $upgrade->{'version'} ],
[ "versionto", $ver ],
+ [ "installlock", "444" ],
);
local $p = $ver >= 3.8 ? "step5" : "etape5";
local $err = &call_dolibarr_wizard_page(\@params, $p, $d, $opts);
return (-1, "Dolibarr wizard failed : $err") if ($err);
- # Remove the installation directory.
- local $dinstall = "$opts->{'dir'}/install";
- $dinstall =~ s/\/$//;
- $out = &run_as_domain_user($d, "rm -rf ".quotemeta($dinstall));
+ # Remove the installation directory. (deprecated)
+ # local $dinstall = "$opts->{'dir'}/install";
+ # $dinstall =~ s/\/$//;
+ # $out = &run_as_domain_user($d, "rm -rf ".quotemeta($dinstall));
}
else {
@@ -306,15 +307,18 @@ else {
[ "login", "admin" ],
[ "pass", $dompass ],
[ "pass_verif", $dompass ],
+ [ "installlock", "444" ],
);
local $p = $ver >= 3.8 ? "step5" : "etape5";
local $err = &call_dolibarr_wizard_page(\@params, $p, $d, $opts);
return (-1, "Dolibarr wizard failed : $err") if ($err);
- # Remove the installation directory and protect config file.
- local $dinstall = "$opts->{'dir'}/install";
- $dinstall =~ s/\/$//;
- $out = &run_as_domain_user($d, "rm -rf ".quotemeta($dinstall));
+ # Remove the installation directory (deprecated)
+ # local $dinstall = "$opts->{'dir'}/install";
+ # $dinstall =~ s/\/$//;
+ # $out = &run_as_domain_user($d, "rm -rf ".quotemeta($dinstall));
+
+ # Protect config file
&set_permissions_as_domain_user($d, 0644, $cfile);
&set_permissions_as_domain_user($d, 0755, $cfiledir);
}
@@ -386,6 +390,8 @@ sub script_dolibarr_check_latest
{
local ($ver) = @_;
local @vers = &osdn_package_versions("dolibarr",
+ $ver >= 9.0 ? "dolibarr\\-(9\\.0\\.[0-9\\.]+)\\.tgz" :
+ $ver >= 8.0 ? "dolibarr\\-(8\\.0\\.[0-9\\.]+)\\.tgz" :
$ver >= 7.0 ? "dolibarr\\-(7\\.0\\.[0-9\\.]+)\\.tgz" :
$ver >= 6.0 ? "dolibarr\\-(6\\.0\\.[0-9\\.]+)\\.tgz" :
$ver >= 5.0 ? "dolibarr\\-(5\\.0\\.[0-9\\.]+)\\.tgz" :
diff --git a/dev/resources/dbmodel/dolibarr.uml b/dev/resources/dbmodel/dolibarr.uml
deleted file mode 100644
index 57078d6668b..00000000000
--- a/dev/resources/dbmodel/dolibarr.uml
+++ /dev/null
@@ -1,12 +0,0 @@
-
-