From 5e12e254600e83423f4b47ead7ae55edd856bb0f Mon Sep 17 00:00:00 2001 From: Antoine Gonzalez Date: Thu, 14 Jan 2016 14:33:52 +0100 Subject: [PATCH] [PYTHON] simplify impl --- remembership.py | 20 ++------------------ 1 file changed, 2 insertions(+), 18 deletions(-) diff --git a/remembership.py b/remembership.py index 68a0ad5..d77a7c5 100644 --- a/remembership.py +++ b/remembership.py @@ -116,8 +116,8 @@ class Partner(osv.osv): return list_partner - def __get_membership_state(self, cr, uid, ids, name, args, context=None): - res = super(Partner, self).__get_membership_state(cr, uid, ids, name, args, context) + def _membership_state(self, cr, uid, ids, name, args, context=None): + res = super(Partner, self)._membership_state(cr, uid, ids, name, args, context) today = time.strftime('%Y-%m-%d') # special case when the partner is imported from a file, @@ -153,22 +153,6 @@ class Partner(osv.osv): 'member_ident': fields.char('Member identifier', size=64), 'associate_members': fields.one2many('res.partner', 'associate_member', 'Associate members', help='Members who are associated to this partner.'), # XXX: copied from openerp/addons/membership/membership.py - 'membership_state': fields.function( - __get_membership_state, - string = 'Current Membership Status', type = 'selection', - selection = STATE, - store = { - 'account.invoice': (_get_invoice_partner, ['state'], 20), - 'membership.membership_line': (_get_partner_id, ['state'], 20), - 'res.partner': (_get_partners, ['free_member', 'membership_state', 'associate_member'], 20) - }, help="""It indicates the membership state. - -Non Member: A partner who has not applied for any membership. - -Cancelled Member: A member who has cancelled his membership. - -Old Member: A member whose membership date has expired. - -Waiting Member: A member who has applied for the membership and whose invoice is going to be created. - -Invoiced Member: A member whose invoice has been created. - -Paying member: A member who has paid the membership fee."""), - # XXX: copied from openerp/addons/membership/membership.py 'membership_start': fields.function( _membership_date, multi = 'membership_start', string = 'Membership Start Date', type = 'date', -- 2.20.1