summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCecile Tonglet <cto@openerp.com>2012-12-17 16:58:19 +0100
committerCecile Tonglet <cto@openerp.com>2012-12-17 16:58:19 +0100
commit6069f954b2d644dc6de96d08adb0bb3fd710917b (patch)
treed51ae26122d58b11a96a826b15224dc4b06b618c
parentbaeefa6952f17d6845773e8c2a7ffc98293c2554 (diff)
[FIX] replace from/import stuffs of openerp stuffs by from/import openerp.stuffs (2)
bzr revid: cto@openerp.com-20121217155819-qgsa31xbzjxwji9x
-rw-r--r--addons/crm_claim/crm_claim.py2
-rw-r--r--addons/crm_helpdesk/crm_helpdesk.py2
-rw-r--r--addons/crm_partner_assign/report/crm_lead_report.py2
-rw-r--r--addons/decimal_precision/__init__.py2
-rw-r--r--addons/document_ftp/ftpserver/abstracted_fs.py5
-rw-r--r--addons/document_webdav/dav_fs.py7
-rw-r--r--addons/project_issue/project_issue.py2
-rw-r--r--addons/project_issue/report/project_issue_report.py2
8 files changed, 9 insertions, 15 deletions
diff --git a/addons/crm_claim/crm_claim.py b/addons/crm_claim/crm_claim.py
index 6d6b2f8a417..20cadeca2f7 100644
--- a/addons/crm_claim/crm_claim.py
+++ b/addons/crm_claim/crm_claim.py
@@ -21,7 +21,7 @@
from openerp.addons.base_status.base_stage import base_stage
import binascii
-from crm import crm
+from openerp.addons.crm import crm
from openerp.osv import fields, osv
import time
from openerp import tools
diff --git a/addons/crm_helpdesk/crm_helpdesk.py b/addons/crm_helpdesk/crm_helpdesk.py
index c8a5aca3292..6b444eab4f4 100644
--- a/addons/crm_helpdesk/crm_helpdesk.py
+++ b/addons/crm_helpdesk/crm_helpdesk.py
@@ -21,7 +21,7 @@
from openerp.addons.base_status.base_state import base_state
from openerp.addons.base_status.base_stage import base_stage
-from crm import crm
+from openerp.addons.crm import crm
from openerp.osv import fields, osv
from openerp import tools
from openerp.tools.translate import _
diff --git a/addons/crm_partner_assign/report/crm_lead_report.py b/addons/crm_partner_assign/report/crm_lead_report.py
index 07b76f34546..2c208131b3a 100644
--- a/addons/crm_partner_assign/report/crm_lead_report.py
+++ b/addons/crm_partner_assign/report/crm_lead_report.py
@@ -21,7 +21,7 @@
from openerp.osv import fields,osv
from openerp import tools
-from crm import crm
+from openerp.addons.crm import crm
AVAILABLE_STATES = [
('draft','Draft'),
diff --git a/addons/decimal_precision/__init__.py b/addons/decimal_precision/__init__.py
index 3eb04e8cf64..ea6c1b4d1ca 100644
--- a/addons/decimal_precision/__init__.py
+++ b/addons/decimal_precision/__init__.py
@@ -20,7 +20,7 @@
##############################################################################
#import decimal_precision
-from openerp.addons.decimal_precision import get_precision
+from decimal_precision import get_precision
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/document_ftp/ftpserver/abstracted_fs.py b/addons/document_ftp/ftpserver/abstracted_fs.py
index 759e2528759..b3fd39bdfcd 100644
--- a/addons/document_ftp/ftpserver/abstracted_fs.py
+++ b/addons/document_ftp/ftpserver/abstracted_fs.py
@@ -9,10 +9,7 @@ import errno
import glob
import fnmatch
-from openerp import pooler
-from openerp import netsvc
-import sql_db
-
+from openerp import pooler, netsvc, sql_db
from openerp.service import security
from openerp.osv import osv
from document.nodes import get_node_context
diff --git a/addons/document_webdav/dav_fs.py b/addons/document_webdav/dav_fs.py
index 3068ee993ce..26b23e2fdbe 100644
--- a/addons/document_webdav/dav_fs.py
+++ b/addons/document_webdav/dav_fs.py
@@ -18,16 +18,13 @@
# along with this program. If not, see <http://www.gnu.org/licenses/>.
#
##############################################################################
-from openerp import pooler
-import sql_db
-
import os
import time
import errno
import re
import openerp
-from openerp import netsvc
+from openerp import pooler, sql_db, netsvc
import urlparse
try:
from pywebdav.lib.constants import COLLECTION # , OBJECT
@@ -42,8 +39,8 @@ except ImportError:
import urllib
-from cache import memoize
from openerp.tools import misc
+from openerp.tools.cache import memoize
from webdav import mk_lock_response
diff --git a/addons/project_issue/project_issue.py b/addons/project_issue/project_issue.py
index 3f60339a4fd..2d31bb97f22 100644
--- a/addons/project_issue/project_issue.py
+++ b/addons/project_issue/project_issue.py
@@ -20,7 +20,7 @@
##############################################################################
from openerp.addons.base_status.base_stage import base_stage
-from crm import crm
+from openerp.addons.crm import crm
from datetime import datetime
from openerp.osv import fields,osv
from openerp.tools.translate import _
diff --git a/addons/project_issue/report/project_issue_report.py b/addons/project_issue/report/project_issue_report.py
index d8cca820dd5..a5eb903a742 100644
--- a/addons/project_issue/report/project_issue_report.py
+++ b/addons/project_issue/report/project_issue_report.py
@@ -22,7 +22,7 @@
from openerp.osv import fields,osv
from openerp import tools
-from crm import crm
+from openerp.addons.crm import crm
AVAILABLE_STATES = [
('draft','Draft'),