diff --git a/src/tixlbase/migrations/0012_auto_20140929_1935.py b/src/tixlbase/migrations/0012_auto_20140929_1935.py
new file mode 100644
index 000000000..527a88195
--- /dev/null
+++ b/src/tixlbase/migrations/0012_auto_20140929_1935.py
@@ -0,0 +1,66 @@
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
+
+from django.db import models, migrations
+import django.db.models.deletion
+
+def setposition(apps, schema_editor):
+ ItemCategory = apps.get_model("tixlbase", "ItemCategory")
+ for cat in ItemCategory.objects.all():
+ cat.position = 0
+ cat.save()
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('tixlbase', '0011_auto_20140927_1013'),
+ ]
+
+ operations = [
+ migrations.RunPython(setposition),
+ migrations.AlterField(
+ model_name='item',
+ name='active',
+ field=models.BooleanField(default=True, verbose_name='Active'),
+ ),
+ migrations.AlterField(
+ model_name='item',
+ name='category',
+ field=models.ForeignKey(blank=True, null=True, verbose_name='Category', related_name='items', to='tixlbase.ItemCategory', on_delete=django.db.models.deletion.PROTECT),
+ ),
+ migrations.AlterField(
+ model_name='item',
+ name='event',
+ field=models.ForeignKey(to='tixlbase.Event', related_name='items', verbose_name='Event', on_delete=django.db.models.deletion.PROTECT),
+ ),
+ migrations.AlterField(
+ model_name='item',
+ name='properties',
+ field=models.ManyToManyField(to='tixlbase.Property', help_text="The selected properties will be available for the user to select. After saving this field, move to the 'Variations' tab to configure the details.", blank=True, verbose_name='Properties', related_name='items'),
+ ),
+ migrations.AlterField(
+ model_name='item',
+ name='tax_rate',
+ field=models.DecimalField(max_digits=7, verbose_name='Taxes included in percent', blank=True, null=True, decimal_places=2),
+ ),
+ migrations.AlterField(
+ model_name='itemcategory',
+ name='event',
+ field=models.ForeignKey(related_name='categories', to='tixlbase.Event'),
+ ),
+ migrations.AlterField(
+ model_name='itemcategory',
+ name='position',
+ field=models.IntegerField(default=0),
+ ),
+ migrations.AlterField(
+ model_name='itemvariation',
+ name='active',
+ field=models.BooleanField(default=True, verbose_name='Active'),
+ ),
+ migrations.AlterField(
+ model_name='property',
+ name='event',
+ field=models.ForeignKey(related_name='properties', to='tixlbase.Event'),
+ ),
+ ]
diff --git a/src/tixlbase/models.py b/src/tixlbase/models.py
index d2c6275f2..ac92270fd 100644
--- a/src/tixlbase/models.py
+++ b/src/tixlbase/models.py
@@ -455,6 +455,7 @@ class Item(models.Model):
Property,
related_name='items',
verbose_name=_("Properties"),
+ blank=True,
help_text=_(
'The selected properties will be available for the user '
+ 'to select. After saving this field, move to the '
diff --git a/src/tixlcontrol/templates/tixlcontrol/items/categories.html b/src/tixlcontrol/templates/tixlcontrol/items/categories.html
new file mode 100644
index 000000000..fb2a7848b
--- /dev/null
+++ b/src/tixlcontrol/templates/tixlcontrol/items/categories.html
@@ -0,0 +1,42 @@
+{% extends "tixlcontrol/items/base.html" %}
+{% load i18n %}
+{% block title %}{% trans "Item categories" %}{% endblock %}
+{% block inside %}
+ {% trans "Item categories" %}
+ {% if "updated" in request.GET %}
+
+ {% trans "Your changes have been saved." %}
+
+ {% elif "created" in request.GET %}
+
+ {% trans "A new category has been created." %}
+
+ {% elif "deleted" in request.GET %}
+
+ {% trans "The category has been deleted." %}
+
+ {% endif %}
+
+ {% trans "Create new category" %}
+
+
+
+
+ | {% trans "Item categories" %} |
+ |
+
+
+
+ {% for c in categories %}
+
+ | {{ c.name }} |
+
+
+
+ |
+ |
+
+ {% endfor %}
+
+
+{% endblock %}
diff --git a/src/tixlcontrol/templates/tixlcontrol/items/category.html b/src/tixlcontrol/templates/tixlcontrol/items/category.html
new file mode 100644
index 000000000..95c49466c
--- /dev/null
+++ b/src/tixlcontrol/templates/tixlcontrol/items/category.html
@@ -0,0 +1,26 @@
+{% extends "tixlcontrol/items/base.html" %}
+{% load i18n %}
+{% load bootstrap3 %}
+{% block title %}{% trans "Item category" %}{% endblock %}
+{% block inside %}
+ {% trans "Item category" %}
+
+{% endblock %}
diff --git a/src/tixlcontrol/templates/tixlcontrol/items/category_delete.html b/src/tixlcontrol/templates/tixlcontrol/items/category_delete.html
new file mode 100644
index 000000000..8dcef68d1
--- /dev/null
+++ b/src/tixlcontrol/templates/tixlcontrol/items/category_delete.html
@@ -0,0 +1,21 @@
+{% extends "tixlcontrol/items/base.html" %}
+{% load i18n %}
+{% load bootstrap3 %}
+{% block title %}{% trans "Delete item category" %}{% endblock %}
+{% block inside %}
+ {% trans "Delete item category" %}
+
+{% endblock %}