From 4c3c20d1d31215acfc03c579338b881db80c2dfc Mon Sep 17 00:00:00 2001 From: Benjamin Dauvergne Date: Wed, 29 Nov 2017 10:47:58 +0100 Subject: [PATCH] remplace Engagement provisionnel par Code d'imputation (fixes #19441) --- polynum/base/models/entity.py | 2 +- polynum/base/models/request.py | 2 +- polynum/request/templates/list_request.html | 2 +- polynum/request/templates/request_detail.html | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/polynum/base/models/entity.py b/polynum/base/models/entity.py index 5c09c33..ce02a55 100644 --- a/polynum/base/models/entity.py +++ b/polynum/base/models/entity.py @@ -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) diff --git a/polynum/base/models/request.py b/polynum/base/models/request.py index f405951..0a30c48 100644 --- a/polynum/base/models/request.py +++ b/polynum/base/models/request.py @@ -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, diff --git a/polynum/request/templates/list_request.html b/polynum/request/templates/list_request.html index a1a057c..1ec1163 100644 --- a/polynum/request/templates/list_request.html +++ b/polynum/request/templates/list_request.html @@ -117,7 +117,7 @@ Pour obtenir des détails sur une demande, cliquer sur sa ligne. {% sort_indicator 'status' '↑' '↓' '' %}ÉTAT {% sort_indicator 'creation_date' '↑' '↓' '' %}Création {% sort_indicator 'delivery_date' '↑' '↓' '' %}Livraison - {% sort_indicator 'financial_code' '↑' '↓' '' %}Engagement provisionnel + {% sort_indicator 'financial_code' '↑' '↓' '' %}Code d'imputation {% sort_indicator 'cost' '↑' '↓' '' %}Coût diff --git a/polynum/request/templates/request_detail.html b/polynum/request/templates/request_detail.html index 0d97235..4322dca 100644 --- a/polynum/request/templates/request_detail.html +++ b/polynum/request/templates/request_detail.html @@ -52,7 +52,7 @@

Coût{% if poly_request.cost %} {{poly_request.cost|floatformat:"-2" }}{% else %} estimé {{ poly_request.estimated_cost|floatformat:"-2" }}{% endif %} €

- {% 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 %}

{% if creation %}Date de la demande {{creation.date}}{% endif %} {% if end %}- Achevée le {{end.date}}{% endif %}