From 00a12ea9882ca7ca1e7b0bcee311f15c0a78a2b6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9mi=20-=20Le=20Filament?= <remi@le-filament.com>
Date: Wed, 8 Feb 2023 14:42:05 +0100
Subject: [PATCH] [ADD] OCA module mail_debrand

---
 16.0-scratch.Dockerfile | 11 +++++------
 16.0.Dockerfile         |  6 +++---
 2 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/16.0-scratch.Dockerfile b/16.0-scratch.Dockerfile
index 1e50316..9d75ea0 100644
--- a/16.0-scratch.Dockerfile
+++ b/16.0-scratch.Dockerfile
@@ -142,13 +142,12 @@ RUN mkdir -p \
         /tmp/oca-repos/server-ux \
     && mv /tmp/oca-repos/server-ux/server_action_mass_edit \
         /newroot/opt/odoo/additional_addons/ \
-#    && git clone -b 16.0 --depth 1 \
-#        https://github.com/OCA/social.git \
-#        /tmp/oca-repos/social \
-#    && mv /tmp/oca-repos/social/base_search_mail_content \
-#        /tmp/oca-repos/social/mail_debrand \ # https://github.com/OCA/social/pull/1021
+    && git clone -b 16.0 --depth 1 \
+        https://github.com/OCA/social.git \
+        /tmp/oca-repos/social \
+    && mv /tmp/oca-repos/social/mail_debrand \
 #        /tmp/oca-repos/social/mail_tracking \ # https://github.com/OCA/social/pull/1029
-#        /newroot/opt/odoo/additional_addons/ \
+        /newroot/opt/odoo/additional_addons/ \
     && git clone -b 16.0 --depth 1 \
         https://github.com/OCA/web.git \
         /tmp/oca-repos/web \
diff --git a/16.0.Dockerfile b/16.0.Dockerfile
index 37dd360..0968b12 100644
--- a/16.0.Dockerfile
+++ b/16.0.Dockerfile
@@ -115,10 +115,10 @@ RUN set -x; \
         git clone -b 16.0 --depth 1 https://github.com/OCA/server-ux.git /tmp/oca-repos/server-ux &&\
         mv /tmp/oca-repos/server-ux/server_action_mass_edit \
            /opt/odoo/additional_addons/ &&\
-#        git clone -b 16.0 --depth 1 https://github.com/OCA/social.git /tmp/oca-repos/social &&\
-#        mv /tmp/oca-repos/social/mail_debrand \ # https://github.com/OCA/social/pull/1021
+        git clone -b 16.0 --depth 1 https://github.com/OCA/social.git /tmp/oca-repos/social &&\
+        mv /tmp/oca-repos/social/mail_debrand \ 
 #           /tmp/oca-repos/social/mail_tracking \ # https://github.com/OCA/social/pull/1029
-#           /opt/odoo/additional_addons/ &&\
+           /opt/odoo/additional_addons/ &&\
         git clone -b 16.0 --depth 1 https://github.com/OCA/web.git /tmp/oca-repos/web &&\
         mv /tmp/oca-repos/web/web_environment_ribbon \
 #           /tmp/oca-repos/web/web_responsive \
-- 
GitLab