From 0c668b5bbeeb01a6fe0b03a8f0474a16a8f63620 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi=20-=20Le=20Filament?= <remi@le-filament.com> Date: Fri, 15 Nov 2024 09:00:22 +0100 Subject: [PATCH] [UPD] OCA modules with PR --- 18.0.Dockerfile | 82 ++++++++++++++++++++++++++++++++++--------------- 1 file changed, 57 insertions(+), 25 deletions(-) diff --git a/18.0.Dockerfile b/18.0.Dockerfile index 7c25e1f..9874f27 100644 --- a/18.0.Dockerfile +++ b/18.0.Dockerfile @@ -80,59 +80,91 @@ COPY --chown=root:root --chmod=755 ./get_addons /usr/local/bin # Install Odoo OCA default dependencies - Commented modules do not exist yet ARG SAVE_COMMITS_FILENAME='default_addons' -#RUN set -x; \ -# get_addons 'https://github.com/OCA/account-financial-tools' '17.0' 'additional_addons' \ +RUN set -x; \ +# get_addons 'https://github.com/OCA/account-financial-tools' '18.0' 'additional_addons' \ # account_lock_date_update \ # account_move_name_sequence \ # account_usability \ -# && get_addons 'https://github.com/OCA/account-invoicing' '17.0' 'additional_addons' \ + get_addons 'https://github.com/DynAppsNV/account-financial-tools' '18.0-mig-account_move_name_sequence 'additional_addons' \ + account_move_name_sequence \ + && get_addons 'https://github.com/APSL/account-financial-tools' '18.0-mig-account_usability' 'additional_addons' \ + account_usability \ +# && get_addons 'https://github.com/OCA/account-invoicing' '18.0' 'additional_addons' \ # sale_timesheet_invoice_description \ -# && get_addons 'https://github.com/OCA/account-reconcile' '17.0' 'additional_addons' \ +# && get_addons 'https://github.com/OCA/account-reconcile' '18.0' 'additional_addons' \ # account_statement_base \ # account_reconcile_model_oca \ # account_reconcile_oca \ -# && get_addons 'https://github.com/OCA/bank-statement-import' '17.0' 'additional_addons' \ + && get_addons 'https://github.com/xaviedoanhduy/account-reconcile' '18.0-mig-account_statement_base' 'additional_addons' \ + account_statement_base \ + && get_addons 'https://github.com/xaviedoanhduy/account-reconcile' '18.0-mig-account_reconcile_model_oca' 'additional_addons' \ + account_reconcile_oca \ +# && get_addons 'https://github.com/OCA/bank-statement-import' '18.0' 'additional_addons' \ # account_statement_import_base \ # account_statement_import_file \ # account_statement_import_file_reconcile_oca \ # account_statement_import_ofx \ -# && get_addons 'https://github.com/OCA/crm' '17.0' 'additional_addons' \ + && get_addons 'https://github.com/xaviedoanhduy/bank-statement-import' '18.0-mig-account_statement_import_base' 'additional_addons' \ + account_statement_import_base \ + && get_addons 'https://github.com/xaviedoanhduy/bank-statement-import' '18.0-mig-account_statement_import_file' 'additional_addons' \ + account_statement_import_file \ +# && get_addons 'https://github.com/OCA/crm' '18.0' 'additional_addons' \ # crm_stage_probability \ -# && get_addons 'https://github.com/OCA/l10n-france' '17.0' 'additional_addons' \ + && get_addons 'https://github.com/APSL/crm' '18.0-mig-crm_stage_probability' 'additional_addons' \ + crm_stage_probability \ +# && get_addons 'https://github.com/OCA/l10n-france' '18.0' 'additional_addons' \ # l10n_fr_siret \ # l10n_fr_siret_lookup \ -# && get_addons 'https://github.com/OCA/partner-contact' '17.0' 'additional_addons' \ + && get_addons 'https://github.com/apikcloud/l10n-france' '18.0-mig-l10n_fr_siret' 'additional_addons' \ + l10n_fr_siret \ + && get_addons 'https://github.com/apikcloud/l10n-france' '18.0-mig-l10n_fr_siret_lookup' 'additional_addons' \ + l10n_fr_siret_lookup \ +# && get_addons 'https://github.com/OCA/mail' '18.0' 'additional_addons' \ +# mail_debrand \ +# mail_tracking \ + && get_addons 'https://github.com/jdebetaz/oca-mail' '18.0-mig-mail_debrand' 'additional_addons' \ + mail_debrand \ + && get_addons 'https://github.com/trisdoan/mail' '18.0-mig-mail_tracking' 'additional_addons' \ + mail_tracking \ + && get_addons 'https://github.com/OCA/partner-contact' '18.0' 'additional_addons' \ # partner_disable_gravatar \ -# partner_firstname \ -# && get_addons 'https://github.com/OCA/project' '17.0' 'additional_addons' \ + partner_firstname \ +# && get_addons 'https://github.com/OCA/project' '18.0' 'additional_addons' \ # project_task_default_stage \ # project_template \ -# && get_addons 'https://github.com/OCA/server-auth' '17.0' 'additional_addons' \ +# && get_addons 'https://github.com/OCA/server-auth' '18.0' 'additional_addons' \ # password_security \ -# && get_addons 'https://github.com/OCA/server-brand' '17.0' 'additional_addons' \ +# && get_addons 'https://github.com/OCA/server-brand' '18.0' 'additional_addons' \ # disable_odoo_online \ # portal_odoo_debranding \ # remove_odoo_enterprise \ -# && get_addons 'https://github.com/OCA/server-tools' '17.0' 'additional_addons' \ + && get_addons 'https://github.com/Level4Tech/server-brand' '18.0-mig-portal_odoo_debranding' 'additional_addons' \ + portal_odoo_debranding \ + && get_addons 'https://github.com/Level4Tech/server-brand' '18.0-mig-disable_odoo_online' 'additional_addons' \ + disable_odoo_online \ + && get_addons 'https://github.com/Level4Tech/server-brand' '18.0-mig-remove_odoo_enterprise' 'additional_addons' \ + remove_odoo_enterprise \ + && get_addons 'https://github.com/OCA/server-tools' '18.0' 'additional_addons' \ # base_view_inheritance_extension \ -# module_change_auto_install \ -# && get_addons 'https://github.com/OCA/server-ux' '17.0' 'additional_addons' \ + module_change_auto_install \ + && get_addons 'https://github.com/LucasTran380381/server-tools' '18.0-mig-base_view_inheritance_extension' 'additional_addons' \ + base_view_inheritance_extension \ +# && get_addons 'https://github.com/OCA/server-ux' '18.0' 'additional_addons' \ # server_action_mass_edit \ -# && get_addons 'https://github.com/OCA/social' '17.0' 'additional_addons' \ -# mail_debrand \ -# mail_tracking \ -# && get_addons 'https://github.com/OCA/web' '17.0' 'additional_addons' \ -# web_environment_ribbon \ + && get_addons 'https://github.com/trisdoan/server-ux' '18.0-mig-server_action_mass_edit' 'additional_addons' \ + server_action_mass_edit \ + && get_addons 'https://github.com/OCA/web' '18.0' 'additional_addons' \ + web_environment_ribbon \ # web_refresher \ # web_responsive \ # web_no_bubble \ # web_theme_classic \ -# && find /opt/odoo/additional_addons/*/i18n/ -type f -not -name 'fr.po' -delete \ + && find /opt/odoo/additional_addons/*/i18n/ -type f -not -name 'fr.po' -delete \ # Install Le Filament default addons. -# && get_addons 'https://sources.le-filament.com/lefilament/remove_login_links.git' '17.0' 'private_addons/remove_login_links' \ -# && get_addons 'https://sources.le-filament.com/lefilament/lefilament_release_agent.git' '17.0' 'private_addons/lefilament_release_agent' \ -# && echo "info: default addon commits:" \ -# && cat $SAVE_COMMITS_DIR/$SAVE_COMMITS_FILENAME +# && get_addons 'https://sources.le-filament.com/lefilament/remove_login_links.git' '18.0' 'private_addons/remove_login_links' \ +# && get_addons 'https://sources.le-filament.com/lefilament/lefilament_release_agent.git' '18.0' 'private_addons/lefilament_release_agent' \ + && echo "info: default addon commits:" \ + && cat $SAVE_COMMITS_DIR/$SAVE_COMMITS_FILENAME # Copy entrypoint script and Odoo configuration file COPY ./entrypoint.sh / -- GitLab