diff --git a/mondumas/models/dossier.py b/mondumas/models/dossier.py
index 03dc97a..ff4fbfc 100644
--- a/mondumas/models/dossier.py
+++ b/mondumas/models/dossier.py
@@ -192,7 +192,7 @@ def update_dossier_cloture(request, nodossier, logged_in):
societe = nodossier[0:2]
nochantier = int(nodossier[3:])
# met le montant regle à 1 centime pour terminé le dossier
- query = "UPDATE dem_devis SET mtregl = 0.01, USERMAJ = :logged_in WHERE societe=:societe AND no_id=:nochantier"
+ query = "UPDATE dem_devis SET STATUS = 'Annulée', USERMAJ = :logged_in WHERE societe=:societe AND no_id=:nochantier"
execute_query(request, query, {'societe': societe, 'nochantier': nochantier, 'logged_in': logged_in})
def insert_dossier_attaches(request, nodossier, norapport, origine, filename, filesize, user):
diff --git a/mondumas/templates/devis/devis_preview.pt b/mondumas/templates/devis/devis_preview.pt
index 837dee8..741a483 100644
--- a/mondumas/templates/devis/devis_preview.pt
+++ b/mondumas/templates/devis/devis_preview.pt
@@ -21,18 +21,18 @@
- ${devis.C_QUALITE} ${devis.C_NOM}
- ${devis.C_ADR}
- ${devis.C_ADR2}
- ${devis.C_CP} ${devis.C_VILLE}
-
-
- Rilieux-la-Pape, le ${devis.DATE.strftime('%d-%m-%Y')}
-
${devis.QUALITE} ${devis.NOM}
${devis.ADRESSE}
${devis.ADRESSE2}
${devis.CP} ${devis.VILLE}
+
+
+ Rilieux-la-Pape, le ${devis.DATE.strftime('%d-%m-%Y')}
+
+ ${devis.C_QUALITE} ${devis.C_NOM}
+ ${devis.C_ADR}
+ ${devis.C_ADR2}
+ ${devis.C_CP} ${devis.C_VILLE}
|
diff --git a/mondumas/views/dossier.py b/mondumas/views/dossier.py
index 3c086a5..ba38542 100644
--- a/mondumas/views/dossier.py
+++ b/mondumas/views/dossier.py
@@ -129,7 +129,7 @@ def dossier_view(request):
if 'form.close' in request.params:
update_dossier_cloture(request, nodossier, logged_in)
request.session.flash(u"Le dossier a été cloturé avec succès.", 'success')
- return HTTPFound(location=request.route_url('demandes'))
+ return HTTPFound(url)
return {
'page_title': "Dossier : %s" % (nodossier),
@@ -911,7 +911,7 @@ def demandes(request):
url = request.route_url('demandes')
message = ''
- societes = ['PE','ME','PL']
+ societes = ['PE','ME','PL','PO']
# critères de recherche des demandes d'interventions de la MAIF
# search_criteria = ['FROM service.sinistres@domus-services.fr SUBJECT "Ordre de mission DOMUS - Dossier" UNDELETED'] "