diff --git a/README.md b/README.md
index f22b95a..6755ed4 100644
--- a/README.md
+++ b/README.md
@@ -5,7 +5,7 @@ It shall NOT be edited by hand.
# Dolibarr for YunoHost
-[](https://dash.yunohost.org/appci/app/dolibarr)  
+[](https://dash.yunohost.org/appci/app/dolibarr)  
[](https://install-app.yunohost.org/?app=dolibarr)
*[Lire ce readme en français.](./README_fr.md)*
@@ -17,32 +17,33 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in
Dolibarr ERP & CRM is a modern software for managing your professional or associative activity (contacts, invoices, orders, stocks, agenda, etc.).
-**Shipped version:** 14.0.5~ynh1
+**Shipped version:** 15.0.2~ynh1
**Demo:** https://www.dolibarr.org/onlinedemo
## Screenshots
-
+
## Documentation and resources
-* Official app website: https://www.dolibarr.org/
-* Official user documentation: https://www.dolibarr.org/#features
-* Official admin documentation: https://www.dolibarr.org/documentation-home
-* Upstream app code repository: https://github.com/Dolibarr/dolibarr
-* YunoHost documentation for this app: https://yunohost.org/app_dolibarr
-* Report a bug: https://github.com/YunoHost-Apps/dolibarr_ynh/issues
+* Official app website:
+* Official user documentation:
+* Official admin documentation:
+* Upstream app code repository:
+* YunoHost documentation for this app:
+* Report a bug:
## Developer info
Please send your pull request to the [testing branch](https://github.com/YunoHost-Apps/dolibarr_ynh/tree/testing).
To try the testing branch, please proceed like that.
-```
+
+``` bash
sudo yunohost app install https://github.com/YunoHost-Apps/dolibarr_ynh/tree/testing --debug
or
sudo yunohost app upgrade dolibarr -u https://github.com/YunoHost-Apps/dolibarr_ynh/tree/testing --debug
```
-**More info regarding app packaging:** https://yunohost.org/packaging_apps
\ No newline at end of file
+**More info regarding app packaging:**
diff --git a/README_fr.md b/README_fr.md
index 9910ce1..775a6b7 100644
--- a/README_fr.md
+++ b/README_fr.md
@@ -1,10 +1,14 @@
+
+
# Dolibarr pour YunoHost
-[](https://dash.yunohost.org/appci/app/dolibarr)  
+[](https://dash.yunohost.org/appci/app/dolibarr)  
[](https://install-app.yunohost.org/?app=dolibarr)
*[Read this readme in english.](./README.md)*
-*[Lire ce readme en français.](./README_fr.md)*
> *Ce package vous permet d'installer Dolibarr rapidement et simplement sur un serveur YunoHost.
Si vous n'avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour savoir comment l'installer et en profiter.*
@@ -13,32 +17,33 @@ Si vous n'avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour
Dolibarr ERP & CRM est un logiciel moderne de gestion de votre activité professionnelle ou associative (contacts, factures, commandes, stocks, agenda, etc.).
-**Version incluse :** 14.0.5~ynh1
+**Version incluse :** 15.0.2~ynh1
**Démo :** https://www.dolibarr.org/onlinedemo
## Captures d'écran
-
+
## Documentations et ressources
-* Site officiel de l'app : https://www.dolibarr.org/
-* Documentation officielle utilisateur : https://www.dolibarr.org/#features
-* Documentation officielle de l'admin : https://www.dolibarr.org/documentation-home
-* Dépôt de code officiel de l'app : https://github.com/Dolibarr/dolibarr
-* Documentation YunoHost pour cette app : https://yunohost.org/app_dolibarr
-* Signaler un bug : https://github.com/YunoHost-Apps/dolibarr_ynh/issues
+* Site officiel de l'app :
+* Documentation officielle utilisateur :
+* Documentation officielle de l'admin :
+* Dépôt de code officiel de l'app :
+* Documentation YunoHost pour cette app :
+* Signaler un bug :
## Informations pour les développeurs
Merci de faire vos pull request sur la [branche testing](https://github.com/YunoHost-Apps/dolibarr_ynh/tree/testing).
Pour essayer la branche testing, procédez comme suit.
-```
+
+``` bash
sudo yunohost app install https://github.com/YunoHost-Apps/dolibarr_ynh/tree/testing --debug
ou
sudo yunohost app upgrade dolibarr -u https://github.com/YunoHost-Apps/dolibarr_ynh/tree/testing --debug
```
-**Plus d'infos sur le packaging d'applications :** https://yunohost.org/packaging_apps
\ No newline at end of file
+**Plus d'infos sur le packaging d'applications :**
diff --git a/conf/app.src b/conf/app.src
index ac28227..fce0ff3 100644
--- a/conf/app.src
+++ b/conf/app.src
@@ -1,5 +1,5 @@
-SOURCE_URL=https://github.com/Dolibarr/dolibarr/archive/14.0.5.tar.gz
-SOURCE_SUM=31f4c934e484a9582d8867e4170f1f1acd8c41628b059370a6a449eb6e94ae75
+SOURCE_URL=https://github.com/Dolibarr/dolibarr/archive/15.0.2.tar.gz
+SOURCE_SUM=dbba38a039d98283ef5ccb3497ec6a2ed82e20e76d4d430d2515f89d116a72ed
SOURCE_SUM_PRG=sha256sum
SOURCE_FORMAT=tar.gz
SOURCE_IN_SUBDIR=true
diff --git a/manifest.json b/manifest.json
index dc09add..0f202e6 100644
--- a/manifest.json
+++ b/manifest.json
@@ -6,7 +6,7 @@
"en": "Manage the various aspects of your business or association",
"fr": "Gérez les différents aspects de votre activité pro ou associative"
},
- "version": "14.0.5~ynh1",
+ "version": "15.0.2~ynh1",
"url": "https://www.dolibarr.org/",
"upstream": {
"license": "GPL-3.0-or-later",
diff --git a/scripts/install b/scripts/install
index b03b53d..8143e2a 100644
--- a/scripts/install
+++ b/scripts/install
@@ -146,22 +146,30 @@ ynh_script_progression --message="Finalizing installation..." --weight=1
ynh_script_progression --message="Generate fileconf" --weight=1
ynh_local_curl "/install/fileconf.php" \
"testpost=ok"
-
+
+ynh_exec_fully_quiet sleep 5
+
ynh_script_progression --message="installation - step 1" --weight=3
ynh_local_curl "/install/step1.php" \
"testpost=ok" \
"action=set" > /var/log/$app/install1.html
+
+ynh_exec_fully_quiet sleep 5
ynh_script_progression --message="installation - step 2 (may take a while)..." --weight=72
ynh_local_curl "/install/step2.php" \
"testpost=ok" \
"action=set" > /var/log/$app/install2.html
+ynh_exec_fully_quiet sleep 5
+
ynh_script_progression --message="installation - step 4" --weight=3
ynh_local_curl "/install/step4.php" \
"testpost=ok" \
"action=set" > /var/log/$app/install3.html
-
+
+ynh_exec_fully_quiet sleep 5
+
# Generate a random password for the admin user (will be ignored because of LDAP)
password=$(ynh_string_random 8)
@@ -172,6 +180,8 @@ ynh_local_curl "/install/step5.php" \
"pass=$password" \
"pass_verif=$password" > /var/log/$app/install4.html
+ynh_exec_fully_quiet sleep 5
+
ynh_script_progression --message="configuring LDAP" --weight=1
# Populate the LDAP parameters
diff --git a/scripts/upgrade b/scripts/upgrade
index c7075a9..c340445 100755
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -174,13 +174,17 @@ then
else
ynh_print_warn --message="Step 1 upgrading ended with error"
fi
-
+
+ ynh_exec_fully_quiet sleep 5
+
if php$phpversion upgrade2.php $current_version $update_version > /var/log/$app/upgrade2.html; then
ynh_print_info --message="Step 2 upgrading ended successfully"
else
ynh_print_warn --message="Step 2 upgrading ended with error"
fi
-
+
+ ynh_exec_fully_quiet sleep 5
+
charset=$(mysql -ss -N -e "SELECT default_character_set_name FROM information_schema.SCHEMATA WHERE schema_name = '$db_name'")
if [ "$charset" != "utf8" ]
then
@@ -191,7 +195,9 @@ then
ynh_local_curl "/install/repair.php" \
"force_utf8_on_tables=confirmed" > /var/log/$app/repair.html
fi
-
+
+ ynh_exec_fully_quiet sleep 5
+
if php$phpversion step5.php $current_version $update_version > /var/log/$app/upgrade3.html; then
ynh_print_info --message="Step 3 upgrading ended successfully"
else