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/process | |
| 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/process')
| -rw-r--r-- | addons/process/__init__.py | 1 | ||||
| -rw-r--r-- | addons/process/process.py | 6 |
2 files changed, 3 insertions, 4 deletions
diff --git a/addons/process/__init__.py b/addons/process/__init__.py index d2169ef4a36..30a81513bf7 100644 --- a/addons/process/__init__.py +++ b/addons/process/__init__.py @@ -20,7 +20,6 @@ ############################################################################## import process -import report # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/process/process.py b/addons/process/process.py index fa7596287a3..09405bfbe67 100644 --- a/addons/process/process.py +++ b/addons/process/process.py @@ -19,9 +19,9 @@ # ############################################################################## -import pooler -import tools -from osv import fields, osv +from openerp import pooler +from openerp import tools +from openerp.osv import fields, osv class Env(dict): |