ynerant
/
nk20
mirror of https://gitlab.crans.org/bde/nk20
1
0
Fork 0
Code Issues Releases Wiki Activity

FP is bugggy

This commit is contained in:
Yohann D'ANELLO 2020-08-06 15:08:35 +02:00
parent f47a0b8c9d
commit d8c7018b9a
2 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
apps/treasury/templatetags/escape_tex.py
View File

@ -16,10 +16,5 @@ def do_latex_escape(value):
) )
def fp_value(value):
return value.replace("-", "").replace("-", "neg")
register = template.Library() register = template.Library()
register.filter("escape_tex", do_latex_escape) register.filter("escape_tex", do_latex_escape)
register.filter("fp_value", fp_value)

5
templates/treasury/invoice_sample.tex
View File

@ -31,7 +31,8 @@
\newcommand{\AfficheResultat}{% \newcommand{\AfficheResultat}{%
\ListeProduits \ListeProduits
\FPeval{\TotalTVA}{\TotalHT * \TVA / 100} \FPmul{\TotalTVA}{\TotalHT}{\TVA}
\FPdiv{\TotalTVA}{\TotalTVA}{100}
\FPadd{\TotalTTC}{\TotalHT}{\TotalTVA} \FPadd{\TotalTTC}{\TotalHT}{\TotalTVA}
\FPround{\TotalHT}{\TotalHT}{2} \FPround{\TotalHT}{\TotalHT}{2}
\FPround{\TotalTVA}{\TotalTVA}{2} \FPround{\TotalTVA}{\TotalTVA}{2}
@ -98,7 +99,7 @@
% Liste des produits facturés : Désignation, quantité, prix unitaire HT % Liste des produits facturés : Désignation, quantité, prix unitaire HT
{% for product in products %} {% for product in products %}
\AjouterProduit{ {{ product.designation|safe|escape_tex }}} { {{ product.quantity|safe|escape_tex|fp_value }}} { {{ product.amount_euros|safe|escape_tex|fp_value }}} { {{ product.total_euros|safe|escape_tex|fp_value }}} \AjouterProduit{{"{"}}{{ product.designation|safe|escape_tex }}} {{"{"}}{{ product.quantity|safe|escape_tex }}} {{"{"}}{{ product.amount_euros|safe|escape_tex }}} {{"{"}}{{ product.total_euros|safe|escape_tex }}}
{% endfor %} {% endfor %}
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%