diff options
Diffstat (limited to 'ishtar_common/models_imports.py')
| -rw-r--r-- | ishtar_common/models_imports.py | 6 | 
1 files changed, 3 insertions, 3 deletions
| diff --git a/ishtar_common/models_imports.py b/ishtar_common/models_imports.py index b3b64bd65..7a8a10bc2 100644 --- a/ishtar_common/models_imports.py +++ b/ishtar_common/models_imports.py @@ -947,7 +947,7 @@ class Import(models.Model):                      "will be used.")      )      encoding = models.CharField(_("Encoding"), choices=ENCODINGS, -                                default=u'utf-8', max_length=15) +                                default='utf-8', max_length=15)      csv_sep = models.CharField(          _("CSV separator"), choices=CSV_SEPS, default=',', max_length=1,          help_text=_("Separator for CSV file. Standard is comma but Microsoft " @@ -966,10 +966,10 @@ class Import(models.Model):          _("Match file"), upload_to="upload/imports/%Y/%m/", blank=True,          null=True, max_length=255, help_text=max_size_help())      state = models.CharField(_("State"), max_length=2, choices=IMPORT_STATE, -                             default=u'C') +                             default='C')      conservative_import = models.BooleanField(          _("Conservative import"), default=False, -        help_text=_(u'If set to true, do not overload existing values.')) +        help_text=_('If set to true, do not overload existing values.'))      creation_date = models.DateTimeField(          _("Creation date"), auto_now_add=True, blank=True, null=True)      end_date = models.DateTimeField(_("End date"), auto_now_add=True, | 
