Odoo Addons (MOVED TO GITHUB)

Merge lp:~openerp-dev/openobject-addons/trunk-bug-1108681-cga into lp:openobject-addons

  1. trunk-bug-1108681-cga
  2. Merge into trunk
Proposed by Chandni Gandhi(OpenERP)
Status: Needs review
Proposed branch: lp:~openerp-dev/openobject-addons/trunk-bug-1108681-cga
Merge into: lp:openobject-addons
Diff against target: 50 lines (+13/-3)
2 files modified
project_long_term/project_long_term_view.xml (+1/-0)
project_long_term/project_long_term_workflow.xml (+12/-3)
To merge this branch: bzr merge lp:~openerp-dev/openobject-addons/trunk-bug-1108681-cga
Reviewer Review Type Date Requested Status
Ajay Patel (OpenERP) (community) Approve
OpenERP Core Team Pending
Review via email: mp+146346@code.launchpad.net

Description of the change

Hello,

Add the workflow of phase and its related button in view.

Thanks

To post a comment you must log in.
Revision history for this message
Ajay Patel (OpenERP) (ajay-openerp) wrote :

seems ok.

Thanks,
Amit

review: Approve
Reply
lp:~openerp-dev/openobject-addons/trunk-bug-1108681-cga updated
8529. By Chandni Gandhi(OpenERP)

[MERGE]:With latest trunk

Unmerged revisions

8529. By Chandni Gandhi(OpenERP)

[MERGE]:With latest trunk

8528. By Chandni Gandhi(OpenERP)

[FIX]:Add Re-Open phase button and related its workfolw

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'project_long_term/project_long_term_view.xml'
2--- project_long_term/project_long_term_view.xml 2012-12-19 06:48:44 +0000
3+++ project_long_term/project_long_term_view.xml 2013-02-08 11:29:22 +0000
4@@ -147,6 +147,7 @@
5 <button string="Pending" name="set_pending" states="open"/>
6 <button string="Draft" name="set_draft" states="open"/>
7 <button string="Cancel" name="set_cancel" states="draft,open,pending"/>
8+ <button string="Re-Open Phase" name="set_draft" states="done,cancelled"/>
9 <field name="state" widget="statusbar" statusbar_visible="draft,open,done" statusbar_colors='{"pending":"blue"}'/>
10 </header>
11 <sheet>
12
13=== modified file 'project_long_term/project_long_term_workflow.xml'
14--- project_long_term/project_long_term_workflow.xml 2012-06-28 06:40:05 +0000
15+++ project_long_term/project_long_term_workflow.xml 2013-02-08 11:29:22 +0000
16@@ -26,7 +26,6 @@
17 <record id="act_cancel_phase" model="workflow.activity">
18 <field name="wkf_id" ref="wkf_phase"/>
19 <field name="name">set_cancel</field>
20- <field name="flow_stop">True</field>
21 <field name="kind">function</field>
22 <field name="action">set_cancel()</field>
23 </record>
24@@ -41,7 +40,6 @@
25 <record id="act_phase_done" model="workflow.activity">
26 <field name="wkf_id" ref="wkf_phase"/>
27 <field name="name">set_done</field>
28- <field name="flow_stop">True</field>
29 <field name="kind">function</field>
30 <field name="action">set_done()</field>
31 </record>
32@@ -105,6 +103,17 @@
33 <field name="act_to" ref="act_draft"/>
34 <field name="signal">set_draft</field>
35 </record>
36-
37+
38+ <record id="t10" model="workflow.transition">
39+ <field name="act_from" ref="act_phase_done"/>
40+ <field name="act_to" ref="act_draft"/>
41+ <field name="signal">set_draft</field>
42+ </record>
43+
44+ <record id="t11" model="workflow.transition">
45+ <field name="act_from" ref="act_cancel_phase"/>
46+ <field name="act_to" ref="act_draft"/>
47+ <field name="signal">set_draft</field>
48+ </record>
49 </data>
50 </openerp>

Subscribers

People subscribed via source and target branches

to all changes: