[IMP] import: use `openerp.addons.<module>` instead of `<module>` with __import__.

bzr revid: vmt@openerp.com-20120109131205-6j78jiw4gxxod1s4

diff --git a/addons/mail/wizard/mail_compose_message.py b/addons/mail/wizard/mail_compose_message.py
index f5906d2..2c554c5 100644 (file)
--- a/addons/mail/wizard/mail_compose_message.py
+++ b/addons/mail/wizard/mail_compose_message.py
@@ -22,13 +22,14 @@
 import re
 
 import tools
-from mail.mail_message import to_email
 from osv import osv
 from osv import fields
 from tools.safe_eval import safe_eval as eval
 from tools.safe_eval import literal_eval
 from tools.translate import _
 
+from ..mail_message import to_email
+
 # main mako-like expression pattern
 EXPRESSION_PATTERN = re.compile('(\$\{.+?\})')
 

diff --git a/addons/project/project.py b/addons/project/project.py
index aabea22..dbd209a 100644 (file)
--- a/addons/project/project.py
+++ b/addons/project/project.py
@@ -25,7 +25,7 @@ from datetime import datetime, date
 
 from tools.translate import _
 from osv import fields, osv
-from resource.faces import task as Task
+from openerp.addons.resource.faces import task as Task
 
 # I think we can remove this in v6.1 since VMT's improvements in the framework ?
 #class project_project(osv.osv):
@@ -316,7 +316,7 @@ class project(osv.osv):
 
         resource_pool = self.pool.get('resource.resource')
 
-        result = "from resource.faces import *\n"
+        result = "from openerp.addons.resource.faces import *\n"
         result += "import datetime\n"
         for project in self.browse(cr, uid, ids, context=context):
             u_ids = [i.id for i in project.members]