From c14c618ec91bdf7e65631ce7820f7a25c7deae65 Mon Sep 17 00:00:00 2001
From: Christophe Monniez <moc@odoo.com>
Date: Thu, 22 Sep 2022 08:14:04 +0000
Subject: [PATCH] [FIX] packaging: install productivity apps only in installers

closes odoo/odoo#101043

X-original-commit: 4fadf6b99a7b48a58a612e3d0be3d14a99a60ef5
Signed-off-by: Olivier Dony <odo@odoo.com>
Signed-off-by: Christophe Monniez (moc) <moc@odoo.com>
---
 addons/base_install_request/__init__.py | 2 +-
 debian/odoo.conf                        | 1 +
 setup/rpm/odoo.spec                     | 1 +
 setup/win32/setup.nsi                   | 3 +++
 4 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/addons/base_install_request/__init__.py b/addons/base_install_request/__init__.py
index 33ecafb3b5c..053d9c5a798 100644
--- a/addons/base_install_request/__init__.py
+++ b/addons/base_install_request/__init__.py
@@ -8,7 +8,7 @@ from odoo import api, tools, SUPERUSER_ID
 
 
 def _auto_install_apps(cr, registry):
-    if not tools.config.get('default_productivity_apps', True):
+    if not tools.config.get('default_productivity_apps', False):
         return
     env = api.Environment(cr, SUPERUSER_ID, {})
     env['ir.module.module'].sudo().search([
diff --git a/debian/odoo.conf b/debian/odoo.conf
index c85f59802d3..cd004646d1c 100644
--- a/debian/odoo.conf
+++ b/debian/odoo.conf
@@ -6,3 +6,4 @@ db_port = False
 db_user = odoo
 db_password = False
 ;addons_path = /usr/lib/python3/dist-packages/odoo/addons
+default_productivity_apps = True
diff --git a/setup/rpm/odoo.spec b/setup/rpm/odoo.spec
index 3e198255a93..ea317152338 100644
--- a/setup/rpm/odoo.spec
+++ b/setup/rpm/odoo.spec
@@ -65,6 +65,7 @@ db_port = False
 db_user = $ODOO_USER
 db_password = False
 addons_path = %{python3_sitelib}/odoo/addons
+default_productivity_apps = True
 " > $ODOO_CONFIGURATION_FILE
     chown $ODOO_USER:$ODOO_GROUP $ODOO_CONFIGURATION_FILE
     chmod 0640 $ODOO_CONFIGURATION_FILE
diff --git a/setup/win32/setup.nsi b/setup/win32/setup.nsi
index e0ee0403f84..13dc3ba9417 100644
--- a/setup/win32/setup.nsi
+++ b/setup/win32/setup.nsi
@@ -254,6 +254,9 @@ Section $(TITLE_Odoo_Server) SectionOdoo_Server
         WriteIniStr "$INSTDIR\server\odoo.conf" "options" "pg_path" "$INSTDIR\PostgreSQL\bin"
     ${EndIf}
 
+    # Productivity Apps
+    WriteIniStr "$INSTDIR\server\odoo.conf" "options" "default_productivity_apps" "True"
+     
     DetailPrint "Installing Windows service"
     nsExec::ExecTOLog '"$INSTDIR\python\python.exe" "$INSTDIR\server\odoo-bin" --stop-after-init --logfile "$INSTDIR\server\odoo.log" -s'
     ${If} ${RunningX64}