From 3af083fb6b9bb307a04af137ed7a397abcba94e5 Mon Sep 17 00:00:00 2001 From: Yohann D'ANELLO Date: Sat, 5 Sep 2020 10:34:19 +0200 Subject: [PATCH] Remove temporary bera font in invoices, add texlive-base-recommended for invoices --- Dockerfile | 2 +- ansible/roles/1-apt-basic/tasks/main.yml | 1 + apps/treasury/templates/treasury/invoice_sample.tex | 6 ++++-- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index e2eb7d4a..846cc420 100644 --- a/Dockerfile +++ b/Dockerfile @@ -12,7 +12,7 @@ RUN apt-get update && \ python3-babel python3-lockfile python3-pip python3-phonenumbers ipython3 \ python3-bs4 python3-setuptools \ uwsgi uwsgi-plugin-python3 \ - texlive-latex-base texlive-lang-french lmodern texlive-fonts-recommended \ + texlive-latex-base texlive-latex-recommended texlive-lang-french lmodern texlive-fonts-recommended \ gettext libjs-bootstrap4 fonts-font-awesome && \ rm -rf /var/lib/apt/lists/* diff --git a/ansible/roles/1-apt-basic/tasks/main.yml b/ansible/roles/1-apt-basic/tasks/main.yml index fa51de34..3148327f 100644 --- a/ansible/roles/1-apt-basic/tasks/main.yml +++ b/ansible/roles/1-apt-basic/tasks/main.yml @@ -41,6 +41,7 @@ - texlive-fonts-recommended - texlive-lang-french - texlive-latex-base + - texlive-latex-recommended # WSGI server - uwsgi diff --git a/apps/treasury/templates/treasury/invoice_sample.tex b/apps/treasury/templates/treasury/invoice_sample.tex index d7ec7391..c9bb92b8 100644 --- a/apps/treasury/templates/treasury/invoice_sample.tex +++ b/apps/treasury/templates/treasury/invoice_sample.tex @@ -7,13 +7,15 @@ \usepackage[T1]{fontenc} \usepackage[utf8]{inputenc} \usepackage[a4paper]{geometry} -\usepackage{units} -\usepackage{bera} +%\usepackage{bera} \usepackage{graphicx} \usepackage{fancyhdr} \usepackage{fp} \usepackage{transparent} \usepackage{eso-pic} +\usepackage{ifthen} + +\DeclareUnicodeCharacter{00B0}{$^\circ$} \def\TVA{0} % Taux de la TVA