Merge branch 'import_nk15' into 'master'

Import nk15

See merge request bde/nk20!23
This commit is contained in:
Pierre-antoine Comby 2020-02-25 20:31:41 +01:00
commit 25fc35c857
2 changed files with 6 additions and 4 deletions

View File

@ -27,6 +27,12 @@ class Note(PolymorphicModel):
help_text=_('in centimes, money credited for this instance'), help_text=_('in centimes, money credited for this instance'),
default=0, default=0,
) )
last_negative= models.DateTimeField(
verbose_name=_('last negative date'),
help_text=_('last time the balance was negative'),
null=True,
blank=True,
)
is_active = models.BooleanField( is_active = models.BooleanField(
_('active'), _('active'),
default=True, default=True,

View File

@ -164,10 +164,6 @@ class TemplateTransaction(Transaction):
TemplateCategory, TemplateCategory,
on_delete=models.PROTECT, on_delete=models.PROTECT,
) )
name = models.CharField(
max_length=255,
)
class MembershipTransaction(Transaction): class MembershipTransaction(Transaction):
""" """