diff --git a/accounts/models.py b/accounts/models.py index 8fa811c3..1f30a933 100644 --- a/accounts/models.py +++ b/accounts/models.py @@ -70,14 +70,12 @@ class Account(models.Model): assigned_to = models.ManyToManyField(User, related_name="account_assigned_users") teams = models.ManyToManyField(Teams, related_name="account_teams") - class Meta: ordering = ["-created_on"] - + def __str__(self): return self.name - def get_complete_address(self): """Concatenates complete address.""" address = "" diff --git a/common/migrations/0027_auto_20210418_1112.py b/common/migrations/0027_auto_20210418_1112.py index d3da47a5..8e3c08ba 100644 --- a/common/migrations/0027_auto_20210418_1112.py +++ b/common/migrations/0027_auto_20210418_1112.py @@ -8,73 +8,101 @@ import django.db.models.deletion class Migration(migrations.Migration): dependencies = [ - ('common', '0026_auto_20210325_1923'), + ("common", "0026_auto_20210325_1923"), ] operations = [ migrations.AlterField( - model_name='address', - name='address_line', - field=models.CharField(blank=True, default='', max_length=255, verbose_name='Address'), + model_name="address", + name="address_line", + field=models.CharField( + blank=True, default="", max_length=255, verbose_name="Address" + ), ), migrations.AlterField( - model_name='address', - name='city', - field=models.CharField(blank=True, default='', max_length=255, verbose_name='City'), + model_name="address", + name="city", + field=models.CharField( + blank=True, default="", max_length=255, verbose_name="City" + ), ), migrations.AlterField( - model_name='address', - name='postcode', - field=models.CharField(blank=True, default='', max_length=64, verbose_name='Post/Zip-code'), + model_name="address", + name="postcode", + field=models.CharField( + blank=True, default="", max_length=64, verbose_name="Post/Zip-code" + ), ), migrations.AlterField( - model_name='address', - name='state', - field=models.CharField(blank=True, default='', max_length=255, verbose_name='State'), + model_name="address", + name="state", + field=models.CharField( + blank=True, default="", max_length=255, verbose_name="State" + ), ), migrations.AlterField( - model_name='address', - name='street', - field=models.CharField(blank=True, default='', max_length=55, verbose_name='Street'), + model_name="address", + name="street", + field=models.CharField( + blank=True, default="", max_length=55, verbose_name="Street" + ), ), migrations.AlterField( - model_name='apisettings', - name='created_by', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='settings_created_by', to=settings.AUTH_USER_MODEL), + model_name="apisettings", + name="created_by", + field=models.ForeignKey( + blank=True, + null=True, + on_delete=django.db.models.deletion.SET_NULL, + related_name="settings_created_by", + to=settings.AUTH_USER_MODEL, + ), ), migrations.AlterField( - model_name='apisettings', - name='title', + model_name="apisettings", + name="title", field=models.TextField(), ), migrations.AlterField( - model_name='attachments', - name='created_by', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='attachment_created_by', to=settings.AUTH_USER_MODEL), + model_name="attachments", + name="created_by", + field=models.ForeignKey( + blank=True, + null=True, + on_delete=django.db.models.deletion.SET_NULL, + related_name="attachment_created_by", + to=settings.AUTH_USER_MODEL, + ), ), migrations.AlterField( - model_name='company', - name='address', - field=models.TextField(blank=True, default=''), + model_name="company", + name="address", + field=models.TextField(blank=True, default=""), ), migrations.AlterField( - model_name='company', - name='name', - field=models.CharField(blank=True, default='', max_length=100), + model_name="company", + name="name", + field=models.CharField(blank=True, default="", max_length=100), ), migrations.AlterField( - model_name='document', - name='created_by', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='document_uploaded', to=settings.AUTH_USER_MODEL), + model_name="document", + name="created_by", + field=models.ForeignKey( + blank=True, + null=True, + on_delete=django.db.models.deletion.SET_NULL, + related_name="document_uploaded", + to=settings.AUTH_USER_MODEL, + ), ), migrations.AlterField( - model_name='document', - name='title', - field=models.TextField(blank=True, default=''), + model_name="document", + name="title", + field=models.TextField(blank=True, default=""), ), migrations.AlterField( - model_name='google', - name='google_url', - field=models.TextField(default=''), + model_name="google", + name="google_url", + field=models.TextField(default=""), ), ] diff --git a/common/models.py b/common/models.py index 9acc6f52..29747299 100644 --- a/common/models.py +++ b/common/models.py @@ -86,14 +86,16 @@ class User(AbstractBaseUser, PermissionsMixin): return self.email - - class Address(models.Model): - address_line = models.CharField(_("Address"), max_length=255, blank=True, default="") + address_line = models.CharField( + _("Address"), max_length=255, blank=True, default="" + ) street = models.CharField(_("Street"), max_length=55, blank=True, default="") city = models.CharField(_("City"), max_length=255, blank=True, default="") state = models.CharField(_("State"), max_length=255, blank=True, default="") - postcode = models.CharField(_("Post/Zip-code"), max_length=64, blank=True, default="") + postcode = models.CharField( + _("Post/Zip-code"), max_length=64, blank=True, default="" + ) country = models.CharField(max_length=3, choices=COUNTRIES, blank=True, null=True) def __str__(self): @@ -381,7 +383,6 @@ class Document(models.Model): return ("file", "fa fa-file") return ("file", "fa fa-file") - @property def get_team_users(self): team_user_ids = list(self.teams.values_list("users__id", flat=True)) diff --git a/contacts/models.py b/contacts/models.py index 506aca18..154883ee 100644 --- a/contacts/models.py +++ b/contacts/models.py @@ -38,7 +38,6 @@ class Contact(models.Model): def created_on_arrow(self): return arrow.get(self.created_on).humanize() - @property def get_team_users(self): team_user_ids = list(self.teams.values_list("users__id", flat=True)) diff --git a/crm/settings.py b/crm/settings.py index 829bf238..d1f77bc9 100644 --- a/crm/settings.py +++ b/crm/settings.py @@ -240,4 +240,4 @@ SECURE_HSTS_INCLUDE_SUBDOMAINS = True SECURE_HSTS_PRELOAD = True SECURE_CONTENT_TYPE_NOSNIFF = True -DEFAULT_AUTO_FIELD='django.db.models.AutoField' +DEFAULT_AUTO_FIELD = "django.db.models.AutoField" diff --git a/emails/models.py b/emails/models.py index 29fbf5ac..b7e819df 100644 --- a/emails/models.py +++ b/emails/models.py @@ -17,6 +17,6 @@ class Email(models.Model): class Meta: ordering = ["-id"] - + def __str__(self): return self.subject diff --git a/invoices/models.py b/invoices/models.py index 9d5f8f77..cdd5c17b 100644 --- a/invoices/models.py +++ b/invoices/models.py @@ -88,7 +88,7 @@ class Invoice(models.Model): prev_invoice_number=self.invoice_number ) super(Invoice, self).save(*args, **kwargs) - + def invoice_id_generator(self, prev_invoice_number=None): if prev_invoice_number: prev_invoice_number += 1 @@ -96,8 +96,6 @@ class Invoice(models.Model): date = datetime.datetime.now().strftime("%d%m%Y") return int(date + "0001") - - def formatted_total_amount(self): return self.currency + " " + str(self.total_amount) @@ -229,7 +227,7 @@ class InvoiceHistory(models.Model): class Meta: ordering = ("created_on",) - + def formatted_total_amount(self): return self.currency + " " + str(self.total_amount) diff --git a/teams/models.py b/teams/models.py index 95be6353..c61effb4 100644 --- a/teams/models.py +++ b/teams/models.py @@ -20,11 +20,10 @@ class Teams(models.Model): class Meta: ordering = ("id",) - + def __str__(self): return self.name - @property def created_on_arrow(self): return arrow.get(self.created_on).humanize()