Merge branch 'current_branch' into 'dev'

Current branch

See merge request !222

finance/migrations/0003_auto_20180315_1358.py

@@ -0,0 +1,20 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11.6 on 2018-03-15 13:58
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('finance', '0002_auto_20180202_1301'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='invoice',
+            name='real_price',
+            field=models.FloatField(blank=True, editable=False, help_text='Сумма, минус комиссия', null=True, verbose_name='Полученная сумма'),
+        ),
+    ]

finance/models.py

@@ -44,7 +44,7 @@ class Invoice(models.Model):
     )
     status = models.CharField(verbose_name='Статус', max_length=1, default='W', choices=BILL_STATUSES)
     price = models.IntegerField(verbose_name='Сумма', editable=False, null=True, blank=True)
-    real_price = models.IntegerField(verbose_name='Полученная сумма', null=True, blank=True,
+    real_price = models.FloatField(verbose_name='Полученная сумма', null=True, blank=True,
                                      help_text='Сумма, минус комиссия', editable=False)
     method = models.CharField(verbose_name='Способ оплаты', max_length=2, default='Y', choices=BILL_METHOD)
     key = models.CharField(verbose_name='Ключ платежа', max_length=255, editable=False, blank=True)