Loading member.py +5 −12 Original line number Diff line number Diff line Loading @@ -29,11 +29,6 @@ class Member(Workflow, ModelSQL, ModelView): 'Member' __name__ = "association.member" _rec_name = 'party_name' party_name = fields.Function(fields.Char("Party Name"), 'on_change_with_party_name', searcher='search_party_member') state = fields.Selection(STATES, 'State', readonly=True) code = fields.Char('Code', required=True, select=True, states={'readonly': Eval('code_readonly', True)}, Loading Loading @@ -103,11 +98,6 @@ class Member(Workflow, ModelSQL, ModelView): }, }) @fields.depends('party', '_parent_party.name') def on_change_with_party_name(self, name=None): if self.party: return self.party.name def get_code_readonly(self, name): return True Loading @@ -121,8 +111,11 @@ class Member(Workflow, ModelSQL, ModelView): if sequence: return Sequence.get_id(sequence.id) def get_rec_name(self, name): return self.party.rec_name @classmethod def search_party_member(cls, name, clause): def search_rec_name(cls, name, clause): return [('party', ) + tuple(clause[1:])] @classmethod Loading Loading @@ -185,7 +178,7 @@ class Member(Workflow, ModelSQL, ModelView): if not all(x.paid for x in pending_fees): raise MemberUnpaidFeeError( gettext('association.msg_unpaid_fee', member=", ".join([x.party_name for x in members]))) member=", ".join([x.rec_name for x in members]))) for member in members: if not member.leave_date: Loading Loading
member.py +5 −12 Original line number Diff line number Diff line Loading @@ -29,11 +29,6 @@ class Member(Workflow, ModelSQL, ModelView): 'Member' __name__ = "association.member" _rec_name = 'party_name' party_name = fields.Function(fields.Char("Party Name"), 'on_change_with_party_name', searcher='search_party_member') state = fields.Selection(STATES, 'State', readonly=True) code = fields.Char('Code', required=True, select=True, states={'readonly': Eval('code_readonly', True)}, Loading Loading @@ -103,11 +98,6 @@ class Member(Workflow, ModelSQL, ModelView): }, }) @fields.depends('party', '_parent_party.name') def on_change_with_party_name(self, name=None): if self.party: return self.party.name def get_code_readonly(self, name): return True Loading @@ -121,8 +111,11 @@ class Member(Workflow, ModelSQL, ModelView): if sequence: return Sequence.get_id(sequence.id) def get_rec_name(self, name): return self.party.rec_name @classmethod def search_party_member(cls, name, clause): def search_rec_name(cls, name, clause): return [('party', ) + tuple(clause[1:])] @classmethod Loading Loading @@ -185,7 +178,7 @@ class Member(Workflow, ModelSQL, ModelView): if not all(x.paid for x in pending_fees): raise MemberUnpaidFeeError( gettext('association.msg_unpaid_fee', member=", ".join([x.party_name for x in members]))) member=", ".join([x.rec_name for x in members]))) for member in members: if not member.leave_date: Loading