Merge branch 'develop' into account_test

apps/collection/migrations/0012_auto_20190923_1340.py

@@ -0,0 +1,19 @@
+# Generated by Django 2.2.4 on 2019-09-23 13:40
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('collection', '0011_auto_20190920_1059'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='guide',
+            name='parent',
+            field=models.ForeignKey(blank=True, default=None, null=True, on_delete=django.db.models.deletion.CASCADE, to='collection.Guide', verbose_name='parent'),
+        ),
+    ]

apps/establishment/migrations/0030_auto_20190923_1340.py

@@ -0,0 +1,18 @@
+# Generated by Django 2.2.4 on 2019-09-23 13:40
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('establishment', '0029_establishment_name_transliterated'),
+    ]
+
+    operations = [
+        migrations.RenameField(
+            model_name='establishment',
+            old_name='name_transliterated',
+            new_name='name_translated',
+        ),
+    ]

apps/establishment/serializers/common.py

@@ -154,7 +154,7 @@ class EstablishmentBaseSerializer(serializers.ModelSerializer):
         fields = [
             'id',
             'name',
-            'name_transliterated',
+            'name_translated',
             'price_level',
             'toque_number',
             'public_mark',