4 files changed, 8 insertions, 11 deletions
diff --git a/addons/project_long_term/i18n/zh_CN.po b/addons/project_long_term/i18n/zh_CN.po
index 4b5ad3f0e44..4f553f15cfe 100644
--- a/addons/project_long_term/i18n/zh_CN.po
+++ b/addons/project_long_term/i18n/zh_CN.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-12-21 17:06+0000\n"
-"PO-Revision-Date: 2012-11-27 14:57+0000\n"
-"Last-Translator: 盈通 ccdos <ccdos@163.com>\n"
+"PO-Revision-Date: 2013-07-14 03:57+0000\n"
+"Last-Translator: Alan <shuchuan.wu@gmail.com>\n"
 "Language-Team: Chinese (Simplified) <zh_CN@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-03-16 05:47+0000\n"
-"X-Generator: Launchpad (build 16532)\n"
+"X-Launchpad-Export-Date: 2013-07-15 04:51+0000\n"
+"X-Generator: Launchpad (build 16696)\n"
 
 #. module: project_long_term
 #: help:project.phase,constraint_date_end:0
@@ -41,12 +41,12 @@ msgstr "阶段"
 #: view:project.phase:0
 #: view:project.user.allocation:0
 msgid "Team Planning"
-msgstr ""
+msgstr "项目团队计划"
 
 #. module: project_long_term
 #: field:project.phase,user_ids:0
 msgid "Assigned Users"
-msgstr "指定的用户"
+msgstr "已分配的用户"
 
 #. module: project_long_term
 #: view:project.phase:0
diff --git a/addons/project_long_term/project_long_term_view.xml b/addons/project_long_term/project_long_term_view.xml
index e61af0c6c32..e2f47489b4a 100644
--- a/addons/project_long_term/project_long_term_view.xml
+++ b/addons/project_long_term/project_long_term_view.xml
@@ -200,7 +200,7 @@
                                     <field name="project_id" invisible="1"/>
                                     <field name="total_hours" sum='Total Hours'/>
                                     <field name="remaining_hours" widget="float_time" sum="Remaining Hours"/>
-                                    <field name="state"/>
+                                    <field name="stage_id"/>
                                   </tree>
                              </field>
                         </page>
diff --git a/addons/project_long_term/security/ir.model.access.csv b/addons/project_long_term/security/ir.model.access.csv
index 2a00088b8f4..82bfab460cb 100644
--- a/addons/project_long_term/security/ir.model.access.csv
+++ b/addons/project_long_term/security/ir.model.access.csv
@@ -4,9 +4,6 @@ access_project_user_allocation,project.user.allocation,model_project_user_alloca
 access_project_phase_manager,project.phase manager,model_project_phase,project.group_project_manager,1,1,1,1
 access_project_user_allocation_manager,project.user.allocation manager,model_project_user_allocation,project.group_project_manager,1,1,1,1
 access_resource_resource_user,user.user user,resource.model_resource_resource,project.group_project_user,1,0,0,0
-access_resource_calendar_leaves_user,user.calendar.leaves user,resource.model_resource_calendar_leaves,project.group_project_user,1,1,1,1
 access_resource_resource_manager,user.user manager,resource.model_resource_resource,project.group_project_manager,1,1,1,1
 access_project_user_allocation_manager,project.user.allocation.manager,model_project_user_allocation,project.group_project_manager,1,1,1,1
 access_project_resource_calendar_attendance,resource.calendar.attendance,resource.model_resource_calendar_attendance,project.group_project_manager,1,0,0,0
-
-
diff --git a/addons/project_long_term/test/task_process.yml b/addons/project_long_term/test/task_process.yml
index a7065de315f..060abcf43f3 100644
--- a/addons/project_long_term/test/task_process.yml
+++ b/addons/project_long_term/test/task_process.yml
@@ -14,6 +14,6 @@
   !python {model: project.project}: |
     prj = self.browse(cr, uid, [ref("project.project_project_1")])[0]
     for task in prj.tasks:
-        if task.state in ('done','cancelled'):
+        if task.stage_id and task.stage_id.fold:
             continue
         assert task.user_id and task.date_start and task.date_end, "Project tasks not scheduled"