Merge remote-tracking branch 'origin/master'

apps/admin/tenant/serializers.py

@@ -1,7 +1,7 @@
 # coding=utf-8
 import datetime
 from rest_framework import serializers
-from apps.tenant.models import Tenant,Factura
+from apps.tenant.models import Tenant,Invoice
 from apps.tenant.employee.models import Employee
 from utils.exceptions import CustomError
 from apps.account.models import User
@@ -51,8 +51,8 @@ class TenantSerializer(serializers.ModelSerializer) :
         return instance
 
 
-class FacturaSerializer(serializers.ModelSerializer):
+class InvoiceSerializer(serializers.ModelSerializer):
 
     class Meta:
-        model = Factura
+        model = Invoice
         fields = '__all__'

apps/tenant/models.py

@@ -214,7 +214,7 @@ class Pay(models.Model):
         pay.save()
         return pay
 
-class Factura(models.Model):
+class Invoice(models.Model):
     NOT_CHECKED = 0
     NOT_MAIL = 1
     MAILED = 2
@@ -227,30 +227,30 @@ class Factura(models.Model):
         (REJECT, u'未通过'),
     )
 
-    factura_name = models.CharField(max_length=50, verbose_name=u'名称', blank=True, null=True)
-    tax_no = models.CharField(max_length=200, verbose_name=u'税号', blank=True, null=True)
+    invoice_name = models.CharField(max_length=50, verbose_name=u'名称')
+    tax_no = models.CharField(max_length=200, verbose_name=u'税号')
     company_address = models.CharField(max_length=200, verbose_name=u'单位地址', blank=True, null=True)
     phone_no = models.CharField(max_length=20, verbose_name=u'电话号码', blank=True, null=True)
     deposit_bank = models.CharField(max_length=50, verbose_name=u'开户银行', blank=True, null=True)
     bank_account = models.CharField(max_length=50, verbose_name=u'银行帐户', blank=True, null=True)
-    factura_sum = models.CharField(max_length=20, verbose_name=u'发票金额', blank=True, null=True)
+    invoice_sum = models.FloatField(max_length=20, verbose_name=u'发票金额')
 
     user = models.ForeignKey(settings.AUTH_USER_MODEL, verbose_name=u"申请人", on_delete=models.PROTECT,
-                             editable=False, null=True)
+                             editable=False)
     create_time = models.DateTimeField(verbose_name=u'申请时间', auto_now_add=True, editable=False)
     status = models.PositiveSmallIntegerField(choices=APPLY_STATE_CHOICES, verbose_name=u'状态',
                                               default=NOT_CHECKED)
     reject_reason = models.CharField(max_length=200, verbose_name=u'拒绝原因', blank=True, null=True)
     use_time = models.DateTimeField(verbose_name=u'操作时间', auto_now_add=True, editable=False)
 
-    consignee = models.CharField(max_length=10, verbose_name=u'收件人', blank=True, null=True)
-    consignee_tel= models.CharField(max_length=20, verbose_name=u'收件人电话', blank=True, null=True)
-    consignee_address= models.CharField(max_length=200, verbose_name=u'收件地址', blank=True, null=True)
+    consignee = models.CharField(max_length=10, verbose_name=u'收件人',)
+    consignee_tel= models.CharField(max_length=20, verbose_name=u'收件人电话')
+    consignee_address= models.CharField(max_length=200, verbose_name=u'收件地址')
     express_company = models.CharField(max_length=20, verbose_name=u'快递公司', blank=True, null=True)
     express_number = models.CharField(max_length=200, verbose_name=u'快递单号', blank=True, null=True)
 
     class Meta:
-        db_table = 'factura'
+        db_table = 'invoice'
         ordering = ['-id']
         verbose_name = '申请发票'
         default_permissions = ()