Merge lp:~openerp-dev/openobject-addons/trunk-bug-1185410-Chandni into lp:openobject-addons

[Chandni Machchhar(OpenERP)]

Hello,

 I have solve the problem of Group by which gives an error in Supplier and Customer list view.

Thanks,
Chandni.

Unmerged revisions

8747. By Chandni Machchhar(OpenERP) on 2013-06-04

[FIX] Solve the issue of Group by gives an error in Supplier and Customer list view.

=== modified file 'account_followup/account_followup_customers.xml'
--- account_followup/account_followup_customers.xml	2013-04-22 15:34:49 +0000
+++ account_followup/account_followup_customers.xml	2013-06-04 11:34:42 +0000
@@ -31,6 +31,7 @@
             <field name="arch" type="xml">
                  <field name="display_name" position="after">
                      <field name="payment_responsible_id" invisible="1"/>
+                     <field name="latest_followup_level_id" invisible="1"/>
                  </field>
              </field>
          </record>

=== modified file 'membership/membership_view.xml'
--- membership/membership_view.xml	2012-12-08 10:33:38 +0000
+++ membership/membership_view.xml	2013-06-04 11:34:42 +0000
@@ -218,6 +218,9 @@
                 <tree string="Contacts">
                     <field name="category_id" position="after"/>
                     <field name="membership_state"/>
+                    <field name="membership_start"/>
+                    <field name="membership_stop"/>
+                    <field name="associate_member"/>
                 </tree>
             </field>
         </record>