vignesh/bottleneckcrm
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

1.0beta3 (#439)

Browse source
This commit is contained in:
Ashwin Kumar 2021-04-18 11:21:43 +05:30 committed by GitHub
parent 3854ca1e6a
commit 3f889e0f02
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
8 changed files with 79 additions and 56 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
accounts/models.py
View file

@ -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 = ""

106
common/migrations/0027_auto_20210418_1112.py
View file

@ -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=""),
),
]

11
common/models.py
View file

@ -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))

1
contacts/models.py
View file

@ -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))

2
crm/settings.py
View file

@ -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"

2
emails/models.py
View file

@ -17,6 +17,6 @@ class Email(models.Model):
class Meta:
ordering = ["-id"]
def __str__(self):
return self.subject

6
invoices/models.py
View file

@ -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)

3
teams/models.py
View file

@ -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()