[MERGE] Sync wirth trunk.

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

10 files changed, 26 insertions, 29 deletions

diff --git a/addons/project/company.py b/addons/project/company.py
index 6400450cd3e..459c24e7b8a 100644
--- a/addons/project/company.py
+++ b/addons/project/company.py
@@ -19,8 +19,8 @@
 #
 ##############################################################################
 
-from osv import fields, osv
-from tools.translate import _
+from openerp.osv import fields, osv
+from openerp.tools.translate import _
 
 class res_company(osv.osv):
     _inherit = 'res.company'
diff --git a/addons/project/i18n/es.po b/addons/project/i18n/es.po
index fb65effb13b..1f8835a4552 100644
--- a/addons/project/i18n/es.po
+++ b/addons/project/i18n/es.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-12-03 16:02+0000\n"
-"PO-Revision-Date: 2012-12-14 18:26+0000\n"
-"Last-Translator: Pedro Manuel Baeza <pedro.baeza@gmail.com>\n"
+"PO-Revision-Date: 2012-12-17 15:16+0000\n"
+"Last-Translator: Guillermo Bisheimer <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-15 05:04+0000\n"
+"X-Launchpad-Export-Date: 2012-12-18 04:59+0000\n"
 "X-Generator: Launchpad (build 16372)\n"
 
 #. module: project
@@ -103,7 +103,7 @@ msgstr "Tarea realizada"
 #. module: project
 #: model:process.node,note:project.process_node_donetask0
 msgid "Task is Completed"
-msgstr "Tarea es completada"
+msgstr "Tarea completada"
 
 #. module: project
 #: view:res.partner:0
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')]
 
diff --git a/addons/project/project_data.xml b/addons/project/project_data.xml
index 4d4ead3e90e..2fcb49c3894 100644
--- a/addons/project/project_data.xml
+++ b/addons/project/project_data.xml
@@ -64,14 +64,14 @@
             <field name="fold" eval="True"/>
         </record>
         <record id="project_tt_deployment" model="project.task.type">
-            <field name="sequence">6</field>
+            <field name="sequence">100</field>
             <field name="name">Done</field>
             <field name="state">done</field>
             <field name="case_default" eval="True"/>
             <field name="fold" eval="True"/>
         </record>
         <record id="project_tt_cancel" model="project.task.type">
-            <field name="sequence">7</field>
+            <field name="sequence">200</field>
             <field name="name">Cancelled</field>
             <field name="state">cancelled</field>
             <field name="case_default" eval="True"/>
diff --git a/addons/project/report/project_report.py b/addons/project/report/project_report.py
index f3055727d5e..8e7dca059f9 100644
--- a/addons/project/report/project_report.py
+++ b/addons/project/report/project_report.py
@@ -19,8 +19,8 @@
 #
 ##############################################################################
 
-from osv import fields,osv
-import tools
+from openerp.osv import fields,osv
+from openerp import tools
 
 class report_project_task_user(osv.osv):
     _name = "report.project.task.user"
diff --git a/addons/project/res_config.py b/addons/project/res_config.py
index 85b4bd7001b..2604ebde732 100644
--- a/addons/project/res_config.py
+++ b/addons/project/res_config.py
@@ -19,8 +19,8 @@
 #
 ##############################################################################
 
-from osv import osv, fields
-from tools.translate import _
+from openerp.osv import fields, osv
+from openerp.tools.translate import _
 
 class project_configuration(osv.osv_memory):
     _name = 'project.config.settings'
diff --git a/addons/project/res_partner.py b/addons/project/res_partner.py
index 3e2ff83f078..97fca8c459f 100644
--- a/addons/project/res_partner.py
+++ b/addons/project/res_partner.py
@@ -19,7 +19,7 @@
 #
 ##############################################################################
 
-from osv import fields,osv
+from openerp.osv import fields,osv
 
 class res_partner(osv.osv):
 
diff --git a/addons/project/static/src/css/project.css b/addons/project/static/src/css/project.css
index 0a2eabd9973..a800b69ffcf 100644
--- a/addons/project/static/src/css/project.css
+++ b/addons/project/static/src/css/project.css
@@ -1,7 +1,3 @@
-.oe_kanban_card {
-  margin: 2px;
-}
-
 .oe_kanban_project {
     width: 220px;
     min-height: 160px;
diff --git a/addons/project/wizard/project_task_delegate.py b/addons/project/wizard/project_task_delegate.py
index 544165dc02b..bb15c62db1f 100644
--- a/addons/project/wizard/project_task_delegate.py
+++ b/addons/project/wizard/project_task_delegate.py
@@ -21,9 +21,9 @@
 
 from lxml import etree
 
-import tools
-from tools.translate import _
-from osv import fields, osv
+from openerp import tools
+from openerp.tools.translate import _
+from openerp.osv import fields, osv
 
 class project_task_delegate(osv.osv_memory):
     _name = 'project.task.delegate'
diff --git a/addons/project/wizard/project_task_reevaluate.py b/addons/project/wizard/project_task_reevaluate.py
index b00c531717f..1cbea397d5e 100644
--- a/addons/project/wizard/project_task_reevaluate.py
+++ b/addons/project/wizard/project_task_reevaluate.py
@@ -20,8 +20,8 @@
 ##############################################################################
 
 from lxml import etree
-from osv import fields, osv
-from tools.translate import _
+from openerp.osv import fields, osv
+from openerp.tools.translate import _
 
 class project_task_reevaluate(osv.osv_memory):
     _name = 'project.task.reevaluate'