diff options
| author | Christophe Simonis <chs@odoo.com> | 2017-04-24 12:53:34 +0200 |
|---|---|---|
| committer | Christophe Simonis <chs@odoo.com> | 2017-04-24 12:53:34 +0200 |
| commit | 64b7d4e8a8df180bc598e2df56992d373e23b44b (patch) | |
| tree | e5683925601ffc151d185b374cd8b4a713d23def /odoo | |
| parent | 7350a50a2eb41f8df595b4791edfe5ee3f06de63 (diff) | |
| parent | 3f6e573c67a2ef6cbaf9bbeda1d0a2f286809266 (diff) | |
[MERGE] forward port branch 10.0 up to 3f6e573c67a
Diffstat (limited to 'odoo')
| -rw-r--r-- | odoo/addons/base/module/module_data.xml | 2 | ||||
| -rw-r--r-- | odoo/cli/start.py | 3 | ||||
| -rw-r--r-- | odoo/models.py | 2 |
3 files changed, 5 insertions, 2 deletions
diff --git a/odoo/addons/base/module/module_data.xml b/odoo/addons/base/module/module_data.xml index 7781aa38bdc..a8e74724bd5 100644 --- a/odoo/addons/base/module/module_data.xml +++ b/odoo/addons/base/module/module_data.xml @@ -208,7 +208,7 @@ </record> <record id="group_partner_manager" model="res.groups"> - <field name="category_id" ref="module_category_extra"/> + <field name="category_id" ref="module_category_usability"/> </record> </data> diff --git a/odoo/cli/start.py b/odoo/cli/start.py index 043c411ad8d..bf15776295b 100644 --- a/odoo/cli/start.py +++ b/odoo/cli/start.py @@ -35,6 +35,9 @@ class Start(Command): args, unknown = parser.parse_known_args(args=cmdargs) + # When in a virtualenv, by default use it's path rather than the cwd + if args.path == '.' and os.environ.get('VIRTUAL_ENV'): + args.path = os.environ.get('VIRTUAL_ENV') project_path = os.path.abspath(os.path.expanduser(os.path.expandvars(args.path))) module_root = get_module_root(project_path) db_name = None diff --git a/odoo/models.py b/odoo/models.py index 56923cd1558..8d326925325 100644 --- a/odoo/models.py +++ b/odoo/models.py @@ -1855,7 +1855,7 @@ class BaseModel(object): if ftype == 'many2one': value = value[0] elif ftype in ('date', 'datetime'): - locale = self._context.get('lang', 'en_US') + locale = self._context.get('lang') or 'en_US' fmt = DEFAULT_SERVER_DATETIME_FORMAT if ftype == 'datetime' else DEFAULT_SERVER_DATE_FORMAT tzinfo = None range_start = value |