Loading membership.py +5 −10 Original line number Diff line number Diff line Loading @@ -43,8 +43,7 @@ class Membership(ModelSQL, ModelView): """Membership""" __name__ = 'association.membership' name = fields.Char('Name', size=None, required=True, help="The name of the membership.") name = fields.Char('Name', size=None, required=True) periods = fields.One2Many('association.membership.period', 'membership', 'Periods', help="A list of periods taht define the membership.") Loading Loading @@ -96,8 +95,7 @@ class Line(ModelSQL, ModelView): (), )], depends=['end_date', 'member_state'], states=_LINE_STATES, help="The date when the membership starts.") states=_LINE_STATES) end_date = fields.Date('End Date', domain=[ If( Loading @@ -106,8 +104,7 @@ class Line(ModelSQL, ModelView): (), )], depends=['start_date', 'member_state'], states=_LINE_STATES, help="The date when the membership ends.") states=_LINE_STATES) member_state = fields.Function(fields.Selection(_MEMBER_STATES, "Member State"), 'on_change_with_member_state') member_join_date = fields.Function(fields.Date("Member Join Date"), Loading Loading @@ -154,12 +151,10 @@ class Period(ModelSQL, ModelView): ('start_date', '<=', Eval('end_date', None)) ], depends=['end_date'], help="The starting date of the period.") depends=['end_date']) end_date = fields.Date('Ending Date', required=True, domain=[('end_date', '>=', Eval('start_date', None))], depends=['start_date'], help="The ending date of the period.") depends=['start_date']) amount = fields.Numeric("Amount", fee_digit, required=True, help="The fee amount.") Loading Loading
membership.py +5 −10 Original line number Diff line number Diff line Loading @@ -43,8 +43,7 @@ class Membership(ModelSQL, ModelView): """Membership""" __name__ = 'association.membership' name = fields.Char('Name', size=None, required=True, help="The name of the membership.") name = fields.Char('Name', size=None, required=True) periods = fields.One2Many('association.membership.period', 'membership', 'Periods', help="A list of periods taht define the membership.") Loading Loading @@ -96,8 +95,7 @@ class Line(ModelSQL, ModelView): (), )], depends=['end_date', 'member_state'], states=_LINE_STATES, help="The date when the membership starts.") states=_LINE_STATES) end_date = fields.Date('End Date', domain=[ If( Loading @@ -106,8 +104,7 @@ class Line(ModelSQL, ModelView): (), )], depends=['start_date', 'member_state'], states=_LINE_STATES, help="The date when the membership ends.") states=_LINE_STATES) member_state = fields.Function(fields.Selection(_MEMBER_STATES, "Member State"), 'on_change_with_member_state') member_join_date = fields.Function(fields.Date("Member Join Date"), Loading Loading @@ -154,12 +151,10 @@ class Period(ModelSQL, ModelView): ('start_date', '<=', Eval('end_date', None)) ], depends=['end_date'], help="The starting date of the period.") depends=['end_date']) end_date = fields.Date('Ending Date', required=True, domain=[('end_date', '>=', Eval('start_date', None))], depends=['start_date'], help="The ending date of the period.") depends=['start_date']) amount = fields.Numeric("Amount", fee_digit, required=True, help="The fee amount.") Loading