From bd44ba766feaed25cb846a08da12be42f8c2e202 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi=20-=20Le=20Filament?= <remi@le-filament.com> Date: Tue, 21 Dec 2021 14:35:12 +0100 Subject: [PATCH] [ADD] PRs not yet merged --- 14.0.Dockerfile | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/14.0.Dockerfile b/14.0.Dockerfile index 79a174b..e4b818b 100644 --- a/14.0.Dockerfile +++ b/14.0.Dockerfile @@ -49,10 +49,17 @@ RUN set -x; \ git clone -b 14.0 --depth 1 https://github.com/OCA/account-financial-tools.git /tmp/oca-repos/account-financial-tools &&\ mv /tmp/oca-repos/account-financial-tools/account_lock_date_update \ /opt/odoo/additional_addons/ &&\ - # Comment out modules not yet migrated on OCA for v14 - #git clone -b 14.0 --depth 1 https://github.com/OCA/account-invoicing.git /tmp/oca-repos/account-invoicing &&\ - #mv /tmp/oca-repos/account-invoicing/sale_timesheet_invoice_description \ - # /opt/odoo/additional_addons/ &&\ + # Until migrated to OCA (https://github.com/OCA/account-financial-tools/pull/1228) + git clone -b 14-add-account_move_name_sequence --depth 1 https://github.com/akretion/account-financial-tools.git /tmp/oca-repos/account-financial-tools-ak &&\ + mv /tmp/oca-repos/account-financial-tools-ak/account_move_name_sequence \ + /opt/odoo/additional_addons/ &&\ + # Until migration to OCA (https://github.com/OCA/account-invoicing/pull/897) + git clone -b 14.0-mig-sale-timesheet-invoice-description --depth 1 https://github.com/akretion/account-invoicing.git /tmp/oca-repos/account-invoicing-ak &&\ + mv /tmp/oca-repos/account-invoicing-ak/sale_timesheet_invoice_description \ + /opt/odoo/additional_addons/ &&\ + git clone -b 14.0 --depth 1 https://github.com/OCA/account-reconcile.git /tmp/oca-repos/account-reconcile &&\ + mv /tmp/oca-repos/account-reconcile/account_reconciliation_widget \ + /opt/odoo/additional_addons/ &&\ git clone -b 14.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_statement_import \ /tmp/oca-repos/bank-statement-import/account_statement_import_ofx \ -- GitLab