devis_view.pt : affichage devis, facture, proforma

mondumas/views/default.py

@@ -38,6 +38,21 @@ def to_euro(x):
     #else:
     return (u"%.2f €" % x).replace('.', ',')
 
+def to_euroz(x):
+    """Takes a float and returns a string"""
+    if x == 0:
+        return ""
+    else:
+        return (u"%.2f €" % x).replace('.', ',')
+
+def to_decz(x):
+    """Takes a decimal and returns a string"""
+    if x == 0:
+        return ""
+    else:
+        return (u"%.2f" % x).replace('.', ',')
+
+
 def to_sha1(message):
     return hashlib.sha1(message.encode('utf-8')).hexdigest()
 

mondumas/views/dossier.py

@@ -24,6 +24,7 @@ from ..security import groupfinder
 
 import json
 
+from ..views.default import *
 from ..models.default import *
 from ..models.dossier import *
 
@@ -87,17 +88,21 @@ def dossier_view(request):
     dossier = get_dossier_by_no(request, nodossier)
     if dossier is None:
         request.session.flash(u"Le dossier no %s est introuvable" % (nodossier), 'danger')
-        return HTTPFound(location=request.route_url("chantier_lookup"))
+        return HTTPFound(location=request.route_url("dossier_lookup"))
     # lire tous le suivi du dossier
     details = get_dossier_rdv_by_no(request, nodossier, '0')
     # lire toutes les dossiers du chantiers
     documents = get_documents_byChantier(request, nodossier)
+    # lire toutes les dossiers similaires
+    similaires = get_similaires_byChantier(request, dossier.societe, dossier.C_NOM, dossier.C_ADR, dossier.C_CP, dossier.C_VILLE)
+    
     return {
         'page_title': u"Dossier : %s" % (nodossier),
         'nodossier': nodossier,
         'dossier': dossier,
         'details': details,
         'documents': documents,
+        'similaires': similaires,
     }
 
 @view_config(route_name='devis_view', renderer='../templates/dossier/devis_view.pt', permission='view')
@@ -105,20 +110,26 @@ def devis_view(request):
     nodossier = request.matchdict['nodossier']
     url = request.route_url("devis_view", nodossier=nodossier)
 
-    dossier = get_dossier_by_no(request, nodossier)
+    type_doc = nodossier[3:5]
+    if type_doc == 'DE':
+        page_title = u"Devis no : %s" % (nodossier)
+    elif type_doc == 'FA':
+        page_title = u"Facture no : %s" % (nodossier)
+    else:
+        page_title = u"Proforma no : %s" % (nodossier)
+
+    dossier = get_devis_by_no(request, nodossier)
     if dossier is None:
-        request.session.flash(u"Le dossier no %s est introuvable" % (nodossier), 'danger')
-        return HTTPFound(location=request.route_url("chantier_lookup"))
-    # lire tous le suivi du dossier
-    details = get_dossier_rdv_by_no(request, nodossier, '0')
-    # lire toutes les dossiers du chantiers
-    documents = get_documents_byChantier(request, nodossier)
+        request.session.flash(u"Le document no %s est introuvable" % (nodossier), 'danger')
+        return HTTPFound(location=request.route_url("dossier_lookup"))
+    # lire tous les lignes du devis
+    details = get_devis_lig_by_no(request, nodossier)
+
     return {
-        'page_title': u"Dossier : %s" % (nodossier),
+        'page_title': page_title,
         'nodossier': nodossier,
         'dossier': dossier,
         'details': details,
-        'documents': documents,
     }
 
 @view_config(route_name='dossier_selected', permission='view')