Loading membership.py +15 −8 Original line number Diff line number Diff line Loading @@ -43,14 +43,14 @@ class Membership(CompanyMultiValueMixin, ModelSQL, ModelView): """Membership""" __name__ = 'association.membership' name = fields.Char('Name', size=None, required=True) name = fields.Char('Name', size=None, required=True, help="The name of the membership") periods = fields.One2Many('association.membership.period', 'membership', 'Periods') 'Periods',help="The period that compose the membership") journal = fields.Many2One('account.journal', 'Journal', ondelete='RESTRICT') ondelete='RESTRICT',help="The accounting journal where the moves associated to this membership shold be stored") account_revenue = fields.Many2One('account.account', 'Account Revenue', domain=[ Loading @@ -60,7 +60,8 @@ class Membership(CompanyMultiValueMixin, ModelSQL, ModelView): {}).get('company', -1)), ], required=True, ondelete='RESTRICT') ondelete='RESTRICT', ) class Line(ModelSQL, ModelView): Loading Loading @@ -96,6 +97,7 @@ class Line(ModelSQL, ModelView): ], depends=['end_date', 'member_state'], states=_LINE_STATES, help="The date from where start the membership" ) end_date = fields.Date( 'End Date', Loading @@ -108,6 +110,7 @@ class Line(ModelSQL, ModelView): ], depends=['start_date', 'member_state'], states=_LINE_STATES, help="The date where the membership will end" ) @fields.depends('member', '_parent_member.state') Loading Loading @@ -146,6 +149,7 @@ class Period(CompanyValueMixin, ModelSQL, ModelView): required=True, domain=[('start_date', '<=', Eval('end_date', None))], depends=['end_date'], help="The starting date of the period" ) end_date = fields.Date( Loading @@ -153,9 +157,10 @@ class Period(CompanyValueMixin, ModelSQL, ModelView): required=True, domain=[('end_date', '>=', Eval('start_date', None))], depends=['start_date'], help="The ending date of the period" ) amount = fields.Numeric("Amount", fee_digit, required=True) amount = fields.Numeric("Amount", fee_digit, required=True,help="The fee amount") membership = fields.Many2One('association.membership', 'Membership', Loading Loading @@ -211,11 +216,13 @@ class Fee(ModelSQL, ModelView): "Period", required=True, ondelete='RESTRICT', states=_FEE_STATES) states=_FEE_STATES, help="The period associated to this fee") move = fields.Many2One('account.move', "Move", ondelete='RESTRICT', states=_FEE_STATES) states=_FEE_STATES, help="The accounting move associated to this fee") paid = fields.Function(fields.Boolean('paid'), 'is_paied') reconciled = fields.Function(fields.Date('Reconciled'), 'get_reconciled') company = fields.Many2One( Loading Loading @@ -410,7 +417,7 @@ class GenerateFeeStart(ModelView): "Create fees form" __name__ = 'association.membership.fee_create.start' date = fields.Date("Date") date = fields.Date("Date",help="Generate fees until this date") @classmethod def default_date(cls): Loading Loading
membership.py +15 −8 Original line number Diff line number Diff line Loading @@ -43,14 +43,14 @@ class Membership(CompanyMultiValueMixin, ModelSQL, ModelView): """Membership""" __name__ = 'association.membership' name = fields.Char('Name', size=None, required=True) name = fields.Char('Name', size=None, required=True, help="The name of the membership") periods = fields.One2Many('association.membership.period', 'membership', 'Periods') 'Periods',help="The period that compose the membership") journal = fields.Many2One('account.journal', 'Journal', ondelete='RESTRICT') ondelete='RESTRICT',help="The accounting journal where the moves associated to this membership shold be stored") account_revenue = fields.Many2One('account.account', 'Account Revenue', domain=[ Loading @@ -60,7 +60,8 @@ class Membership(CompanyMultiValueMixin, ModelSQL, ModelView): {}).get('company', -1)), ], required=True, ondelete='RESTRICT') ondelete='RESTRICT', ) class Line(ModelSQL, ModelView): Loading Loading @@ -96,6 +97,7 @@ class Line(ModelSQL, ModelView): ], depends=['end_date', 'member_state'], states=_LINE_STATES, help="The date from where start the membership" ) end_date = fields.Date( 'End Date', Loading @@ -108,6 +110,7 @@ class Line(ModelSQL, ModelView): ], depends=['start_date', 'member_state'], states=_LINE_STATES, help="The date where the membership will end" ) @fields.depends('member', '_parent_member.state') Loading Loading @@ -146,6 +149,7 @@ class Period(CompanyValueMixin, ModelSQL, ModelView): required=True, domain=[('start_date', '<=', Eval('end_date', None))], depends=['end_date'], help="The starting date of the period" ) end_date = fields.Date( Loading @@ -153,9 +157,10 @@ class Period(CompanyValueMixin, ModelSQL, ModelView): required=True, domain=[('end_date', '>=', Eval('start_date', None))], depends=['start_date'], help="The ending date of the period" ) amount = fields.Numeric("Amount", fee_digit, required=True) amount = fields.Numeric("Amount", fee_digit, required=True,help="The fee amount") membership = fields.Many2One('association.membership', 'Membership', Loading Loading @@ -211,11 +216,13 @@ class Fee(ModelSQL, ModelView): "Period", required=True, ondelete='RESTRICT', states=_FEE_STATES) states=_FEE_STATES, help="The period associated to this fee") move = fields.Many2One('account.move', "Move", ondelete='RESTRICT', states=_FEE_STATES) states=_FEE_STATES, help="The accounting move associated to this fee") paid = fields.Function(fields.Boolean('paid'), 'is_paied') reconciled = fields.Function(fields.Date('Reconciled'), 'get_reconciled') company = fields.Many2One( Loading Loading @@ -410,7 +417,7 @@ class GenerateFeeStart(ModelView): "Create fees form" __name__ = 'association.membership.fee_create.start' date = fields.Date("Date") date = fields.Date("Date",help="Generate fees until this date") @classmethod def default_date(cls): Loading