From: Ludovic CHEVALIER Date: Wed, 13 Jan 2016 15:48:51 +0000 (+0100) Subject: [PYTHON] ~fix partner last membership product problem X-Git-Url: http://git.cyclocoop.org/%7B%24admin_url%7Dcompta/comptes/%27http:/jquery.khurshid.com/ifixpng.php/%40%20%27info_desinstaller_plugin%27%20=%3E%20%27%20deactivates%20the%20plugin%20and%20deletes%20the%20data%27%2C%20%27info_discussion_cours%27%20=%3E%20%27Current%20discussions%27%2C%20%27info_ecrire_article%27%20=%3E%20%27Before%20writing%20any%20articles%2C%20you%20must%20create%20at%20least%20one%20section.%27%2C-%27info_email_envoi%27%20=%3E%20%27Sender/%27s%20email%20address%20%28optional%29%27%2C-%27info_email_envoi_txt%27%20=%3E%20%27Enter%20the%20sender/%27s%20email%20address%20used%20for%20sending%20emails%20%28by%20default%2C%20the%20recipient/%27s%20address%20is%20used%20as%20the%20sender/%27s%20address%29%C3%82%C2%A0:%27%2C-%27info_email_webmestre%27%20=%3E%20%27Webmaster/%27s%20email%20address%27%2C%20%27info_email_envoi%27%20=%3E%20%27Sender%C3%A2%C2%80%C2%99s%20email%20address%20%28optional%29%27%2C%20%27info_email_envoi_txt%27%20=%3E%20%27Enter%20the%20sender%C3%A2%C2%80%C2%99s%20email%20address%20used%20for%20sending%20emails%20%28by%20default%2C%20the%20recipient%C3%A2%C2%80%C2%99s%20address%20is%20used%20as%20the%20sender%C3%A2%C2%80%C2%99s%20address%29%C3%82%C2%A0:%27%2C%20%27info_email_webmestre%27%20=%3E%20%27Webmaster%C3%A2%C2%80%C2%99s%20email%20address%27%2C%20%27info_entrer_code_alphabet%27%20=%3E%20%27Enter%20the%20code%20of%20the%20character%20set%20to%20be%20used:%27%2C%20%27info_envoi_email_automatique%27%20=%3E%20%27Automated%20mailing%27%2C%20%27info_envoyer_maintenant%27%20=%3E%20%27Send%20now%27%2C%40%40%20-340%2C8%20%20340%2C8%20%40%40%20Do%20not%20submit%20this%20import%20request.%3Cp%3EFor%20more%20information%2C%20please%20see%20%3Ca%20href=?a=commitdiff_plain;h=2dc7e598687757147614c3b99743b77b511a7636;p=burette%2Fetudesetchantiersidf.git [PYTHON] ~fix partner last membership product problem --- diff --git a/etudesetchantiersidf.py b/etudesetchantiersidf.py index 1f40102..468996d 100644 --- a/etudesetchantiersidf.py +++ b/etudesetchantiersidf.py @@ -31,15 +31,15 @@ from openerp.osv import fields class Partner(osv.osv): '''Partner''' _inherit = 'res.partner' - ''' - def _get_invoice_partner(self, cr, uid, ids, context=None): - res = super(Partner, self)._get_invoice_partner(cr, uid, ids, context=context) - return res def _get_partner_id(self, cr, uid, ids, context=None): - res = super(Partner, self)._get_partner_id(cr, uid, ids, context=context) - return res - ''' + return super(Partner, self.pool['res.partner'])._get_partner_id(cr, uid, ids, context=context) + + def _get_invoice_partner(self, cr, uid, ids, context=None): + return super(Partner, self.pool['res.partner'])._get_invoice_partner(cr, uid, ids, context=context) + + def _get_order_partner(self, cr, uid, ids, context=None): + return super(Partner, self.pool['res.partner'])._get_order_partner(cr, uid, ids, context=context) def _get_last_mb_product(self, cr, uid, ids, name, args, context=None): """Return the last membership product buy by a user""" @@ -51,28 +51,26 @@ class Partner(osv.osv): line_id = member_line_obj.search(cr, uid, [ ('partner', '=', partner_id), ('date_cancel', '=', False) - ], limit=1, order='date_from', context=context) + ], limit=1, order='date_from desc', context=context) if line_id: product_id = member_line_obj.read(cr, uid, line_id[0], [name], context=context)[name][0] res[partner.id] = {name: product_id} return res - _columns = { 'membership_id': fields.function( _get_last_mb_product, multi='membership_id', string='Last membership product', type='many2one', obj='product.product', - store=True, + store = { + 'account.invoice': (_get_invoice_partner, ['state'], 11), + 'pos.order': (_get_order_partner, ['state', 'partner_id'], 11), + 'membership.membership_line': (_get_partner_id, ['state'], 10), + 'res.partner': (lambda self, cr, uid, ids, c={}: ids, ['free_member'], 10) + } ), } -''' -store = { - 'account.invoice': (_get_invoice_partner, ['state'], 10), - 'membership.membership_line': (_get_partner_id, ['state'], 10, ) - } -''' Partner()