ajout changement statut devis

mondumas/models/dossier.py

@@ -30,13 +30,14 @@ def get_dossier_by_no(request,nodossier):
     societe = nodossier[0:2]
     no_id = nodossier[3:]
     query = """
-SELECT d.*, a.NOM as nom_cabinet, e.NOM as nom_expert,
+SELECT d.*, s.libelle, a.NOM as nom_cabinet, e.NOM as nom_expert,
 c.QUALITE AS cli_QUALITE, c.NOM AS cli_NOM, c.ADRESSE AS cli_ADRESSE, c.ADRESSE2 AS cli_ADRESSE2, c.CP AS cli_CP, c.VILLE AS cli_VILLE,
 c.TEL1 AS cli_TEL1, c.TEL2 AS cli_TEL2, c.TELP AS cli_TELP, c.FAX AS cli_FAX, c.NOMRESP AS cli_NOMRESP
 FROM dem_devis d 
 INNER JOIN clients c ON d.societe = c.societe and d.cd_cli = c.cd_cli
 INNER JOIN p_cabinet a ON d.cabinet = a.code
 INNER JOIN p_experts e ON d.cabinet = e.code_cab and d.expert = e.code_exp
+INNER JOIN p_statuts s ON d.STATUS = s.code
 where d.societe = '%s' and d.no_id=%s;""" % (societe, no_id);
     results = request.dbsession.execute(query).first()
     return results
@@ -329,6 +330,9 @@ def get_status_by_id(request, code):
     if code == '':
         query = """SELECT * FROM p_statuts;"""
         results = request.dbsession.execute(query,).fetchall()
+    elif code == 'DE':
+        query = """SELECT * FROM p_statuts WHERE code >= 3;"""
+        results = request.dbsession.execute(query,).fetchall()
     else:
         query = """SELECT * FROM p_statuts WHERE code = :code;"""
         results = request.dbsession.execute(query, {'code': code}).first()