Added missing transactions

This commit is contained in:
Marc Aymerich 2016-04-30 15:21:19 +00:00
parent d4d9f6a49a
commit bee56d833d
2 changed files with 25 additions and 0 deletions

View File

@ -0,0 +1,24 @@
# -*- coding: utf-8 -*-
from __future__ import unicode_literals
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
('services', '0004_auto_20160405_1133'),
]
operations = [
migrations.AlterField(
model_name='service',
name='periodic_update',
field=models.BooleanField(default=False, verbose_name='periodic update', help_text='Whether a periodic update of this service orders should be performed or not. Needed for <tt>match</tt> definitions that depend on complex model interactions, where <tt>content type</tt> model save and delete operations are not enought.'),
),
migrations.AlterField(
model_name='service',
name='rate_algorithm',
field=models.CharField(default='orchestra.contrib.plans.ratings.step_price', verbose_name='rate algorithm', max_length=64, choices=[('orchestra.contrib.plans.ratings.step_price', 'Step price'), ('orchestra.contrib.plans.ratings.match_price', 'Match price'), ('orchestra.contrib.plans.ratings.best_price', 'Best price')], help_text='Algorithm used to interprete the rating table.<br>&nbsp;&nbsp;Step price: All rates with a quantity lower or equal than the metric are applied. Nominal price will be used when initial block is missing.<br>&nbsp;&nbsp;Match price: Only <b>the rate</b> with a) inmediate inferior metric and b) lower price is applied. Nominal price will be used when initial block is missing.<br>&nbsp;&nbsp;Best price: Produces the best possible price given all active rating lines (those with quantity lower or equal to the metric).'),
),
]

View File

@ -14,6 +14,7 @@
<p class="errornote"> <p class="errornote">
{% if adminform.errors.items|length == 1 %}{% trans "Please correct the error below." %}{% else %}{% trans "Please correct the errors below." %}{% endif %} {% if adminform.errors.items|length == 1 %}{% trans "Please correct the error below." %}{% else %}{% trans "Please correct the errors below." %}{% endif %}
</p> </p>
{{ adminform.form.non_field_errors }}
{% endif %} {% endif %}