[MERGE] trunk-search_views or instead of and in groups

[odoo/odoo.git] / addons / project_scrum / project_scrum_view.xml

diff --git a/addons/project_scrum/project_scrum_view.xml b/addons/project_scrum/project_scrum_view.xml
index 0bba9b2..4622bd3 100644 (file)
--- a/addons/project_scrum/project_scrum_view.xml
+++ b/addons/project_scrum/project_scrum_view.xml
@@ -61,8 +61,8 @@
                         <field name="name" select="1"/>
                         <field name="project_id" select="1"/>
                         <field domain="[('project_id','=',project_id), ('state','in', ['draft','open'])]" name="sprint_id" select="1"/>
-                                       <button name="%(action_postpone_wizard)d" string="Postpone" type="action"
-                                                       help="Postpone backlog" colspan="2"
+                        <button name="%(action_postpone_wizard)d" string="Postpone" type="action"
+                            help="Postpone backlog" colspan="2"
                          icon="gtk-convert"  attrs="{'invisible':[('state','in',['done', 'cancel'])]}"/>
                         <field name="user_id" select="1"/>
                         <field name="sequence" groups="base.group_extended"/>
@@ -224,7 +224,7 @@
                     <button type="object" string="Close" name="button_close" states="open,pending" icon="terp-dialog-close"/>
                     <button type="object" string="Set to Draft" name="button_draft" states="cancel,done" icon="gtk-convert"/>
                     <button name="%(project_scrum.report_scrum_sprint_burndown_chart)d" states="open,draft,close,cancel"
-                                       string="Burndown Chart" type="action" icon="gtk-print"/>
+                                    string="Burndown Chart" type="action" icon="gtk-print"/>
                 </tree>
             </field>
         </record>
@@ -273,7 +273,7 @@
                                             <separator colspan="4" string="Are there anything blocking you?"/>
                                             <field colspan="4" name="question_blocks" nolabel="1"/>
                                             <separator colspan="4" string=""/>
-                                                                       <button name="button_send_to_master" type="object" string="Send to Scrum Master" icon="gtk-ok"/>
+                                            <button name="button_send_to_master" type="object" string="Send to Scrum Master" icon="gtk-ok"/>
                                             <button name="button_send_product_owner" type="object" string="Send to Product Owner" icon="gtk-ok"/>
                                         </page>
                                         <page string="Optional Info">
@@ -302,7 +302,7 @@
                     <group col="8" colspan="4">
                         <field name="state" readonly="1"/>
                         <button name="%(project_scrum.report_scrum_sprint_burndown_chart)d"
-                                               string="Burndown Chart" type="action" icon="gtk-print"/>
+                                    string="Burndown Chart" type="action" icon="gtk-print"/>
                         <button type="object" string="Open" name="button_open" states="draft,pending" icon="terp-camera_test"/>
                         <button type="object" string="Pending" name="button_pending" states="open" icon="gtk-media-pause"/>
                         <button type="object" string="Close" name="button_close" states="open,pending" icon="terp-dialog-close"/>
@@ -587,7 +587,7 @@
             <field name="inherit_id" ref="project.view_task_search_form"/>
             <field name="arch" type="xml">
                 <xpath expr="/search/group[@string='Group By...']/filter[@string='Project']" position="after">
-                       <separator orientation="vertical"/>
+                    <separator orientation="vertical"/>
                     <filter string="Sprint" icon="terp-gtk-jump-to-ltr" domain="[]" context="{'group_by':'sprint_id'}"/>
                     <filter string="Backlog" icon="terp-gtk-jump-to-rtl" domain="[]" context="{'group_by':'product_backlog_id'}"/>
                 </xpath>
@@ -595,7 +595,7 @@
         </record>
 
         <act_window
-               context="{'search_default_sprint_id': [active_id], 'default_sprint_id': active_id}"
+            context="{'search_default_sprint_id': [active_id], 'default_sprint_id': active_id}"
             id="act_scrum_sprint_2_product_backlog"
             name="Backlogs"
             res_model="project.scrum.product.backlog"
@@ -604,7 +604,7 @@
             view_type="form"/>
 
         <act_window
-               context="{'search_default_sprint_id': active_id, 'search_default_user_id': uid, 'search_default_current':1, 'default_sprint_id': active_id}"
+            context="{'search_default_sprint_id': active_id, 'search_default_user_id': uid, 'search_default_current':1, 'default_sprint_id': active_id}"
             id="act_scrum_sprint_2_project_task"
             name="Tasks"
             res_model="project.task"