From 6bc9d34fde7e608cb3be6d78c0ff02de634a9ab8 Mon Sep 17 00:00:00 2001
From: Phuoc CAO <phuoc@caotek.fr>
Date: Sat, 17 Oct 2020 08:25:56 +0200
Subject: [PATCH] use locale to format currency

---
 mondumas/templates/devis/devis_view.pt |  8 ++++----
 mondumas/templates/devis/devis_web.pt  |  6 +++---
 mondumas/views/default.py              | 17 ++++++++---------
 mondumas/views/devis.py                |  4 ++--
 4 files changed, 17 insertions(+), 18 deletions(-)

diff --git a/mondumas/templates/devis/devis_view.pt b/mondumas/templates/devis/devis_view.pt
index 61f28e5..c0f5390 100644
--- a/mondumas/templates/devis/devis_view.pt
+++ b/mondumas/templates/devis/devis_view.pt
@@ -69,9 +69,9 @@
            <th  class="text-right">TVA</th>
        </tr>
        <tr>
-           <td class="text-right">${layout.to_decz(dossier.TOTALHT)}</td>
-           <td class="text-right">${layout.to_euroz(dossier.TOTALTVA)}</td>
-           <td class="text-right">${layout.to_euroz(dossier.TOTALTTC)}</td>
+           <td class="text-right">${layout.to_euro(dossier.TOTALHT)}</td>
+           <td class="text-right">${layout.to_euro(dossier.TOTALTVA)}</td>
+           <td class="text-right">${layout.to_euro(dossier.TOTALTTC)}</td>
            <td class="text-right">${dossier.TAUXTVA} %</td>
        </tr>
    </table>
@@ -88,7 +88,7 @@
         <tr tal:repeat="detail details">
             <td>${detail.REF}</td>
             <td>${detail.LIB}</td>
-            <td class="text-right">${layout.to_decz(detail.QTE)}</td>
+            <td class="text-right">${layout.to_euro(detail.QTE)}</td>
             <td class="text-right">${layout.to_euroz(detail.PRIXHT)}</td>
             <td class="text-right">${layout.to_euroz(detail.MTHT)}</td>
             <td  class="text-center">${detail.USERMAJ}</td>
diff --git a/mondumas/templates/devis/devis_web.pt b/mondumas/templates/devis/devis_web.pt
index 1fc1d04..42933bd 100644
--- a/mondumas/templates/devis/devis_web.pt
+++ b/mondumas/templates/devis/devis_web.pt
@@ -44,9 +44,9 @@
            <th  class="text-right">TVA</th>
        </tr>
        <tr>
-           <td class="text-right">${layout.to_decz(dossier.TOTALHT)}</td>
-           <td class="text-right">${layout.to_euroz(dossier.TOTALTVA)}</td>
-           <td class="text-right">${layout.to_euroz(dossier.TOTALTTC)}</td>
+           <td class="text-right">${layout.to_euro(dossier.TOTALHT)}</td>
+           <td class="text-right">${layout.to_euro(dossier.TOTALTVA)}</td>
+           <td class="text-right">${layout.to_euro(dossier.TOTALTTC)}</td>
            <td class="text-right">${dossier.TAUXTVA} %</td>
        </tr>
    </table>
diff --git a/mondumas/views/default.py b/mondumas/views/default.py
index 4409c39..d7ac081 100644
--- a/mondumas/views/default.py
+++ b/mondumas/views/default.py
@@ -17,12 +17,13 @@ from pyramid.httpexceptions import (
 from pyramid_mailer import get_mailer
 from pyramid_mailer.message import Message, Attachment
 from datetime import *
-import hashlib
 from sqlalchemy.exc import DBAPIError
 from ..security import groupfinder
 from user_agents import parse
 
 import json
+import locale
+import hashlib
 
 from ..models.default import *
 from ..models.agenda import *
@@ -37,25 +38,23 @@ def to_decimal(x):
 
 def to_euro(x):
     """Takes a float and returns a string"""
-    #if x == 0:
-    #   return ""
-    #else:
-    return ("%.2f €" % x).replace('.', ',')
+    locale.setlocale(locale.LC_ALL,'')
+    return locale.currency(x, True, True)
 
 def to_euroz(x):
     """Takes a float and returns a string"""
     if x == 0:
         return ""
     else:
-        return ("%9.2f €" % x).replace('.', ',')
+        return to_euro(x)
 
 def to_decz(x):
-    """Takes a decimal and returns a string"""
+    """Takes a float and returns a number with 2 dec"""
+    locale.setlocale(locale.LC_ALL,'')
     if x == 0:
         return ""
     else:
-        return ("%.2f" % x).replace('.', ',')
-
+        return locale.format_string('%.2f',x, False)
 
 def to_sha1(message):
     return hashlib.sha1(message.encode('utf-8')).hexdigest()
diff --git a/mondumas/views/devis.py b/mondumas/views/devis.py
index 9151a00..c19a92a 100644
--- a/mondumas/views/devis.py
+++ b/mondumas/views/devis.py
@@ -305,8 +305,8 @@ def devis_preview(request):
                     dt_html += '<i>%s</i><br />' % ligne.deduction
             dt_html += '</p></div>'
             dt_html += '<div class="col-sm-1"><p class="text-right">%s</p></div>' % ligne.qte
-            dt_html += '<div class="col-sm-2"><p class="text-right">%s</p></div>' % ligne.prixht
-            dt_html += '<div class="col-sm-2"><p class="text-right">%s</p></div>' % ligne.mtht
+            dt_html += '<div class="col-sm-2"><p class="text-right">%s</p></div>' % to_euro(ligne.prixht)
+            dt_html += '<div class="col-sm-2"><p class="text-right">%s</p></div>' % to_euro(ligne.mtht)
 
     return {
         'page_title':  '',