From 05f376e310dc27d133099ef3a8290d36caec1981 Mon Sep 17 00:00:00 2001 From: Fabien Meghazi Date: Tue, 20 May 2014 22:33:49 +0200 Subject: [PATCH] If no addons-path provided, include the main addons --- openerp/tools/config.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/openerp/tools/config.py b/openerp/tools/config.py index 588c2dedf9f..9a054772695 100644 --- a/openerp/tools/config.py +++ b/openerp/tools/config.py @@ -433,7 +433,9 @@ class configmanager(object): self.options['root_path'] = os.path.abspath(os.path.expanduser(os.path.expandvars(os.path.dirname(openerp.__file__)))) if not self.options['addons_path'] or self.options['addons_path']=='None': - self.options['addons_path'] = os.path.join(self.options['root_path'], 'addons') + base_addons = os.path.join(self.options['root_path'], 'addons') + main_addons = os.path.abspath(os.path.join(self.options['root_path'], '../addons')) + self.options['addons_path'] = '%s,%s' % (base_addons, main_addons) else: self.options['addons_path'] = ",".join( os.path.abspath(os.path.expanduser(os.path.expandvars(x)))