diff --git a/mondumas/models/devis.py b/mondumas/models/devis.py index 9381b19..12a3bd1 100644 --- a/mondumas/models/devis.py +++ b/mondumas/models/devis.py @@ -126,6 +126,38 @@ def get_devis_by_no(request,nodossier): results = request.dbsession.execute(query, {'societe': societe, 'no_id': no_id}).first() return results +def get_facture_by_no(request,nodossier): + # lire facture + + societe = nodossier[0:2] + no_id = nodossier[5:] + + query = """ + SELECT d.*, c.*, a.NOM as nom_cabinet, e.NOM as nom_expert FROM facture 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 + WHERE d.societe = :societe and d.no_id=:no_id;""" + + results = request.dbsession.execute(query, {'societe': societe, 'no_id': no_id}).first() + return results + +def get_proforma_by_no(request,nodossier): + # lire facture + + societe = nodossier[0:2] + no_id = nodossier[5:] + + query = """ + SELECT d.*, c.*, a.NOM as nom_cabinet, e.NOM as nom_expert FROM proforma 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 + WHERE d.societe = :societe and d.no_id=:no_id;""" + + results = request.dbsession.execute(query, {'societe': societe, 'no_id': no_id}).first() + return results + def update_devis_ligne(request, nodossier, nolig, new_values): societe = nodossier[0:2] no_id = nodossier[5:] diff --git a/mondumas/templates/devis/devis_view.pt b/mondumas/templates/devis/devis_view.pt index 2114a6a..23eab26 100644 --- a/mondumas/templates/devis/devis_view.pt +++ b/mondumas/templates/devis/devis_view.pt @@ -7,14 +7,14 @@
CHANTIER${devis.societe}-${devis.nochantier}+ | CHANTIER${entete.societe}-${entete.nochantier} |
- ${devis.C_QUALITE} ${devis.C_NOM}- ${devis.C_ADR}- ${devis.C_ADR2} - ${devis.C_CP} ${devis.C_VILLE} - ${devis.C_EMAIL} + ${entete.C_QUALITE} ${entete.C_NOM}+ ${entete.C_ADR}+ ${entete.C_ADR2} + ${entete.C_CP} ${entete.C_VILLE} + ${entete.C_EMAIL} |
|
- ${devis.C_ETAGE} - ${devis.C_CODE} - ${devis.C_TEL1} - ${devis.C_TEL2} - ${devis.C_TELP} - ${devis.C_FAX} + ${entete.C_ETAGE} - ${entete.C_CODE} + ${entete.C_TEL1} - ${entete.C_TEL2} + ${entete.C_TELP} - ${entete.C_FAX} |
| Total HT | @@ -69,10 +69,10 @@TVA | ||||||
|---|---|---|---|---|---|---|---|
| ${layout.to_euro(devis.TOTALHT)} | -${layout.to_euro(devis.TOTALTVA)} | -${layout.to_euro(devis.TOTALTTC)} | -${devis.TAUXTVA} % | +${layout.to_euro(entete.TOTALHT)} | +${layout.to_euro(entete.TOTALTVA)} | +${layout.to_euro(entete.TOTALTTC)} | +${entete.TAUXTVA} % |