Prepare shop, renamle Category

diff --git a/app/organization/core/migrations/0004_auto_20160923_1141.py b/app/organization/core/migrations/0004_auto_20160923_1141.py
new file mode 100644 (file)
index 0000000..906235d
--- /dev/null
+++ b/app/organization/core/migrations/0004_auto_20160923_1141.py
@@ -0,0 +1,23 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.9.7 on 2016-09-23 09:41
+from __future__ import unicode_literals
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('organization-core', '0003_remove_linktype_picto'),
+    ]
+
+    operations = [
+        migrations.RenameModel(
+            old_name='Category',
+            new_name='CustomCategory',
+        ),
+        migrations.AlterModelOptions(
+            name='customcategory',
+            options={'verbose_name': 'custom category'},
+        ),
+    ]

diff --git a/app/organization/core/models.py b/app/organization/core/models.py
index f9b2406776a2b07155977c6780ad0a98a45adad7..dc6d6f64280b2d2b46f3f7c0cb5c51c7de9b50e1 100644 (file)
--- a/app/organization/core/models.py
+++ b/app/organization/core/models.py
@@ -63,11 +63,11 @@ class SubTitled(models.Model):
         abstract = True
 
 
-class Category(Named):
+class CustomCategory(Named):
     """Category description)"""
 
     class Meta:
-        verbose_name = _('category')
+        verbose_name = _('custom category')
 
     def __str__(self):
         return self.name

diff --git a/app/settings.py b/app/settings.py
index 12f99dd5276b1d78e020e72a020d70bbe04afa74..8877335f932613f2e67d03c414d255c58f570818 100644 (file)
--- a/app/settings.py
+++ b/app/settings.py
@@ -127,6 +127,7 @@ USE_L10N = True
 
 AUTHENTICATION_BACKENDS = ("mezzanine.core.auth_backends.MezzanineBackend",)
 
+SHOP_CURRENCY_LOCALE = ''
 
 #############
 # DATABASES #
@@ -220,11 +221,11 @@ INSTALLED_APPS = [
     "mezzanine.twitter",
     "mezzanine.accounts",
     # "mezzanine.mobile",
-    "cartridge.shop",
     # "eve",
     'djangobower',
     "meta",
     "mezzanine_agenda",
+    "cartridge.shop",
 #    "orderable",
     "organization.core",
     "organization.media",