[MERGE]: merge with lp:~openerp-dev/openobject-addons/trunk-dev-addons2

bzr revid: atp@tinyerp.co.in-20100622051544-c7hig73zk2at66cy

addons/membership/membership.py

@@ -150,7 +150,7 @@ class membership_line(osv.osv):
             )
         JOIN account_invoice ai ON (
             ai.id = ail.invoice_id)
-        WHERE ml.id =ANY(%s)''',(ids,))
+        WHERE ml.id IN %s''',(tuple(ids),))
         res = cr.fetchall()
         for r in res:
             if r[0] and r[0] < 0:
@@ -406,7 +406,7 @@ class Partner(osv.osv):
     def _check_recursion(self, cr, uid, ids):
         level = 100
         while len(ids):
-            cr.execute('select distinct associate_member from res_partner where id =ANY(%s)',(ids,))
+            cr.execute('select distinct associate_member from res_partner where id IN %s',(tuple(ids),))
             ids = filter(None, map(lambda x:x[0], cr.fetchall()))
             if not level:
                 return False
@@ -440,7 +440,7 @@ class Product(osv.osv):
     def fields_view_get(self, cr, user, view_id=None, view_type='form', context=None, toolbar=False, submenu=False):
         if ('product' in context) and (context['product']=='membership_product'):
             model_data_ids_form = self.pool.get('ir.model.data').search(cr,user,[('model','=','ir.ui.view'),('name','in',['membership_products_form','membership_products_tree'])])
-            resource_id_form = self.pool.get('ir.model.data').read(cr,user,model_data_ids_form,fields=['res_id','name'])
+            resource_id_form = self.pool.get('ir.model.data').read(cr, user, model_data_ids_form, fields=['res_id','name'])
             dict_model={}
             for i in resource_id_form:
                 dict_model[i['name']]=i['res_id']
@@ -477,10 +477,10 @@ class Invoice(osv.osv):
         member_line_obj = self.pool.get('membership.membership_line')
         today = time.strftime('%Y-%m-%d')
         for invoice in self.browse(cr, uid, ids):
-            mlines = member_line_obj.search(cr,uid,
+            mlines = member_line_obj.search(cr, uid,
                     [('account_invoice_line','in',
                         [ l.id for l in invoice.invoice_line])], context)
-            member_line_obj.write(cr,uid,mlines, {'date_cancel':today}, context)
+            member_line_obj.write(cr, uid, mlines, {'date_cancel':today}, context)
         return super(Invoice, self).action_cancel(cr, uid, ids, context)
 Invoice()
 

addons/membership/membership_view.xml

@@ -82,7 +82,7 @@
             <field name="act_window_id" ref="action_membership_products"/>
         </record>
 
-        <menuitem name="Membership" id="menu_membership" icon="terp-crm"/>
+        <menuitem name="Membership" id="menu_membership" icon="terp-crm" sequence="25"/>
         <menuitem name="Members" parent="menu_membership"
             id="menu_member"
             sequence="1"/>

addons/membership/wizard/membership_invoice.py

@@ -43,7 +43,7 @@ class membership_invoice(osv.osv_memory):
             cr.execute('''
                         SELECT partner_id, id, type
                         FROM res_partner_address
-                        WHERE partner_id =ANY(%s)''',(partner_ids,))
+                        WHERE partner_id IN %s''',(tuple(partner_ids),))
             fetchal = cr.fetchall()
             if not fetchal:
                 raise osv.except_osv(_('Error !'), _('No Address defined for this partner'))