Odoo Addons (MOVED TO GITHUB)

Merge lp:~openerp-dev/openobject-addons/trunk-addons21-project-fka2 into lp:openobject-addons

  1. trunk-addons21-project-fka2
  2. Merge into trunk
Proposed by Denis Ledoux (OpenERP)
Status: Work in progress
Proposed branch: lp:~openerp-dev/openobject-addons/trunk-addons21-project-fka2
Merge into: lp:openobject-addons
Diff against target: 22 lines (+6/-2)
1 file modified
project/project_view.xml (+6/-2)
To merge this branch: bzr merge lp:~openerp-dev/openobject-addons/trunk-addons21-project-fka2
Reviewer Review Type Date Requested Status
OpenERP Core Team Pending
Review via email: mp+140162@code.launchpad.net
To post a comment you must log in.
lp:~openerp-dev/openobject-addons/trunk-addons21-project-fka2 updated
8078. By Denis Ledoux (OpenERP)

[MERGE]Latest trunk + resolve conflict priority stars for tasks

8079. By Rucha (Open ERP)

[MERGE]: Merged with latest trunk

Unmerged revisions

8079. By Rucha (Open ERP)

[MERGE]: Merged with latest trunk

8078. By Denis Ledoux (OpenERP)

[MERGE]Latest trunk + resolve conflict priority stars for tasks

8077. By Denis Ledoux (OpenERP)

[MERGE]Latest trunk

8076. By Denis Ledoux (OpenERP)

[IMP]Use of >=2 instead of == 2 or == 3 or == 4 ...

8075. By Denis Ledoux (OpenERP)

[MERGE]Latest trunk

8074. By Nimesh Contractor(Open ERP)

[MERGE] with trunk

8073. By Nimesh Contractor(Open ERP)

[MERGE] merge with lp:openobject-addons.

8072. By Foram Katharotiya (OpenERP)

[MERGE] with trunk

8071. By Foram Katharotiya (OpenERP)

[MERGE] with trunk

8070. By Foram Katharotiya (OpenERP)

[MERGE] with trunk

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'project/project_view.xml'
2--- project/project_view.xml 2013-04-22 15:34:49 +0000
3+++ project/project_view.xml 2013-04-30 07:14:26 +0000
4@@ -521,12 +521,16 @@
5 <span t-attf-class="#{red || ''}"><i><field name="date_deadline"/></i></span>
6 </div>
7 <div class="oe_kanban_bottom_right">
8+ <a t-if="record.kanban_state.raw_value === 'normal'" type="object" string="In Progress" name="set_kanban_state_done" class="oe_kanban_status"> </a>
9+ <a t-if="record.kanban_state.raw_value === 'done'" type="object" string="Ready for next stage" name="set_kanban_state_blocked" class="oe_kanban_status oe_kanban_status_green"> </a>
10+ <a t-if="record.kanban_state.raw_value === 'blocked'" type="object" string="Blocked" name="set_kanban_state_normal" class="oe_kanban_status oe_kanban_status_red"> </a>
11 <t groups="base.group_user">
12 <a t-if="record.kanban_state.raw_value === 'normal'" type="object" string="In Progress" name="set_kanban_state_done" class="oe_kanban_status"> </a>
13 <a t-if="record.kanban_state.raw_value === 'done'" type="object" string="Ready for next stage" name="set_kanban_state_blocked" class="oe_kanban_status oe_kanban_status_green"> </a>
14 <a t-if="record.kanban_state.raw_value === 'blocked'" type="object" string="Blocked" name="set_kanban_state_normal" class="oe_kanban_status oe_kanban_status_red"> </a>
15- <a t-if="record.priority.raw_value > 0" type="object" string="Normal" name="set_high_priority" class="oe_e oe_star_off">7</a>
16- <a t-if="record.priority.raw_value == 0" type="object" string="Very Important" name="set_normal_priority" class="oe_e oe_star_on">7</a>
17+ <a t-if="record.priority.raw_value == 1" type="object" string="Important" name="set_very_high_priority" class="oe_e oe_star_on">7</a>
18+ <a t-if="record.priority.raw_value &gt;= 2" type="object" string="Normal" name="set_high_priority" class="oe_e oe_star_off">7</a>
19+ <a t-if="record.priority.raw_value == 0" type="object" string="Very Important" name="set_normal_priority" class="oe_e oe_star_very_high_priority">7</a>
20 </t>
21 <img t-att-src="kanban_image('res.users', 'image_small', record.user_id.raw_value)" t-att-title="record.user_id.value" width="24" height="24" class="oe_kanban_avatar"/>
22 </div>

Subscribers

People subscribed via source and target branches

to all changes: