diff --git a/.gitmodules b/.gitmodules index f686e44aa56..bcaf8d738a2 100644 --- a/.gitmodules +++ b/.gitmodules @@ -19,3 +19,7 @@ path = odoo/external-src/odoo-cloud-platform url = git@github.com:camptocamp/odoo-cloud-platform.git branch = 10.0 +[submodule "odoo/external-src/sale-workflow"] + path = odoo/external-src/sale-workflow + url = git@github.com:oca/sale-workflow.git + branch = 10.0 diff --git a/odoo/Dockerfile b/odoo/Dockerfile index b16ba915f89..13ab009bde2 100644 --- a/odoo/Dockerfile +++ b/odoo/Dockerfile @@ -18,6 +18,7 @@ ENV ADDONS_PATH="/opt/odoo/external-src/enterprise, \ /opt/odoo/external-src/server-tools, \ /opt/odoo/external-src/odoo-cloud-platform, \ /opt/odoo/external-src/hr, \ + /opt/odoo/external-src/sale-workflow, \ /opt/odoo/external-src/hr-timesheet, \ /opt/odoo/local-src," \ LIMIT_TIME_CPU=86400 \ diff --git a/odoo/external-src/sale-workflow b/odoo/external-src/sale-workflow new file mode 160000 index 00000000000..81b126d6773 --- /dev/null +++ b/odoo/external-src/sale-workflow @@ -0,0 +1 @@ +Subproject commit 81b126d677372768d5f6cb17297c35cc9200c9c6 diff --git a/odoo/pending-merges.yaml b/odoo/pending-merges.yaml index 1cd2fd898d8..99abba68434 100644 --- a/odoo/pending-merges.yaml +++ b/odoo/pending-merges.yaml @@ -11,15 +11,15 @@ # add module account_invoice_bank_selection - oca refs/pull/595/head target: &default_target camptocamp merge-branch-1900-master -# ./external-src/bank-statement-reconcile: -# remotes: -# oca: git@github.com:OCA/bank-statement-reconcile.git -# camptocamp: git@github.com:camptocamp/bank-statement-reconcile.git -# merges: -# - oca 10.0 +./external-src/sale-workflow: + remotes: + oca: git@github.com:OCA/sale-workflow.git + camptocamp: git@github.com:camptocamp/sale-workflow.git + merges: + - oca 10.0 # # port account_mass_reconcile -# - oca refs/pull/136/head + - oca refs/pull/396/head # # port of account_statement_base_import # - oca refs/pull/137/head -# target: *default_target + target: *default_target