Merge lp:~herrera-dev/addons-vauxoo/new_changes_user_story into lp:addons-vauxoo

[Luis Torres]

-Agregado domain a user story en la tarea, para que filtre por las user story que esten en el sprint.
-Agregado en la sección Following la posibilidad de seleccionar los eventos a seguir.
-Eliminada la pestaña "Comments" en user story.

[Nhomar - Vauxoo (nhomar)]

Hola Luis.

Puedes revisar que el Merge tiene problemas con inconsistencias entre las líneas 105 y 121 del diff (ver abajo)

Por otro lado tu mensaje de Merge indica que agregas un Dominio pero agregas un data.xml en el __openerp__.py y el respectivo archivo, me cuentas de que se trata esto?

Saludos.

review: Needs Fixing

Unmerged revisions

524. By luistp13 on 2013-04-02

[ADD]agregado domain en tasks que filtre por las user story que esten en el sprint

523. By luistp13 on 2013-04-01

[FIX] Eliminada pestaña comments en user_story
[ADD] Agregado archivo data a user story para cargar los eventos en la seccion Following

=== modified file 'user_story/__openerp__.py'
--- user_story/__openerp__.py	2013-03-26 05:04:11 +0000
+++ user_story/__openerp__.py	2013-04-03 14:41:14 +0000
@@ -59,6 +59,7 @@
         "security/ir.model.access.csv",
         "view/userstory_view.xml",
         "view/project_view.xml",
+        "data/data.xml",
     ],
     "active": False,
     "images": [],

=== added directory 'user_story/data'
=== added file 'user_story/data/data.xml'
--- user_story/data/data.xml	1970-01-01 00:00:00 +0000
+++ user_story/data/data.xml	2013-04-03 14:41:14 +0000
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+    
+        <!-- Task-related subtypes for messaging / Chatter -->
+        <record id="mt_task_new" model="mail.message.subtype">
+            <field name="name">Task Created</field>
+            <field name="res_model">user.story</field>
+            <field name="default" eval="False"/>
+            <field name="description">Task created</field>
+        </record>
+        <record id="mt_task_started" model="mail.message.subtype">
+            <field name="name">Task Started</field>
+            <field name="res_model">user.story</field>
+            <field name="default" eval="False"/>
+            <field name="description">Task started</field>
+        </record>
+        <record id="mt_task_blocked" model="mail.message.subtype">
+            <field name="name">Task Blocked</field>
+            <field name="res_model">user.story</field>
+            <field name="default" eval="False"/>
+            <field name="description">Task blocked</field>
+        </record>
+        <record id="mt_task_closed" model="mail.message.subtype">
+            <field name="name">Task Done</field>
+            <field name="res_model">user.story</field>
+            <field name="default" eval="False"/>
+            <field name="description">Task closed</field>
+        </record>
+        <record id="mt_task_stage" model="mail.message.subtype">
+            <field name="name">Stage Changed</field>
+            <field name="res_model">user.story</field>
+            <field name="default" eval="False"/>
+            <field name="description">Stage changed</field>
+        </record>
+        
+        <!-- Discussion subtype for messaging / Chatter -->
+        <record id="mt_comment" model="mail.message.subtype">
+            <field name="name">Discussions</field>
+        </record>
+
+      
+    </data>
+</openerp>

=== modified file 'user_story/model/user_story.py'
--- user_story/model/user_story.py	2013-03-19 21:16:50 +0000
+++ user_story/model/user_story.py	2013-04-03 14:41:14 +0000
@@ -33,7 +33,7 @@
     """
 
     _name = 'user.story'
-    _inherit = ['mail.thread']
+    _inherit = ['mail.thread', 'ir.needaction_mixin']
 
     def _get_tasks(self, cr, uid, ids, field_name, arg, context=None):
         if context is None:
@@ -157,7 +157,7 @@
         return {'value': v}
 
     _columns = {
-        'userstory_id':fields.many2one('user.story', 'User Story',help="Set hear the User Story related with this task"),
+        'userstory_id':fields.many2one('user.story', 'User Story', domain= "[('sk_id', '=', sprint_id)]", help="Set hear the User Story related with this task"),
 
     }
 project_task()

=== modified file 'user_story/view/project_view.xml'
--- user_story/view/project_view.xml	2013-03-13 17:46:37 +0000
+++ user_story/view/project_view.xml	2013-04-03 14:41:14 +0000
@@ -11,7 +11,7 @@
         
       
         <xpath expr="//field[@name='categ_ids']" position="after">
-          <field name="userstory_id" on_change="onchange_user_story_task(userstory_id)"/>
+          <field name="userstory_id"  on_change="onchange_user_story_task(userstory_id)" />
         </xpath>
         
       </field>

=== modified file 'user_story/view/userstory_view.xml'
--- user_story/view/userstory_view.xml	2013-03-26 05:48:50 +0000
+++ user_story/view/userstory_view.xml	2013-04-03 14:41:14 +0000
@@ -116,13 +116,23 @@
               <separator string="Tasks" colspan='4' />
               <field name="task_ids" colspan="4" nolabel="1" widget="many2many"/>
             </page>
+<<<<<<< TREE
+=======
+           
+>>>>>>> MERGE-SOURCE
           </notebook>
 		  </sheet>
            <div class="oe_chatter">
+<<<<<<< TREE
                     <field name="message_follower_ids" widget="mail_followers" help="Follow this user story to automatically track the events associated to tasks and issues of the project related." groups="base.group_user"/>
                     <field name="message_ids" widget="mail_thread"/>
                 </div>
           
+=======
+                <field name="message_follower_ids" widget="mail_followers" groups="base.group_user"/>
+                <field name="message_ids" widget="mail_thread"/>
+            </div>
+>>>>>>> MERGE-SOURCE
         </form>
       </field>
     </record>