[MERGE]:merged with trunk

bzr revid: apa@tinyerp.com-20120801070425-ydyx8nc2ngi3j0zi

1 files changed, 13 insertions, 26 deletions

diff --git a/addons/subscription/subscription_view.xml b/addons/subscription/subscription_view.xml
index 3271096a51a..8b9be319ea6 100644
--- a/addons/subscription/subscription_view.xml
+++ b/addons/subscription/subscription_view.xml
@@ -3,11 +3,7 @@
     <data>
         <menuitem id="next_id_45" name="Recurring Events" parent="base.menu_tools" sequence="4"/>
 
-        <!--
-        =======================================================
-        Subscription Views
-        =======================================================
-        -->
+        <!-- Subscription Views -->
         <record id="view_subscription_form" model="ir.ui.view">
             <field name="name">subscription.subscription.form</field>
             <field name="model">subscription.subscription</field>
@@ -17,7 +13,7 @@
                 <header>
                     <button name="set_process" states="draft" string="Process" type="object" class="oe_highlight"/>
                     <button name="set_done" states="running" string="Stop" type="object" class="oe_highlight"/>
-                    <button name="set_draft" states="done" string="Set to Draft" type="object" />
+                    <button name="set_draft" states="done" string="Set to Draft" type="object"/>
                     <field name="state" widget="statusbar" statusbar_visible="draft,running"/>
                 </header>
                 <sheet>
@@ -73,23 +69,16 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search Subscription">
-                    <group>
-                        <field name="name" string="Subscription"/>
-                        <separator orientation="vertical"/>
-                        <field name="date_init"/>
-                        <separator orientation="vertical"/>
-                        <filter icon="terp-check"
+                    <field name="name" string="Subscription"/>
+                    <field name="date_init"/>
+                    <filter icon="terp-check"
                             string="Running"
                             domain="[('state','=','running')]"/>
-                        <separator orientation="vertical"/>
-                        <field name="user_id"/>
-                        <field name="partner_id"/>
-                    </group>
-                    <newline/>
+                    <field name="user_id"/>
+                    <field name="partner_id"/>
                     <group expand="0" string="Group By...">
                         <filter string="User" icon="terp-personal" name="User" domain="[]" context="{'group_by':'user_id'}"/>
                         <filter string="Partner" icon="terp-partner" name="Partner" domain="[]" context="{'group_by':'partner_id'}"/>
-                        <separator orientation="vertical"/>
                         <filter string="Status" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
                     </group>
                 </search>
@@ -103,7 +92,7 @@
             <field name="view_type">form</field>
             <field name="view_id" ref="view_subscription_tree"/>
             <field name="context">{'search_default_User':1}</field>
-            <field name="search_view_id" ref="view_subscription_filter" />
+            <field name="search_view_id" ref="view_subscription_filter"/>
         </record>
         <menuitem action="action_subscription_form" id="menu_action_subscription_form" parent="subscription.next_id_45"/>
 
@@ -167,11 +156,8 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Subscription Document">
-                    <group>
-                        <field name="name" string="Subscription Document"/>
-                        <separator orientation="vertical"/>
-                        <field name="model"/>
-                    </group>
+                    <field name="name" string="Subscription Document"/>
+                    <field name="model"/>
                 </search>
             </field>
         </record>
@@ -208,11 +194,12 @@
             <field name="res_model">subscription.document</field>
             <field name="view_type">form</field>
             <field name="view_id" ref="document_tree"/>
-            <field name="search_view_id" ref="view_subscription_document_filter" />
+            <field name="search_view_id" ref="view_subscription_document_filter"/>
         </record>
         <menuitem name="Configuration" parent="base.menu_tools"
-              id="base.menu_lunch_survey_root" sequence="20" groups="base.group_tool_manager" />
+              id="base.menu_lunch_survey_root" sequence="20" groups="base.group_tool_manager"/>
         <menuitem id="config_recuuring_event" name="Recurring Events" parent="base.menu_lunch_survey_root" sequence="4"/>
         <menuitem action="action_document_form" id="menu_action_document_form" parent="config_recuuring_event"/>
+
     </data>
 </openerp>