Merge lp:~openerp-dev/openobject-addons/7.0-opw-587622-mma into lp:openobject-addons/7.0

[Mayur Maheshwari(OpenERP)]

Hello

Go to Sale,In search view Group By.. label is displayed two times

This branch fix this isse

Thanks
Mayur

[Csaba TOTH (tsabi)]

Just a small suggestion: at line 22 you can use "'" instead of """. It will be more readable:

<xpath expr="//filter[@string='Country']" position="after">

thanks,
Csaba

[Naresh(OpenERP) (nch-openerp)]

Hi Mayur,

The diff should be improved for readability as stated by Csaba TOTH.

Thanks,
Naresh Soni
OpenERP Enterprise Services

review: Needs Fixing

Unmerged revisions

8828. By Mayur Maheshwari(OpenERP) on 2013-03-08

[FIX]account_followup: set serch view fix duplicate group by

=== modified file 'account_followup/account_followup_customers.xml'
--- account_followup/account_followup_customers.xml	2013-02-26 15:28:03 +0000
+++ account_followup/account_followup_customers.xml	2013-03-08 12:58:22 +0000
@@ -39,7 +39,7 @@
             <field name="model">res.partner</field>
             <field name="inherit_id" ref="base.view_res_partner_filter"/>
             <field name="arch" type="xml">
-                <search string="Search Partner" position="inside">
+                <field name="parent_id" postion="after">
                     <group string="Follow-up">
                         <filter string="Partners with Overdue Credits" domain="[('payment_amount_overdue', '>', 0.0)]" name="credits"/>
                         <separator/>
@@ -48,10 +48,10 @@
                         <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'}"/>
-                    </group>
-                </search>
+                </field>
+                <xpath expr="//filter[@string=&quot;Country&quot;]" position="after">
+                     <filter string="Follow-up Responsible" context="{'group_by':'payment_responsible_id'}"/>
+                </xpath>
             </field>
         </record>