diff --git a/finance/migrations/0004_auto_20180321_1653.py b/finance/migrations/0006_auto_20180330_1121.py similarity index 59% rename from finance/migrations/0004_auto_20180321_1653.py rename to finance/migrations/0006_auto_20180330_1121.py index b00a881..d4a8435 100644 --- a/finance/migrations/0004_auto_20180321_1653.py +++ b/finance/migrations/0006_auto_20180330_1121.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Generated by Django 1.11.6 on 2018-03-21 16:53 +# Generated by Django 1.11.6 on 2018-03-30 11:21 from __future__ import unicode_literals from django.db import migrations, models @@ -8,10 +8,14 @@ from django.db import migrations, models class Migration(migrations.Migration): dependencies = [ - ('finance', '0003_auto_20180315_1358'), + ('finance', '0005_auto_20180329_1346'), ] operations = [ + migrations.RemoveField( + model_name='installmentplan', + name='bill', + ), migrations.AddField( model_name='invoice', name='rebilling', @@ -22,4 +26,12 @@ class Migration(migrations.Migration): name='rebilling_on', field=models.BooleanField(default=False, editable=False, verbose_name='Повторять платеж'), ), + migrations.AlterField( + model_name='invoice', + name='date', + field=models.DateTimeField(auto_now_add=True), + ), + migrations.DeleteModel( + name='InstallmentPlan', + ), ] diff --git a/finance/models.py b/finance/models.py index 956caa7..979f903 100755 --- a/finance/models.py +++ b/finance/models.py @@ -67,18 +67,4 @@ class Invoice(models.Model): class Meta: verbose_name = 'Платёж' - verbose_name_plural = 'Платежи' - - -class InstallmentPlan(models.Model): - bill = models.OneToOneField(to=Bill, verbose_name="Связный счёт") - date = models.DateTimeField(auto_now_add=True, verbose_name="Дата создания") - invoice_amount = models.IntegerField(verbose_name="Количество платежей") - price = models.IntegerField(verbose_name="Цена одного платежа") - - def __str__(self): - return '%s' % self.bill.user.email - - class Meta: - verbose_name = 'Рассрочка' - verbose_name_plural = 'Рассрочки' + verbose_name_plural = 'Платежи' \ No newline at end of file diff --git a/template/mail/sales/back_set_bill.html b/template/mail/sales/back_set_bill.html new file mode 100644 index 0000000..f7e5884 --- /dev/null +++ b/template/mail/sales/back_set_bill.html @@ -0,0 +1,10 @@ + + + + + $Title$ + + +$END$ + + \ No newline at end of file diff --git a/template/mail/sales/back_set_bill.txt b/template/mail/sales/back_set_bill.txt new file mode 100644 index 0000000..e69de29