Merge lp:~vauxoo/addons-vauxoo/7.0-user-story-fields-responsible-gaby into lp:addons-vauxoo/7.0

[Gabriela Quilarque]

Added 1 new field, 1 new menu with domain.
Added help for two fields an translation.
Modified field old.

=== modified file 'user_story/i18n/es.po'
--- user_story/i18n/es.po	2013-08-20 20:14:18 +0000
+++ user_story/i18n/es.po	2013-10-23 21:49:43 +0000
@@ -524,3 +524,29 @@
 #: view:user.story:0
 msgid "User Story Number: "
 msgstr "Historia de usuario número: "
+
+#. module: user_story
+#: field:user.story,user_id:0
+msgid "Responsible Supervisor"
+msgstr "Supervisor Responsable"
+
+#. module: user_story
+#: field:user.story,user_execute_id:0
+msgid "Responsible Execution"
+msgstr "Responsable de Ejecución"
+
+#. module: user_story
+#: help:user.story,user_execute_id:0
+msgid "Person responsible for user story takes place, either by delegating work to other human capital or running it by itself. For delegate work should monitor the proper implementation of associated activities."
+msgstr "Persona responsable de que la historia de usuario se lleve a cabo, bien sea delegando trabajo a otro capital humano o ejecutandolo por si misma. En el caso de delegar trabajo se debe supervisar la correcta ejecución  de las actividades asociadas."
+
+#. module: user_story
+#: help:user.story,user_id:0
+msgid "Person responsible for interacting with the client to give details of the progress or completion of the User History, in some cases also the supervisor for the correct execution of the user story."
+msgstr "Persona responsable de interactuar con el cliente para dar detalles del avance o finalización de la Historia de Usuario, en algunos casos también es el supervisor de la correcta ejecución de la historia de usuario."
+
+#. module: user_story
+#: model:ir.actions.act_window,name:user_story.action_my_user_story
+#: model:ir.ui.menu,name:user_story.menu_action_my_user_story
+msgid "My User Stories Exc"
+msgstr "Mis H.U. a Ejecutar"

=== modified file 'user_story/model/user_story.py'
--- user_story/model/user_story.py	2013-08-20 17:18:57 +0000
+++ user_story/model/user_story.py	2013-10-23 21:49:43 +0000
@@ -108,7 +108,8 @@
         
         'asumption': fields.text('Asumptions'),
         'date': fields.date('Date'),
-        'user_id': fields.many2one('res.users', 'Create User'),
+        'user_id': fields.many2one('res.users', 'Responsible Supervisor',help="Person responsible for interacting with the client to give details of the progress or completion of the User History, in some cases also the supervisor for the correct execution of the user story."),
+        'user_execute_id': fields.many2one('res.users', 'Responsible Execution',help="Person responsible for user story takes place, either by delegating work to other human capital or running it by itself. For delegate work should monitor the proper implementation of associated activities."),
         'sk_id': fields.many2one('sprint.kanban', 'Sprint Kanban'),
         'state': fields.selection(_US_STATE, 'State', readonly=True),
         'task_ids': fields.function(_get_tasks, type='many2many',
@@ -124,6 +125,7 @@
         'name': lambda *a: None,
         'date': lambda *a: time.strftime('%Y-%m-%d'),
         'user_id': lambda self, cr, uid, ctx: uid,
+        'user_execute_id': lambda self, cr, uid, ctx: uid,
         'state': 'draft',
         'priority_level':'secondary',
     }

=== modified file 'user_story/view/userstory_view.xml'
--- user_story/view/userstory_view.xml	2013-10-09 14:26:39 +0000
+++ user_story/view/userstory_view.xml	2013-10-23 21:49:43 +0000
@@ -40,6 +40,7 @@
 					<field name="owner" select="1"/>
 					<field name="date" select="1"/>
 					<field name="user_id"/>
+					<field name="user_execute_id"/>
 					<field name="code"/>
 				</group>
 				<group>
@@ -141,8 +142,6 @@
       <field name="arch" type="xml">
         <search string="User Story">
           <group string="Filter">
-            <filter icon="terp-camera_test" string="My User Story's" name="current" domain="[('user_id','=',uid)]"/>
-            <separator orientation="vertical"/>
             <field name="id"/>
             <field name="project_id"/>
             <field name="code"/>
@@ -174,13 +173,20 @@
       </field>
     </record>
     
-
+    <record model="ir.actions.act_window" id="action_my_user_story">
+      <field name="name">My User Stories Exc</field>
+      <field name="res_model">user.story</field>
+      <field name="view_type">form</field>
+      <field name="view_mode">tree,form</field>
+      <field name="domain">[('user_id','=',uid),('state','not in',('cancel','done'))]</field>
+      <field name="view_id" ref="view_userstory_tree"/>
+    </record>
+ 
     <record model="ir.actions.act_window" id="action_user_story">
       <field name="name">User Story</field>
       <field name="res_model">user.story</field>
       <field name="view_type">form</field>
       <field name="view_mode">tree,form</field>
-      <field name="context">{"search_default_current": uid}</field>
       <field name="search_view_id" ref="view_userstory_search"/>
       <field name="help" type="html">
       <p class="oe_view_nocontent_create">Behaviour-driven development is an 
@@ -195,6 +201,7 @@
       </field>
     </record>
     <menuitem parent="project.menu_project_management" id="menu_action_user_story" action="action_user_story" groups="user_story.group_user_story_manager,user_story.group_user_story_user"/>
+    <menuitem parent="project.menu_project_management" id="menu_action_my_user_story" action="action_my_user_story" groups="user_story.group_user_story_manager,user_story.group_user_story_user"/>
   </data>
 </openerp>