From b1fed3d476a6965772680f10f425304958166d1c Mon Sep 17 00:00:00 2001 From: Alexandre Iooss Date: Sun, 6 Sep 2020 15:49:44 +0200 Subject: [PATCH] Remove .png in invoice model --- .../0002_invoice_remove_png_extension.py | 18 ++++++++++++++++++ apps/treasury/models.py | 14 +++++++------- .../templates/treasury/invoice_sample.tex | 3 +-- 3 files changed, 26 insertions(+), 9 deletions(-) create mode 100644 apps/treasury/migrations/0002_invoice_remove_png_extension.py diff --git a/apps/treasury/migrations/0002_invoice_remove_png_extension.py b/apps/treasury/migrations/0002_invoice_remove_png_extension.py new file mode 100644 index 00000000..e908d699 --- /dev/null +++ b/apps/treasury/migrations/0002_invoice_remove_png_extension.py @@ -0,0 +1,18 @@ +# Generated by Django 2.2.16 on 2020-09-06 13:43 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('treasury', '0001_initial'), + ] + + operations = [ + migrations.AlterField( + model_name='invoice', + name='bde', + field=models.CharField(choices=[('Saperlistpopette', 'Saper[list]popette'), ('Finalist', 'Fina[list]'), ('Listorique', '[List]orique'), ('Satellist', 'Satel[list]'), ('Monopolist', 'Monopo[list]'), ('Kataclist', 'Katac[list]')], default='Saperlistpopette', max_length=32, verbose_name='BDE'), + ), + ] diff --git a/apps/treasury/models.py b/apps/treasury/models.py index 762c7bb5..e57496ec 100644 --- a/apps/treasury/models.py +++ b/apps/treasury/models.py @@ -25,14 +25,14 @@ class Invoice(models.Model): bde = models.CharField( max_length=32, - default='Saperlistpopette.png', + default='Saperlistpopette', choices=( - ('Saperlistpopette.png', 'Saper[list]popette'), - ('Finalist.png', 'Fina[list]'), - ('Listorique.png', '[List]orique'), - ('Satellist.png', 'Satel[list]'), - ('Monopolist.png', 'Monopo[list]'), - ('Kataclist.png', 'Katac[list]'), + ('Saperlistpopette', 'Saper[list]popette'), + ('Finalist', 'Fina[list]'), + ('Listorique', '[List]orique'), + ('Satellist', 'Satel[list]'), + ('Monopolist', 'Monopo[list]'), + ('Kataclist', 'Katac[list]'), ), verbose_name=_("BDE"), ) diff --git a/apps/treasury/templates/treasury/invoice_sample.tex b/apps/treasury/templates/treasury/invoice_sample.tex index cd630f1c..a6b263d6 100644 --- a/apps/treasury/templates/treasury/invoice_sample.tex +++ b/apps/treasury/templates/treasury/invoice_sample.tex @@ -52,8 +52,7 @@ \parbox[b][\paperheight]{\paperwidth}{% \vfill \centering - %FIXME remove ".png" on obj.bde - %\includegraphics[width=\textwidth]{../../apps/treasury/static/img/{{ obj.bde }}_bg.jpg}; + \includegraphics[width=\textwidth]{../../apps/treasury/static/img/{{ obj.bde }}_bg.jpg}; \vfill } }