Odoo Addons (MOVED TO GITHUB)

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

  1. trunk-bug-1095691-cga
  2. Merge into trunk
Proposed by Chandni Gandhi(OpenERP)
Status: Needs review
Proposed branch: lp:~openerp-dev/openobject-addons/trunk-bug-1095691-cga
Merge into: lp:openobject-addons
Diff against target: 27 lines (+3/-1)
2 files modified
hr_holidays/hr_holidays_view.xml (+1/-0)
hr_holidays/hr_holidays_workflow.xml (+2/-1)
To merge this branch: bzr merge lp:~openerp-dev/openobject-addons/trunk-bug-1095691-cga
Reviewer Review Type Date Requested Status
Atul Patel(OpenERP) (community) Approve
OpenERP Core Team Pending
Review via email: mp+142059@code.launchpad.net

Description of the change

Hello,

Put the confirm signal in workflow and its related button in view.

Thanks

To post a comment you must log in.
Revision history for this message
Atul Patel(OpenERP) (atp-openerp) :
review: Approve
Reply
lp:~openerp-dev/openobject-addons/trunk-bug-1095691-cga updated
8496. By Chandni Gandhi(OpenERP)

[MERGE]:With latest code

Unmerged revisions

8496. By Chandni Gandhi(OpenERP)

[MERGE]:With latest code

8495. By Chandni Gandhi(OpenERP)

[FIX]:Add the confirm signal in workflow and its related button in view

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'hr_holidays/hr_holidays_view.xml'
2--- hr_holidays/hr_holidays_view.xml 2012-12-21 16:48:08 +0000
3+++ hr_holidays/hr_holidays_view.xml 2013-02-07 09:55:28 +0000
4@@ -54,6 +54,7 @@
5 <field name="arch" type="xml">
6 <form string="Leave Request" version="7.0">
7 <header>
8+ <button string="Submit to Manager" name="confirm" states="draft" type="workflow" groups="base.group_hr_user" class="oe_highlight"/>
9 <button string="Approve" name="validate" states="confirm" type="workflow" groups="base.group_hr_user" class="oe_highlight"/>
10 <button string="Validate" name="second_validate" states="validate1" type="workflow" groups="base.group_hr_user" class="oe_highlight"/>
11 <button string="Refuse" name="refuse" states="confirm,validate1,validate" type="workflow" groups="base.group_hr_user"/>
12
13=== modified file 'hr_holidays/hr_holidays_workflow.xml'
14--- hr_holidays/hr_holidays_workflow.xml 2012-12-19 08:58:36 +0000
15+++ hr_holidays/hr_holidays_workflow.xml 2013-02-07 09:55:28 +0000
16@@ -61,9 +61,10 @@
17 workflow transition
18 -->
19
20- <record model="workflow.transition" id="holiday_draft2confirm"> <!-- 1. draft->submitted (no signal) -->
21+ <record model="workflow.transition" id="holiday_draft2confirm"> <!-- 1. draft->submitted (confirm signal) -->
22 <field name="act_from" ref="act_draft" />
23 <field name="act_to" ref="act_confirm" />
24+ <field name="signal">confirm</field>
25 </record>
26
27 <record model="workflow.transition" id="holiday_confirm2validate"> <!-- 2. submitted->accepted (validate signal) if not double_validation-->

Subscribers

People subscribed via source and target branches

to all changes: