pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[MERGE] forward port branch saas-6 up to 4f462f9

Browse Source
This commit is contained in:
Christophe Simonis
2016-10-28 15:38:03 +02:00
parent eb326e669e 4f462f92f3
commit f76f456019
2 changed files with 7 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/calendar/calendar.py
+2 -2
View File
@@ -1316,8 +1316,8 @@ class calendar_event(osv.Model):
data['rrule_type'] = 'weekly' data['rrule_type'] = 'weekly'
#repeat monthly by nweekday ((weekday, weeknumber), ) #repeat monthly by nweekday ((weekday, weeknumber), )
if r._bynweekday: if r._bynweekday:
data['week_list'] = day_list[r._bynweekday[0][0]].upper() data['week_list'] = day_list[list(r._bynweekday)[0][0]].upper()
data['byday'] = str(r._bynweekday[0][1]) data['byday'] = str(list(r._bynweekday)[0][1])
data['month_by'] = 'day' data['month_by'] = 'day'
data['rrule_type'] = 'monthly' data['rrule_type'] = 'monthly'
openerp/tools/config.py
+5 -9
View File
@@ -111,7 +111,7 @@ class configmanager(object):
group.add_option("--addons-path", dest="addons_path", group.add_option("--addons-path", dest="addons_path",
help="specify additional addons paths (separated by commas).", help="specify additional addons paths (separated by commas).",
action="callback", callback=self._check_addons_path, nargs=1, type="string") action="callback", callback=self._check_addons_path, nargs=1, type="string")
group.add_option("--load", dest="server_wide_modules", help="Comma-separated list of server-wide modules. Default is 'web,web_kanban'") group.add_option("--load", dest="server_wide_modules", help="Comma-separated list of server-wide modules.", my_default='web,web_kanban')
group.add_option("-D", "--data-dir", dest="data_dir", my_default=_get_default_datadir(), group.add_option("-D", "--data-dir", dest="data_dir", my_default=_get_default_datadir(),
help="Directory where to store Odoo data") help="Directory where to store Odoo data")
@@ -356,6 +356,9 @@ class configmanager(object):
# the same for the pidfile # the same for the pidfile
if self.options['pidfile'] in ('None', 'False'): if self.options['pidfile'] in ('None', 'False'):
self.options['pidfile'] = False self.options['pidfile'] = False
# and the server_wide_modules
if self.options['server_wide_modules'] in ('', 'None', 'False'):
self.options['server_wide_modules'] = 'web,web_kanban'
# if defined dont take the configfile value even if the defined value is None # if defined dont take the configfile value even if the defined value is None
keys = ['xmlrpc_interface', 'xmlrpc_port', 'longpolling_port', keys = ['xmlrpc_interface', 'xmlrpc_port', 'longpolling_port',
@@ -441,20 +444,13 @@ class configmanager(object):
if len(self.options['language']) > 5: if len(self.options['language']) > 5:
raise Exception('ERROR: The Lang name must take max 5 chars, Eg: -lfr_BE') raise Exception('ERROR: The Lang name must take max 5 chars, Eg: -lfr_BE')
# server_wide_modules defaults to web,web_kanban if empty or unset
server_wide_modules = self.options['server_wide_modules'] = (
self.options['server_wide_modules']
if self.options['server_wide_modules']
else 'web,web_kanban'
)
if opt.save: if opt.save:
self.save() self.save()
openerp.conf.addons_paths = self.options['addons_path'].split(',') openerp.conf.addons_paths = self.options['addons_path'].split(',')
openerp.conf.server_wide_modules = [ openerp.conf.server_wide_modules = [
m.strip() for m in server_wide_modules.split(',') m.strip() for m in self.options['server_wide_modules'].split(',') if m.strip()
] ]
def _is_addons_path(self, path): def _is_addons_path(self, path):