diff options
| author | Raphael Collet <rco@openerp.com> | 2012-12-18 09:59:14 +0100 |
|---|---|---|
| committer | Raphael Collet <rco@openerp.com> | 2012-12-18 09:59:14 +0100 |
| commit | 73980eba5f64c674b0bc366c714a9a38d3bb915a (patch) | |
| tree | fce41f64e3309f05aa0a33eae1395b445c389a41 /addons/base_setup | |
| parent | 57acd22a0077feeae6261aae617ad9ad0a3be36d (diff) | |
| parent | 0cc0dfb8cf8d26c1029d02b7377226809821dc9b (diff) | |
[MERGE] trunk-import-openerp-thu (use strict naming convention when importing openerp stuff)
bzr revid: rco@openerp.com-20121218085914-qzr2upqfxmfbzfsx
Diffstat (limited to 'addons/base_setup')
| -rw-r--r-- | addons/base_setup/base_setup.py | 8 | ||||
| -rw-r--r-- | addons/base_setup/res_config.py | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/addons/base_setup/base_setup.py b/addons/base_setup/base_setup.py index e8e24969f2a..3e7c1d1f846 100644 --- a/addons/base_setup/base_setup.py +++ b/addons/base_setup/base_setup.py @@ -21,10 +21,10 @@ import simplejson import cgi -import pooler -import tools -from osv import fields, osv -from tools.translate import _ +from openerp import pooler +from openerp import tools +from openerp.osv import fields, osv +from openerp.tools.translate import _ from lxml import etree # Specify Your Terminology will move to 'partner' module diff --git a/addons/base_setup/res_config.py b/addons/base_setup/res_config.py index bec7034c023..33c5aa863bf 100644 --- a/addons/base_setup/res_config.py +++ b/addons/base_setup/res_config.py @@ -19,7 +19,7 @@ # ############################################################################## -from osv import osv, fields +from openerp.osv import fields, osv class base_config_settings(osv.osv_memory): _name = 'base.config.settings' |