Merge lp:~vauxoo/addons-vauxoo/7.0_addons_vauxoo_hours_spent_dev_jorge into lp:addons-vauxoo/7.0

Status: Merged
Merged at revision: 1057
Proposed branch: lp:~vauxoo/addons-vauxoo/7.0_addons_vauxoo_hours_spent_dev_jorge
Merge into: lp:addons-vauxoo/7.0
Diff against target: 11 lines (+1/-0)
1 file modified
user_story/view/project_view.xml (+1/-0)
To merge this branch: bzr merge lp:~vauxoo/addons-vauxoo/7.0_addons_vauxoo_hours_spent_dev_jorge
Reviewer Review Type Date Requested Status
Nhomar - Vauxoo Approve
Moisés López - http://www.vauxoo.com Pending
Jorge Angel Naranjo Rogel - http://www.vauxoo.com Pending
Review via email: mp+223470@code.launchpad.net

Description of the change

Se agrega el campos de effective_hours en la vista Tree.

To post a comment you must log in.
Revision history for this message
Nhomar - Vauxoo (nhomar) wrote :

Esta bien por mi. Pueden mergearlo ASAP ploiz.

Revision history for this message
Nhomar - Vauxoo (nhomar) wrote :

LGTM

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'user_story/view/project_view.xml'
--- user_story/view/project_view.xml 2014-05-09 21:51:34 +0000
+++ user_story/view/project_view.xml 2014-06-17 18:43:56 +0000
@@ -73,6 +73,7 @@
73 <field name="arch" type="xml">73 <field name="arch" type="xml">
74 <xpath expr="//field[@name=&quot;stage_id&quot;]" position="after">74 <xpath expr="//field[@name=&quot;stage_id&quot;]" position="after">
75 <field name="userstory_id"/>75 <field name="userstory_id"/>
76 <field name="effective_hours" sum="Hour(s) Spent"/>
76 </xpath>77 </xpath>
77 <xpath expr='//field[@name="planned_hours"]' position='attributes'>78 <xpath expr='//field[@name="planned_hours"]' position='attributes'>
78 <attribute name="widget">float_time</attribute>79 <attribute name="widget">float_time</attribute>