From fe8f38f4eb9feb7545edbbefeca6c9f8fdeae581 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Laur=C3=A9line=20Gu=C3=A9rin?= Date: Thu, 23 Mar 2023 14:31:34 +0100 Subject: [PATCH] invoicing: replace PROFORMA by TEMPORARY (#75557) --- .../lingo/invoicing/manager_line_detail_fragment.html | 2 +- .../templates/lingo/invoicing/manager_pool_detail.html | 2 +- tests/invoicing/manager/test_campaign.py | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/lingo/invoicing/templates/lingo/invoicing/manager_line_detail_fragment.html b/lingo/invoicing/templates/lingo/invoicing/manager_line_detail_fragment.html index 4851fd6..00cbef1 100644 --- a/lingo/invoicing/templates/lingo/invoicing/manager_line_detail_fragment.html +++ b/lingo/invoicing/templates/lingo/invoicing/manager_line_detail_fragment.html @@ -2,7 +2,7 @@ {{ line.pk }} {% if pool.draft and line.invoice %} - PROFORMA-{{ line.invoice_id }} + {% trans "TEMPORARY" %}-{{ line.invoice_id }} {% elif line.invoice %} {{ line.invoice.formatted_number }} {% endif %} diff --git a/lingo/invoicing/templates/lingo/invoicing/manager_pool_detail.html b/lingo/invoicing/templates/lingo/invoicing/manager_pool_detail.html index 01117bd..8afdba7 100644 --- a/lingo/invoicing/templates/lingo/invoicing/manager_pool_detail.html +++ b/lingo/invoicing/templates/lingo/invoicing/manager_pool_detail.html @@ -43,7 +43,7 @@ {% for invoice in object_list %}
  • {% if pool.draft %} - {% blocktrans with number=invoice.pk payer_id=invoice.payer_external_id payer_name=invoice.payer_name payer_demat=invoice.payer_demat|yesno payer_direct_debit=invoice.payer_direct_debit|yesno amount=invoice.total_amount %}Invoice PROFORMA-{{ number }} addressed to {{ payer_name }} ({{ payer_id }}), amount {{ amount }}€, demat: {{ payer_demat }}, direct debit: {{ payer_direct_debit }}{% endblocktrans %} + {% blocktrans with number=invoice.pk payer_id=invoice.payer_external_id payer_name=invoice.payer_name payer_demat=invoice.payer_demat|yesno payer_direct_debit=invoice.payer_direct_debit|yesno amount=invoice.total_amount prefix=_('TEMPORARY')%}Invoice {{ prefix }}-{{ number }} addressed to {{ payer_name }} ({{ payer_id }}), amount {{ amount }}€, demat: {{ payer_demat }}, direct debit: {{ payer_direct_debit }}{% endblocktrans %} {% else %} {% blocktrans with invoice_number=invoice.formatted_number payer_id=invoice.payer_external_id payer_name=invoice.payer_name payer_demat=invoice.payer_demat|yesno payer_direct_debit=invoice.payer_direct_debit|yesno amount=invoice.total_amount number=invoice.formatted_number %}Invoice {{ invoice_number }} addressed to {{ payer_name }} ({{ payer_id }}), amount {{ amount }}€, demat: {{ payer_demat }}, direct debit: {{ payer_direct_debit }}{% endblocktrans %} {% endif %} diff --git a/tests/invoicing/manager/test_campaign.py b/tests/invoicing/manager/test_campaign.py index 2dcd34d..6fcc91a 100644 --- a/tests/invoicing/manager/test_campaign.py +++ b/tests/invoicing/manager/test_campaign.py @@ -725,7 +725,7 @@ def test_detail_pool_invoices(app, admin_user, draft): if draft: assert ( resp.pyquery('li[data-invoice-id="%s"]' % invoice1.pk).text() - == 'Invoice PROFORMA-%s addressed to First1 Name1 (payer:1), amount 6.00€, demat: yes, direct debit: no' + == 'Invoice TEMPORARY-%s addressed to First1 Name1 (payer:1), amount 6.00€, demat: yes, direct debit: no' % invoice1.pk ) else: @@ -759,7 +759,7 @@ def test_detail_pool_invoices(app, admin_user, draft): if draft: assert ( resp.pyquery('li[data-invoice-id="%s"]' % invoice2.pk).text() - == 'Invoice PROFORMA-%s addressed to First2 Name2 (payer:2), amount 1.00€, demat: no, direct debit: yes' + == 'Invoice TEMPORARY-%s addressed to First2 Name2 (payer:2), amount 1.00€, demat: no, direct debit: yes' % invoice2.pk ) else: