diff options
| author | Thibault Delavallée <tde@openerp.com> | 2012-12-21 11:03:20 +0100 |
|---|---|---|
| committer | Thibault Delavallée <tde@openerp.com> | 2012-12-21 11:03:20 +0100 |
| commit | 5b3fc4061ba0c84f7e0ff466c4d7025f9cfa44e9 (patch) | |
| tree | d07f2c5bb9ec0ce018b824f91caa5f6f1da9c090 /openerp/modules/__init__.py | |
| parent | 919c0d1152ba869af49e4d9186698d35dbb89541 (diff) | |
| parent | 73cb6d5321cc71d85456e6f6e61fc34b79b95c16 (diff) | |
[MERGE] Sync with trunk.
bzr revid: tde@openerp.com-20121221100320-ntn6zsdcqlvz52xn
Diffstat (limited to 'openerp/modules/__init__.py')
| -rw-r--r-- | openerp/modules/__init__.py | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/openerp/modules/__init__.py b/openerp/modules/__init__.py index 56265e353a2..feaf014f568 100644 --- a/openerp/modules/__init__.py +++ b/openerp/modules/__init__.py @@ -3,7 +3,7 @@ # # OpenERP, Open Source Management Solution # Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>). -# Copyright (C) 2010-2011 OpenERP s.a. (<http://openerp.com>). +# Copyright (C) 2010-2012 OpenERP s.a. (<http://openerp.com>). # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as @@ -32,7 +32,8 @@ from openerp.modules.module import \ load_information_from_description_file, \ get_module_resource, zip_directory, \ get_module_path, initialize_sys_path, \ - load_openerp_module, init_module_models + load_openerp_module, init_module_models, \ + adapt_version from openerp.modules.loading import load_modules |