Vauxoo Addons

Merge lp:~vauxoo/addons-vauxoo/7.0-addons-vauxoo-effective_hours-sum-dev-julio into lp:addons-vauxoo/7.0

  1. 7.0-addons-vauxoo-effective_hours-sum-dev-julio
  2. Merge into 7.0
Proposed by Julio Serna-http://www.vauxoo.com
Status: Merged
Merged at revision: 1110
Proposed branch: lp:~vauxoo/addons-vauxoo/7.0-addons-vauxoo-effective_hours-sum-dev-julio
Merge into: lp:addons-vauxoo/7.0
Diff against target: 30 lines (+6/-3)
2 files modified
project_btree/project_hierarchical_view.xml (+3/-2)
user_story/view/project_view.xml (+3/-1)
To merge this branch: bzr merge lp:~vauxoo/addons-vauxoo/7.0-addons-vauxoo-effective_hours-sum-dev-julio
Reviewer Review Type Date Requested Status
Julio Serna-http://www.vauxoo.com Pending
Moisés López - http://www.vauxoo.com Pending
Review via email: mp+230397@code.launchpad.net

Description of the change

changed inherit position=replace by position=attributes to field effective_hours

To post a comment you must log in.
lp:~vauxoo/addons-vauxoo/7.0-addons-vauxoo-effective_hours-sum-dev-julio updated
1107. By Julio Serna-http://www.vauxoo.com

[MERGE]

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'project_btree/project_hierarchical_view.xml'
2--- project_btree/project_hierarchical_view.xml 2014-05-09 21:51:34 +0000
3+++ project_btree/project_hierarchical_view.xml 2014-08-11 23:29:17 +0000
4@@ -49,8 +49,9 @@
5 <field name="model">project.task</field>
6 <field name="inherit_id" ref="project.view_task_tree2"/>
7 <field name="arch" type="xml">
8- <xpath expr="//field[@name='effective_hours']" position="replace">
9- <field name="effective_hours" widget="float_time" sum="Spent Hours" invisible="0"/>
10+ <xpath expr="//field[@name='effective_hours']" position="attributes">
11+ <attribute name="widget">float_time</attribute>
12+ <attribute name="invisible">False</attribute>
13 </xpath>
14 </field>
15 </record>
16
17=== modified file 'user_story/view/project_view.xml'
18--- user_story/view/project_view.xml 2014-06-17 18:35:45 +0000
19+++ user_story/view/project_view.xml 2014-08-11 23:29:17 +0000
20@@ -73,7 +73,9 @@
21 <field name="arch" type="xml">
22 <xpath expr="//field[@name=&quot;stage_id&quot;]" position="after">
23 <field name="userstory_id"/>
24- <field name="effective_hours" sum="Hour(s) Spent"/>
25+ </xpath>
26+ <xpath expr='//field[@name="effective_hours"]' position='attributes'>
27+ <attribute name="invisible">False</attribute>
28 </xpath>
29 <xpath expr='//field[@name="planned_hours"]' position='attributes'>
30 <attribute name="widget">float_time</attribute>