diff --git a/12.0.Dockerfile b/12.0.Dockerfile index 555dadc43aebc303d4d449fe4b90161630186115..9c642162eaf8314ef6bc70f1358ddd24bc4e83cb 100644 --- a/12.0.Dockerfile +++ b/12.0.Dockerfile @@ -60,10 +60,16 @@ RUN set -x; \ mkdir -p /tmp/oca-repos/ &&\ git clone -b 12.0 --depth 1 https://github.com/OCA/account-financial-reporting.git /tmp/oca-repos/account-financial-reporting &&\ mv /tmp/oca-repos/account-financial-reporting/account_tax_balance /opt/odoo/additional_addons/ &&\ + git clone -b 12.0 --depth 1 https://github.com/OCA/bank-statement-import.git /tmp/oca-repos/bank-statement-import &&\ + mv /tmp/oca-repos/bank-statement-import/account_bank_statement_import_ofx /opt/odoo/additional_addons/ &&\ + git clone -b 12.0 --depth 1 https://github.com/OCA/knowledge.git /tmp/oca-repos/knowledge &&\ + mv /tmp/oca-repos/knowledge/knowledge /tmp/oca-repos/knowledge/document_page /opt/odoo/additional_addons/ &&\ git clone -b 12.0 --depth 1 https://github.com/OCA/partner-contact.git /tmp/oca-repos/partner-contact &&\ mv /tmp/oca-repos/partner-contact/partner_firstname \ /tmp/oca-repos/partner-contact/partner_disable_gravatar \ /opt/odoo/additional_addons/ &&\ + git clone -b 12.0 --depth 1 https://github.com/OCA/server-auth.git /tmp/oca-repos/server-auth &&\ + mv /tmp/oca-repos/server-auth/password_security /opt/odoo/additional_addons/ &&\ git clone -b 12.0 --depth 1 https://github.com/OCA/server-brand.git /tmp/oca-repos/server-brand &&\ mv /tmp/oca-repos/server-brand/disable_odoo_online /opt/odoo/additional_addons/ &&\ git clone -b 12.0 --depth 1 https://github.com/OCA/server-ux.git /tmp/oca-repos/server-ux &&\ @@ -71,7 +77,11 @@ RUN set -x; \ git clone -b 12.0 --depth 1 https://github.com/OCA/social.git /tmp/oca-repos/social &&\ mv /tmp/oca-repos/social/mail_debrand /opt/odoo/additional_addons/ &&\ git clone -b 12.0 --depth 1 https://github.com/OCA/web.git /tmp/oca-repos/web &&\ - mv /tmp/oca-repos/web/web_responsive /tmp/oca-repos/web/web_environment_ribbon /tmp/oca-repos/web/web_timeline /opt/odoo/additional_addons/ &&\ + mv /tmp/oca-repos/web/web_responsive \ + /tmp/oca-repos/web/web_environment_ribbon \ + /tmp/oca-repos/web/web_export_view \ + /tmp/oca-repos/web/web_timeline \ + /opt/odoo/additional_addons/ &&\ rm -rf /tmp/oca-repos/ &&\ find /opt/odoo/additional_addons/*/i18n/ -type f -not -name 'fr.po' -delete &&\ chown -R odoo:odoo /opt/odoo diff --git a/README.md b/README.md index 0a722a836f861c369911950e3dea1e673affbd99..9a622ff6bf77be32df0a14f425e146cccdb765a7 100644 --- a/README.md +++ b/README.md @@ -25,21 +25,25 @@ The following OCA addons are included (in v10.0, and only the ones followed by * - account_tax_balance * - repo: bank-statement-import modules: - - account_bank_statement_import_ofx + - account_bank_statement_import_ofx * - account_bank_statement_import_qif - repo: knowledge modules: - - document_page - - knowledge + - document_page * + - knowledge * - repo: partner-contact modules: - partner_firstname * + - partner_disable_gravatar * + - repo: server-auth (only in v12) + modules: + - password_security - repo: server-tools modules: - date_range (moved to server-ux in v12) - auth_session_timeout - auth_brute_force - - password_security + - password_security (moved to server-auth in v12) - repo: server-brand (only in v12) modules: - disable_odoo_online @@ -53,7 +57,7 @@ The following OCA addons are included (in v10.0, and only the ones followed by * - repo: web modules: - web_environment_ribbon * - - web_export_view + - web_export_view * - web_responsive * - web_timeline * ```