Merge lp:~openerp-dev/openobject-addons/7.0-imp-task-kanban-fka into lp:openobject-addons/7.0

Proposed by Foram Katharotiya (OpenERP)
Status: Needs review
Proposed branch: lp:~openerp-dev/openobject-addons/7.0-imp-task-kanban-fka
Merge into: lp:openobject-addons/7.0
Diff against target: 56 lines (+5/-8)
4 files modified
project/project.py (+1/-4)
project/project_data.xml (+1/-1)
project/project_view.xml (+1/-1)
project/test/task_process.yml (+2/-2)
To merge this branch: bzr merge lp:~openerp-dev/openobject-addons/7.0-imp-task-kanban-fka
Reviewer Review Type Date Requested Status
OpenERP Core Team Pending
Review via email: mp+154323@code.launchpad.net

Description of the change

Hello,

 - I have set task in analysis instead of designing when reactive the task.
 - Add class in project kanban for pencil icon.

Thanks,
FKA

To post a comment you must log in.
8894. By Foram Katharotiya (OpenERP)

[MERGE] with 7.0

8895. By Foram Katharotiya (OpenERP)

[MERGE] with 7.0

8896. By Foram Katharotiya (OpenERP)

[MERGE] with 7.0

8897. By Foram Katharotiya (OpenERP)

[MERGE] with 7.0

8898. By Foram Katharotiya (OpenERP)

[MERGE] with 7.0

8899. By Foram Katharotiya (OpenERP)

[MERGE] with 7.0

8900. By Foram Katharotiya (OpenERP)

[MERGE] with 7.0

8901. By Foram Katharotiya (OpenERP)

[MERGE] with 7.0

8902. By Foram Katharotiya (OpenERP)

[MERGE] with 7.0

8903. By Foram Katharotiya (OpenERP)

[MERGE] with 7.0

8904. By Foram Katharotiya (OpenERP)

[MERGE] merge with 7.0

8905. By Foram Katharotiya (OpenERP)

[MERGE] with 7.0

8906. By Foram Katharotiya (OpenERP)

[MERGE] with 7.0

8907. By Foram Katharotiya (OpenERP)

[MERGE] with 7.0

8908. By Foram Katharotiya (OpenERP)

[MERGE] with 7.0

8909. By Foram Katharotiya (OpenERP)

[MERGE] with 7.0

8910. By Foram Katharotiya (OpenERP)

[MERGE] with 7.0

8911. By Foram Katharotiya (OpenERP)

[MERGE] with 7.0

8912. By Foram Katharotiya (OpenERP)

[MERGE] with 7.0

8913. By Foram Katharotiya (OpenERP)

[MERGE] with 7.0

8914. By Foram Katharotiya (OpenERP)

[MERGE] with 7.0

8915. By Foram Katharotiya (OpenERP)

[MERGE] with 7.0

8916. By Foram Katharotiya (OpenERP)

[MERGE] with 7.0

8917. By Foram Katharotiya (OpenERP)

[MERGE] with 7.0

8918. By Foram Katharotiya (OpenERP)

[MERGE] with 7.0

8919. By Foram Katharotiya (OpenERP)

[MERGE] with 7.0

8920. By Foram Katharotiya (OpenERP)

[MERGE] with 7.0

8921. By Foram Katharotiya (OpenERP)

[MERGE] with 7.0

8922. By Foram Katharotiya (OpenERP)

[MERGE] with 7.0

Unmerged revisions

8922. By Foram Katharotiya (OpenERP)

[MERGE] with 7.0

8921. By Foram Katharotiya (OpenERP)

[MERGE] with 7.0

8920. By Foram Katharotiya (OpenERP)

[MERGE] with 7.0

8919. By Foram Katharotiya (OpenERP)

[MERGE] with 7.0

8918. By Foram Katharotiya (OpenERP)

[MERGE] with 7.0

8917. By Foram Katharotiya (OpenERP)

[MERGE] with 7.0

8916. By Foram Katharotiya (OpenERP)

[MERGE] with 7.0

8915. By Foram Katharotiya (OpenERP)

[MERGE] with 7.0

8914. By Foram Katharotiya (OpenERP)

[MERGE] with 7.0

8913. By Foram Katharotiya (OpenERP)

[MERGE] with 7.0

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'project/project.py'
2--- project/project.py 2013-06-26 10:37:56 +0000
3+++ project/project.py 2013-07-01 10:30:13 +0000
4@@ -987,10 +987,7 @@
5 return True
6
7 def do_reopen(self, cr, uid, ids, context=None):
8- for task in self.browse(cr, uid, ids, context=context):
9- project = task.project_id
10- self.case_set(cr, uid, [task.id], 'open', {}, context=context)
11- return True
12+ return self.case_reset(cr, uid, ids, context=context)
13
14 def do_cancel(self, cr, uid, ids, context=None):
15 """ Compatibility when changing to case_cancel. """
16
17=== modified file 'project/project_data.xml'
18--- project/project_data.xml 2013-03-21 16:29:39 +0000
19+++ project/project_data.xml 2013-07-01 10:30:13 +0000
20@@ -31,7 +31,7 @@
21 <field name="sequence">1</field>
22 <field name="name">Analysis</field>
23 <field name="state">draft</field>
24- <field name="case_default" eval="False"/>
25+ <field name="case_default" eval="True"/>
26 </record>
27 <record id="project_tt_specification" model="project.task.type">
28 <field name="sequence">2</field>
29
30=== modified file 'project/project_view.xml'
31--- project/project_view.xml 2013-05-16 10:16:16 +0000
32+++ project/project_view.xml 2013-07-01 10:30:13 +0000
33@@ -235,7 +235,7 @@
34 <t t-name="kanban-box">
35 <div t-attf-class="oe_kanban_color_#{kanban_getcolor(record.color.raw_value)} oe_kanban_card oe_kanban_project oe_kanban_global_click">
36 <div class="oe_dropdown_toggle oe_dropdown_kanban" groups="base.group_user">
37- <span class="oe_e">í</span>
38+ <span class="oe_e"><span class="edit_icon"/></span>
39 <ul class="oe_dropdown_menu">
40 <t t-if="widget.view.is_action_enabled('edit')"><li><a type="edit">Project Settings</a></li></t>
41 <t t-if="widget.view.is_action_enabled('delete')"><li><a type="delete">Delete</a></li></t>
42
43=== modified file 'project/test/task_process.yml'
44--- project/test/task_process.yml 2012-11-29 22:26:45 +0000
45+++ project/test/task_process.yml 2013-07-01 10:30:13 +0000
46@@ -34,8 +34,8 @@
47 -
48 I check reopened task details.
49 -
50- !assert {model: project.task, id: project_task_1, severity: error, string: task should be open.}:
51- - state == "open"
52+ !assert {model: project.task, id: project_task_1, severity: error, string: task should be draft.}:
53+ - state == "draft"
54 -
55 I change the stage of task to next stage.
56 -