Skip to content

Commit 4fadf6b

Browse files
committed
[FIX] packaging: install productivity apps only in installers
closes odoo#100964 Signed-off-by: Olivier Dony <odo@odoo.com>
1 parent 5976e19 commit 4fadf6b

File tree

4 files changed

+6
-1
lines changed

4 files changed

+6
-1
lines changed

addons/base_install_request/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99

1010
def _auto_install_apps(cr, registry):
11-
if not tools.config.get('default_productivity_apps', True):
11+
if not tools.config.get('default_productivity_apps', False):
1212
return
1313
env = api.Environment(cr, SUPERUSER_ID, {})
1414
env['ir.module.module'].sudo().search([

debian/odoo.conf

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,3 +6,4 @@ db_port = False
66
db_user = odoo
77
db_password = False
88
;addons_path = /usr/lib/python3/dist-packages/odoo/addons
9+
default_productivity_apps = True

setup/rpm/odoo.spec

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,7 @@ db_port = False
6565
db_user = $ODOO_USER
6666
db_password = False
6767
addons_path = %{python3_sitelib}/odoo/addons
68+
default_productivity_apps = True
6869
" > $ODOO_CONFIGURATION_FILE
6970
chown $ODOO_USER:$ODOO_GROUP $ODOO_CONFIGURATION_FILE
7071
chmod 0640 $ODOO_CONFIGURATION_FILE

setup/win32/setup.nsi

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -254,6 +254,9 @@ Section $(TITLE_Odoo_Server) SectionOdoo_Server
254254
WriteIniStr "$INSTDIR\server\odoo.conf" "options" "pg_path" "$INSTDIR\PostgreSQL\bin"
255255
${EndIf}
256256

257+
# Productivity Apps
258+
WriteIniStr "$INSTDIR\server\odoo.conf" "options" "default_productivity_apps" "True"
259+
257260
DetailPrint "Installing Windows service"
258261
nsExec::ExecTOLog '"$INSTDIR\python\python.exe" "$INSTDIR\server\odoo-bin" --stop-after-init --logfile "$INSTDIR\server\odoo.log" -s'
259262
${If} ${RunningX64}

0 commit comments

Comments
 (0)