[MERGE] Sync wirth trunk.

bzr revid: tde@openerp.com-20121218093241-y0id5g1r1k6yok42

1 files changed, 8 insertions, 7 deletions

diff --git a/addons/project/project.py b/addons/project/project.py
index a3a4567800f..817258bba07 100644
--- a/addons/project/project.py
+++ b/addons/project/project.py
@@ -19,16 +19,17 @@
 #
 ##############################################################################
 
-import time
-from lxml import etree
 from datetime import datetime, date
+from lxml import etree
+import time
 
-import tools
-from base_status.base_stage import base_stage
-from osv import fields, osv
-from openerp.addons.resource.faces import task as Task
-from tools.translate import _
 from openerp import SUPERUSER_ID
+from openerp import tools
+from openerp.osv import fields, osv
+from openerp.tools.translate import _
+
+from openerp.addons.base_status.base_stage import base_stage
+from openerp.addons.resource.faces import task as Task
 
 _TASK_STATE = [('draft', 'New'),('open', 'In Progress'),('pending', 'Pending'), ('done', 'Done'), ('cancelled', 'Cancelled')]