From faa1a76e15a2434d0b7df54609726c9763015a78 Mon Sep 17 00:00:00 2001 From: Andrey Date: Tue, 7 Nov 2017 13:41:40 +0300 Subject: [PATCH] =?UTF-8?q?=D0=9C=D0=B8=D0=B3=D1=80=D0=B0=D1=86=D0=B8?= =?UTF-8?q?=D1=8F=20=D0=B4=D0=B8=D0=B0=D0=BB=D0=BE=D0=B3=D0=BE=D0=B2=20?= =?UTF-8?q?=D0=BF=D0=BE=D0=B4=20=D0=B4=D0=BE=D0=BC=D0=B0=D1=88=D0=BA=D0=B0?= =?UTF-8?q?=D0=BC=D0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../migrations/0006_remove_invoice_out_id.py | 19 +++++++++++++++++++ finance/models.py | 3 +-- 2 files changed, 20 insertions(+), 2 deletions(-) create mode 100644 finance/migrations/0006_remove_invoice_out_id.py diff --git a/finance/migrations/0006_remove_invoice_out_id.py b/finance/migrations/0006_remove_invoice_out_id.py new file mode 100644 index 0000000..f78276e --- /dev/null +++ b/finance/migrations/0006_remove_invoice_out_id.py @@ -0,0 +1,19 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.11.6 on 2017-11-07 13:41 +from __future__ import unicode_literals + +from django.db import migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ('finance', '0005_invoice_is_open'), + ] + + operations = [ + migrations.RemoveField( + model_name='invoice', + name='out_id', + ), + ] diff --git a/finance/models.py b/finance/models.py index 2674a75..8cd05ac 100755 --- a/finance/models.py +++ b/finance/models.py @@ -41,10 +41,9 @@ class Invoice(models.Model): status = models.CharField(verbose_name='Статус', max_length=1, default='W', choices=BILL_STATUSES) price = models.IntegerField(verbose_name='Сумма', null=True, blank=True) real_price = models.IntegerField(verbose_name='Полученная сумма', null=True, blank=True, - help_text='Сумма, минус комиссия') + help_text='Сумма, минус комиссия') bill_method = models.CharField(verbose_name='Способ оплаты', max_length=2, default='Y', choices=BILL_METHOD) key = models.CharField(verbose_name='Ключ платежа', blank=True, max_length=255, default='', editable=False) - out_id = models.CharField(verbose_name='ID внешнего заказа', max_length=100, blank=True, default='', editable=False) comment = models.TextField(verbose_name='Комментарий продавца', help_text='Будет показано пользователю', blank=True, editable=False) bill = models.ForeignKey(to=Bill, verbose_name="Связный счёт")