remplace Engagement provisionnel par Code d'imputation (fixes #19441)

This commit is contained in:
Benjamin Dauvergne 2017-11-29 10:47:58 +01:00
parent 835f9dd206
commit 4c3c20d1d3
4 changed files with 4 additions and 4 deletions

View File

@ -125,4 +125,4 @@ class AccountingCode(models.Model):
ordering = ('entity', 'code')
entity = models.ForeignKey(Entity)
code = models.CharField(max_length=32, verbose_name=_('Engagement provisionnel'), db_index=True)
code = models.CharField(max_length=32, verbose_name=_('Code d\'imputation'), db_index=True)

View File

@ -233,7 +233,7 @@ class Request(models.Model):
verbose_name=_('Bureau'),
blank=True)
financial_code = models.CharField(max_length=64,
verbose_name=_(u"Engagement provisionnel"), blank=True, db_index=True)
verbose_name=_(u'Code d\'imputation'), blank=True, db_index=True)
financial_comment = models.TextField(
verbose_name=_(u"Commentaire pour la facturation"), blank=True)
cost = models.DecimalField(verbose_name=_(u'Coût'), blank=True, null=True,

View File

@ -117,7 +117,7 @@ Pour obtenir des détails sur une demande, cliquer sur sa ligne.
<th><a href="{% sort_url 'status' %}">{% sort_indicator 'status' '↑' '↓' '' %}ÉTAT</a></th>
<th><a href="{% sort_url 'creation_date' %}" title="Date de création">{% sort_indicator 'creation_date' '↑' '↓' '' %}Création</a></th>
<th><a href="{% sort_url 'delivery_date' %}" title="Date de livraison">{% sort_indicator 'delivery_date' '↑' '↓' '' %}Livraison</a></th>
<th><a href="{% sort_url 'financial_code' %}">{% sort_indicator 'financial_code' '↑' '↓' '' %}Engagement provisionnel</a></th>
<th><a href="{% sort_url 'financial_code' %}">{% sort_indicator 'financial_code' '↑' '↓' '' %}Code d'imputation</a></th>
<th><a href="{% sort_url 'cost' %}">{% sort_indicator 'cost' '↑' '↓' '' %}Coût</a></th>
</tr>
</thead>

View File

@ -52,7 +52,7 @@
</div>
<div class="well">
<p><strong>Coût{% if poly_request.cost %}</strong> {{poly_request.cost|floatformat:"-2" }}{% else %} estimé</strong> {{ poly_request.estimated_cost|floatformat:"-2" }}{% endif %} €</p>
{% include "detail_template.html" with value=poly_request.financial_code name="Engagement provisionnel" %}
{% include "detail_template.html" with value=poly_request.financial_code name="Code d'imputation" %}
{% if creation or end %}<p>
{% if creation %}<strong>Date de la demande</strong> {{creation.date}}{% endif %}
{% if end %}<strong>- Achevée le</strong> {{end.date}}{% endif %}