[IMP] merge two group by in search view to install account_followup and invisble...

bzr revid: jar@tinyerp.com-20140421050534-0z3zefpb3vp8why7

diff --git a/addons/account/partner_view.xml b/addons/account/partner_view.xml
index 6a58bc7..a11b108 100644 (file)
--- a/addons/account/partner_view.xml
+++ b/addons/account/partner_view.xml
@@ -97,7 +97,7 @@
             <field name="inherit_id" ref="base.view_partner_form"/>
             <field name="arch" type="xml">
                 <page name="sales_purchases" position="after" version="7.0">
-                <page string="Accounting" col="4" name="accounting" attrs="{'invisible': [('is_company','=',False),('parent_id','!=',False)]}">
+                <page string="Accounting" col="4" name="accounting" attrs="{'invisible': [('is_company','=',False),('parent_id','!=',False)]}" groups="account.group_account_invoice">
                     <group>
                         <group>
                             <field name="property_account_position" widget="selection"/>
@@ -127,7 +127,7 @@
                         </tree>
                     </field>
                 </page>
-                <page string="Accounting" name="accounting_disabled" attrs="{'invisible': ['|',('is_company','=',True),('parent_id','=',False)]}">
+                <page string="Accounting" name="accounting_disabled" attrs="{'invisible': ['|',('is_company','=',True),('parent_id','=',False)]}" groups="account.group_account_invoice">
                     <div>
                         <p>Accounting-related settings are managed on <button name="open_commercial_entity" type="object" string="the parent company" class="oe_link"/></p>
                     </div>

diff --git a/addons/account_followup/account_followup_customers.xml b/addons/account_followup/account_followup_customers.xml
index fba0bce..8973e6e 100644 (file)
--- a/addons/account_followup/account_followup_customers.xml
+++ b/addons/account_followup/account_followup_customers.xml
@@ -50,11 +50,11 @@
                         <filter string="No Responsible" domain="[('payment_responsible_id', '=', False)]"/>
                         <filter string="My Follow-ups" domain="[('payment_responsible_id','=', uid)]" name="my"/>
                     </group>
-                    <group expand="1" string="Group By...">
-                        <filter string="Follow-up Responsible" context="{'group_by':'payment_responsible_id'}"/>
-                        <filter string="Followup Level" context="{'group_by':'latest_followup_level_id'}"/>
-                    </group>
                 </search>
+                <xpath expr="//group[@string='Group By...']/filter[@string='Country']" position="after">
+                    <filter string="Follow-up Responsible" context="{'group_by':'payment_responsible_id'}"/>
+                    <filter string="Followup Level" context="{'group_by':'latest_followup_level_id'}"/>
+                </xpath>
             </field>
         </record>