summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBenjamin Dauvergne <bdauvergne@entrouvert.com>2017-11-29 09:47:58 (GMT)
committerBenjamin Dauvergne <bdauvergne@entrouvert.com>2017-11-29 09:47:58 (GMT)
commit4c3c20d1d31215acfc03c579338b881db80c2dfc (patch)
treee4dbbbb208d4e48619a0f21b5ff021f84672ce7d
parent835f9dd206ac6ee82323777f8e276ea4eac5f9c2 (diff)
downloadpolynum-master.zip
polynum-master.tar.gz
polynum-master.tar.bz2
remplace Engagement provisionnel par Code d'imputation (fixes #19441)HEADmaster
-rw-r--r--polynum/base/models/entity.py2
-rw-r--r--polynum/base/models/request.py2
-rw-r--r--polynum/request/templates/list_request.html2
-rw-r--r--polynum/request/templates/request_detail.html2
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.
<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>
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 @@
</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 %}