Merge pull request #3 from YunoHost-Apps/testing

Testing

ALL_README.md

@@ -5,4 +5,5 @@
 - [Irakurri README euskaraz](README_eu.md)
 - [Lire le README en français](README_fr.md)
 - [Le o README en galego](README_gl.md)
+- [Baca README dalam bahasa bahasa Indonesia](README_id.md)
 - [阅读中文（简体）的 README](README_zh_Hans.md)

README.md

@@ -5,7 +5,7 @@ It shall NOT be edited by hand.
 
 # Diacamma for YunoHost
 
-[![Integration level](https://dash.yunohost.org/integration/diacamma.svg)](https://dash.yunohost.org/appci/app/diacamma) ![Working status](https://ci-apps.yunohost.org/ci/badges/diacamma.status.svg) ![Maintenance status](https://ci-apps.yunohost.org/ci/badges/diacamma.maintain.svg)
+[![Integration level](https://dash.yunohost.org/integration/diacamma.svg)](https://ci-apps.yunohost.org/ci/apps/diacamma/) ![Working status](https://ci-apps.yunohost.org/ci/badges/diacamma.status.svg) ![Maintenance status](https://ci-apps.yunohost.org/ci/badges/diacamma.maintain.svg)
 
 [![Install Diacamma with YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=diacamma)
 
@@ -45,7 +45,7 @@ _Diacamma Syndic_ allows voluntary trustees to simply manage their co-ownership.
  
 
 
-**Shipped version:** 23.12.18.10~ynh1
+**Shipped version:** 24.07.26.11~ynh1
 
 **Demo:** <https://asso.diacamma.org>
 

README_es.md

@@ -5,7 +5,7 @@ No se debe editar a mano.
 
 # Diacamma para Yunohost
 
-[![Nivel de integración](https://dash.yunohost.org/integration/diacamma.svg)](https://dash.yunohost.org/appci/app/diacamma) ![Estado funcional](https://ci-apps.yunohost.org/ci/badges/diacamma.status.svg) ![Estado En Mantención](https://ci-apps.yunohost.org/ci/badges/diacamma.maintain.svg)
+[![Nivel de integración](https://dash.yunohost.org/integration/diacamma.svg)](https://ci-apps.yunohost.org/ci/apps/diacamma/) ![Estado funcional](https://ci-apps.yunohost.org/ci/badges/diacamma.status.svg) ![Estado En Mantención](https://ci-apps.yunohost.org/ci/badges/diacamma.maintain.svg)
 
 [![Instalar Diacamma con Yunhost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=diacamma)
 
@@ -45,7 +45,7 @@ _Diacamma Syndic_ allows voluntary trustees to simply manage their co-ownership.
  
 
 
-**Versión actual:** 23.12.18.10~ynh1
+**Versión actual:** 24.07.26.11~ynh1
 
 **Demo:** <https://asso.diacamma.org>
 

README_eu.md

@@ -5,7 +5,7 @@ EZ editatu eskuz.
 
 # Diacamma YunoHost-erako
 
-[![Integrazio maila](https://dash.yunohost.org/integration/diacamma.svg)](https://dash.yunohost.org/appci/app/diacamma) ![Funtzionamendu egoera](https://ci-apps.yunohost.org/ci/badges/diacamma.status.svg) ![Mantentze egoera](https://ci-apps.yunohost.org/ci/badges/diacamma.maintain.svg)
+[![Integrazio maila](https://dash.yunohost.org/integration/diacamma.svg)](https://ci-apps.yunohost.org/ci/apps/diacamma/) ![Funtzionamendu egoera](https://ci-apps.yunohost.org/ci/badges/diacamma.status.svg) ![Mantentze egoera](https://ci-apps.yunohost.org/ci/badges/diacamma.maintain.svg)
 
 [![Instalatu Diacamma YunoHost-ekin](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=diacamma)
 
@@ -45,7 +45,7 @@ _Diacamma Syndic_ allows voluntary trustees to simply manage their co-ownership.
  
 
 
-**Paketatutako bertsioa:** 23.12.18.10~ynh1
+**Paketatutako bertsioa:** 24.07.26.11~ynh1
 
 **Demoa:** <https://asso.diacamma.org>
 

README_fr.md

@@ -5,7 +5,7 @@ Il NE doit PAS être modifié à la main.
 
 # Diacamma pour YunoHost
 
-[![Niveau d’intégration](https://dash.yunohost.org/integration/diacamma.svg)](https://dash.yunohost.org/appci/app/diacamma) ![Statut du fonctionnement](https://ci-apps.yunohost.org/ci/badges/diacamma.status.svg) ![Statut de maintenance](https://ci-apps.yunohost.org/ci/badges/diacamma.maintain.svg)
+[![Niveau d’intégration](https://dash.yunohost.org/integration/diacamma.svg)](https://ci-apps.yunohost.org/ci/apps/diacamma/) ![Statut du fonctionnement](https://ci-apps.yunohost.org/ci/badges/diacamma.status.svg) ![Statut de maintenance](https://ci-apps.yunohost.org/ci/badges/diacamma.maintain.svg)
 
 [![Installer Diacamma avec YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=diacamma)
 
@@ -45,7 +45,7 @@ _Diacamma Syndic_ permet aux syndics bénévoles de gérer simplement leur copro
  * Ventiler les dépenses de la copropriété sur chacun en fonction de ses tantièmes.
 
 
-**Version incluse :** 23.12.18.10~ynh1
+**Version incluse :** 24.07.26.11~ynh1
 
 **Démo :** <https://asso.diacamma.org>
 

README_gl.md

@@ -5,7 +5,7 @@ NON debe editarse manualmente.
 
 # Diacamma para YunoHost
 
-[![Nivel de integración](https://dash.yunohost.org/integration/diacamma.svg)](https://dash.yunohost.org/appci/app/diacamma) ![Estado de funcionamento](https://ci-apps.yunohost.org/ci/badges/diacamma.status.svg) ![Estado de mantemento](https://ci-apps.yunohost.org/ci/badges/diacamma.maintain.svg)
+[![Nivel de integración](https://dash.yunohost.org/integration/diacamma.svg)](https://ci-apps.yunohost.org/ci/apps/diacamma/) ![Estado de funcionamento](https://ci-apps.yunohost.org/ci/badges/diacamma.status.svg) ![Estado de mantemento](https://ci-apps.yunohost.org/ci/badges/diacamma.maintain.svg)
 
 [![Instalar Diacamma con YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=diacamma)
 
@@ -45,7 +45,7 @@ _Diacamma Syndic_ allows voluntary trustees to simply manage their co-ownership.
  
 
 
-**Versión proporcionada:** 23.12.18.10~ynh1
+**Versión proporcionada:** 24.07.26.11~ynh1
 
 **Demo:** <https://asso.diacamma.org>
 

README_id.md

@@ -0,0 +1,78 @@
+<!--
+N.B.: README ini dibuat secara otomatis oleh <https://github.com/YunoHost/apps/tree/master/tools/readme_generator>
+Ini TIDAK boleh diedit dengan tangan.
+-->
+
+# Diacamma untuk YunoHost
+
+[![Tingkat integrasi](https://dash.yunohost.org/integration/diacamma.svg)](https://ci-apps.yunohost.org/ci/apps/diacamma/) ![Status kerja](https://ci-apps.yunohost.org/ci/badges/diacamma.status.svg) ![Status pemeliharaan](https://ci-apps.yunohost.org/ci/badges/diacamma.maintain.svg)
+
+[![Pasang Diacamma dengan YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=diacamma)
+
+*[Baca README ini dengan bahasa yang lain.](./ALL_README.md)*
+
+> *Paket ini memperbolehkan Anda untuk memasang Diacamma secara cepat dan mudah pada server YunoHost.*  
+> *Bila Anda tidak mempunyai YunoHost, silakan berkonsultasi dengan [panduan](https://yunohost.org/install) untuk mempelajari bagaimana untuk memasangnya.*
+
+## Ringkasan
+
+# Diacamma Introduction
+
+_Diacamma_ is a set of free and open source administrative and financial management software designed and developed for volunteers.
+
+## Diacamma Asso
+
+**Simply manage memberships to your association**
+
+_Diacamma Asso_ allows you to easily classify your current and past members.
+
+ * Have a list of your members with all their contact information.
+ * Manage their contributions by activities and categories.
+ * Easily manage your association events (exams, internships, outings, ...).
+ * Manage the stock of your associative purchasing center.
+ * Link an invoice to your dues and events.
+ 
+## Diacamma Syndic
+
+**Follow the situation of your condo**
+
+_Diacamma Syndic_ allows voluntary trustees to simply manage their co-ownership.
+
+ * Keep an accounting in accordance with the French regulation of condominiums.
+ * Follow the situation of each co-owner.
+ * Create and send calls for funds.
+ * Break down the expenses of the co-ownership on each one according to its parts.
+ 
+
+
+**Versi terkirim:** 24.07.26.11~ynh1
+
+**Demo:** <https://asso.diacamma.org>
+
+## Tangkapan Layar
+
+![Tangkapan Layar pada Diacamma](./doc/screenshots/01_fiche_adherent.png)
+![Tangkapan Layar pada Diacamma](./doc/screenshots/02_situation_coporprietaire.png)
+![Tangkapan Layar pada Diacamma](./doc/screenshots/03_bilan_comptable.png)
+
+## Dokumentasi dan sumber daya
+
+- Website aplikasi resmi: <https://www.diacamma.org>
+- Dokumentasi admin resmi: <https://asso.diacamma.org/Docs>
+- Repositori kode aplikasi hulu: <https://github.com/Diacamma2>
+- Gudang YunoHost: <https://apps.yunohost.org/app/diacamma>
+- Laporkan bug: <https://github.com/YunoHost-Apps/diacamma_ynh/issues>
+
+## Info developer
+
+Silakan kirim pull request ke [`testing` branch](https://github.com/YunoHost-Apps/diacamma_ynh/tree/testing).
+
+Untuk mencoba branch `testing`, silakan dilanjutkan seperti:
+
+```bash
+sudo yunohost app install https://github.com/YunoHost-Apps/diacamma_ynh/tree/testing --debug
+atau
+sudo yunohost app upgrade diacamma -u https://github.com/YunoHost-Apps/diacamma_ynh/tree/testing --debug
+```
+
+**Info lebih lanjut mengenai pemaketan aplikasi:** <https://yunohost.org/packaging_apps>

README_zh_Hans.md

@@ -5,7 +5,7 @@
 
 # YunoHost 上的 Diacamma
 
-[![集成程度](https://dash.yunohost.org/integration/diacamma.svg)](https://dash.yunohost.org/appci/app/diacamma) ![工作状态](https://ci-apps.yunohost.org/ci/badges/diacamma.status.svg) ![维护状态](https://ci-apps.yunohost.org/ci/badges/diacamma.maintain.svg)
+[![集成程度](https://dash.yunohost.org/integration/diacamma.svg)](https://ci-apps.yunohost.org/ci/apps/diacamma/) ![工作状态](https://ci-apps.yunohost.org/ci/badges/diacamma.status.svg) ![维护状态](https://ci-apps.yunohost.org/ci/badges/diacamma.maintain.svg)
 
 [![使用 YunoHost 安装 Diacamma](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=diacamma)
 
@@ -45,7 +45,7 @@ _Diacamma Syndic_ allows voluntary trustees to simply manage their co-ownership.
  
 
 
-**分发版本：** 23.12.18.10~ynh1
+**分发版本：** 24.07.26.11~ynh1
 
 **演示：** <https://asso.diacamma.org>
 

manifest.toml

@@ -6,7 +6,7 @@ name = "Diacamma"
 description.en = "Management application for volunteers (association, condominium)"
 description.fr = "Application de gestion pour les bénévoles (association, copropriété)"
 
-version = "23.12.18.10~ynh1"
+version = "24.07.26.11~ynh1"
 
 maintainers = ["Laurent Gay"]
 

scripts/_common.sh

@@ -45,3 +45,13 @@ function check_params()
     venv/bin/lucterios_admin.py security -n inst-${app} -e "MODE=0"
     popd
 }
+
+
+function update_software()
+{
+    pushd $install_dir
+    venv/bin/lucterios_admin.py check
+    venv/bin/lucterios_admin.py update
+    venv/bin/lucterios_admin.py refreshall
+    popd
+}

scripts/change_url

@@ -44,6 +44,10 @@ extra_json=$(jq -c . /tmp/extra.json)
 venv/bin/lucterios_admin.py modif -n inst-${app} -e ''$extra_json''
 popd
 
+update_software
+
+refresh_collect
+
 #=================================================
 # START SUPERVISOR SERVICE
 #=================================================

scripts/remove

@@ -17,8 +17,6 @@ ynh_remove_nginx_config
 
 ynh_remove_logrotate
 
-ynh_secure_remove --file="/var/log/$app"
-
 #=================================================
 # END OF SCRIPT
 #=================================================

scripts/restore

@@ -38,11 +38,7 @@ ynh_psql_connect_as --user=$db_user --password=$db_pwd --database=$db_name < dbb
 #=================================================
 ynh_script_progression --message="Refresh the app main directory..." --weight=1
 
-pushd $install_dir
+update_software
-venv/bin/lucterios_admin.py check
-venv/bin/lucterios_admin.py update
-venv/bin/lucterios_admin.py refreshall
-popd
 
 refresh_collect
 

scripts/upgrade

@@ -17,11 +17,7 @@ supervisorctl stop ${app}
 #=================================================
 ynh_script_progression --message="Updating Diacamma..."
 
-pushd $install_dir
+update_software
-venv/bin/lucterios_admin.py check
-venv/bin/lucterios_admin.py update
-venv/bin/lucterios_admin.py refreshall
-popd
 
 refresh_collect