From 439914840dbd4ea6a8911d0ba9fb4add470f7dfc Mon Sep 17 00:00:00 2001
From: remi-filament <30716308+remi-filament@users.noreply.github.com>
Date: Fri, 28 Feb 2020 10:11:21 +0100
Subject: [PATCH] Modules were incorrectly assigned to partner-contact iso
 sale-workflow

---
 12.0.Dockerfile | 8 +++++---
 README.md       | 6 ++++--
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/12.0.Dockerfile b/12.0.Dockerfile
index e4c95cd..2a08a0d 100644
--- a/12.0.Dockerfile
+++ b/12.0.Dockerfile
@@ -74,10 +74,8 @@ RUN set -x; \
         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_contact_sale_info_propagation \
-           /tmp/oca-repos/partner-contact/partner_disable_gravatar \
+        mv /tmp/oca-repos/partner-contact/partner_disable_gravatar \
            /tmp/oca-repos/partner-contact/partner_firstname \
-           /tmp/oca-repos/partner-contact/partner_prospect \
            /opt/odoo/additional_addons/ &&\
         git clone -b 12.0 --depth 1 https://github.com/OCA/project.git /tmp/oca-repos/project &&\
         mv /tmp/oca-repos/project/project_category \
@@ -86,6 +84,10 @@ RUN set -x; \
            /tmp/oca-repos/project/project_template \
            /tmp/oca-repos/project/project_timeline \
            /opt/odoo/additional_addons/ &&\
+        git clone -b 12.0 --depth 1 https://github.com/OCA/sale-workflow.git /tmp/oca-repos/sale-workflow &&\
+        mv /tmp/oca-repos/sale-workflow/partner_contact_sale_info_propagation \
+           /tmp/oca-repos/sale-workflow/partner_prospect \
+           /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/auth_session_timeout \
            /tmp/oca-repos/server-auth/password_security \
diff --git a/README.md b/README.md
index 85f35f6..4639201 100644
--- a/README.md
+++ b/README.md
@@ -38,10 +38,8 @@ The following OCA addons are included (in v12.0):
      - knowledge
   - repo: partner-contact
     modules:
-     - partner_contact_sale_info_propagation
      - partner_disable_gravatar
      - partner_firstname
-     - partner_prospect
   - repo: project
     modules:
      - project_category
@@ -49,6 +47,10 @@ The following OCA addons are included (in v12.0):
      - project_task_default_stage
      - project_template
      - project_timeline
+  - repo: sale-workflow
+    modules:
+     - partner_contact_sale_info_propagation
+     - partner_prospect
   - repo: server-auth
     modules:
      - auth_session_timeout
-- 
GitLab