|
|
|
|
@ -7,11 +7,10 @@ from pytils import numeral |
|
|
|
|
from dateutil.relativedelta import relativedelta |
|
|
|
|
|
|
|
|
|
from django.db import models |
|
|
|
|
from django.conf import settings |
|
|
|
|
from django.db.models import Max |
|
|
|
|
from django.core.urlresolvers import reverse |
|
|
|
|
|
|
|
|
|
from . import consts, managers, utils |
|
|
|
|
from customer import consts, managers, utils |
|
|
|
|
from myauth.models import DokUser |
|
|
|
|
from project.commons.utils import only_numerics |
|
|
|
|
|
|
|
|
|
@ -27,7 +26,7 @@ def get_profile(user): |
|
|
|
|
"""Возвращает профиль пользователя или None.""" |
|
|
|
|
try: |
|
|
|
|
return user.profile |
|
|
|
|
except: |
|
|
|
|
except : |
|
|
|
|
return None |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
@ -348,7 +347,6 @@ class Client(models.Model): |
|
|
|
|
else: |
|
|
|
|
return (u'%s, ИНН %s' % (self.name, self.inn or u'не указан',)).strip() |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
def save(self, *args, **kwargs): |
|
|
|
|
self.inn = only_numerics(self.inn) |
|
|
|
|
self.kpp = only_numerics(self.kpp) |
|
|
|
|
@ -413,8 +411,8 @@ class UserProfileFilters(models.Model): |
|
|
|
|
verbose_name = u'Фильтры реквизитов' |
|
|
|
|
verbose_name_plural = u'Фильтры реквизитов' |
|
|
|
|
|
|
|
|
|
def __unicode__(self): |
|
|
|
|
return u'%s' % self.user.email |
|
|
|
|
def __unicode__(self): # TODO fix name |
|
|
|
|
return u'{}'.format(self.company.email) |
|
|
|
|
|
|
|
|
|
def save(self, *args, **kwargs): |
|
|
|
|
# всегда включены |
|
|
|
|
|