diff --git a/mondumas/routes.py b/mondumas/routes.py index b75b967..3750cbe 100644 --- a/mondumas/routes.py +++ b/mondumas/routes.py @@ -65,3 +65,6 @@ def includeme(config): config.add_route('user_edit', '/user_edit/{cd_uti}') config.add_route('users', '/users') config.add_route('users_ua', '/users_ua') + + # utils + config.add_route('batch_nuit', '/batch_nuit/{param}') diff --git a/mondumas/templates/devis/devis_ligne.pt b/mondumas/templates/devis/devis_ligne.pt index 783e904..25450f7 100644 --- a/mondumas/templates/devis/devis_ligne.pt +++ b/mondumas/templates/devis/devis_ligne.pt @@ -97,12 +97,12 @@
diff --git a/mondumas/templates/devis/devis_preview.pt b/mondumas/templates/devis/devis_preview.pt index f516efc..837dee8 100644 --- a/mondumas/templates/devis/devis_preview.pt +++ b/mondumas/templates/devis/devis_preview.pt @@ -42,48 +42,50 @@| + | + | Surf./ Qté | P.U. HT | Montant HT | |||
| + | |||||||
| + | Total HT | ${layout.to_euro(devis.TOTALHT)} | |||||
| + | TVA ${layout.to_percent(devis.TAUXTVA)} | ${layout.to_euro(devis.TOTALTVA)} | |||||
| + | Total TTC | ${layout.to_euro(devis.TOTALTTC)} | |||||
| + | |||||||
| + | Si vous acceptez ce devis, veuillez nous en retourner un exemplaire signé et précédé de la mention "Bon pour Accord". | ||||||
| + | |||||||
| + |
Conditions de réglement : | ||||||
| ${detail.ref} | -${detail.libelle} | +
+ ${detail.libelle}
+ ${detail.metrage} + - ${detail.deduction} + |
${layout.to_decz(detail.qte)} | ${layout.to_euroz(detail.prixht)} | ${layout.to_euroz(detail.mtht)} | diff --git a/mondumas/views/devis.py b/mondumas/views/devis.py index a109da0..55fd9a5 100644 --- a/mondumas/views/devis.py +++ b/mondumas/views/devis.py @@ -340,7 +340,8 @@ def devis_preview(request): elif ligne.ref == 'TX': dt_html += '||
%s | |||||||
%s | |||||||
| %s | ' % ligne.ref + dt_html += '%s | ||||||