phuoc/dumas_gestion
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix cloturer dossier + add societe PO dans générer

Browse Source
This commit is contained in:
Phuoc
2021-04-30 15:48:39 +02:00
parent b725b98e06
commit 9a7cad7c4d
3 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
mondumas/models/dossier.py
View File

@@ -192,7 +192,7 @@ def update_dossier_cloture(request, nodossier, logged_in):
societe = nodossier[0:2] societe = nodossier[0:2]
nochantier = int(nodossier[3:]) nochantier = int(nodossier[3:])
# met le montant regle à 1 centime pour terminé le dossier # 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}) execute_query(request, query, {'societe': societe, 'nochantier': nochantier, 'logged_in': logged_in})
def insert_dossier_attaches(request, nodossier, norapport, origine, filename, filesize, user): def insert_dossier_attaches(request, nodossier, norapport, origine, filename, filesize, user):

16
mondumas/templates/devis/devis_preview.pt
View File

@@ -21,18 +21,18 @@
</td> </td>
<td style="width:45%"> <td style="width:45%">
<br/><br/> <br/><br/>
<h4>${devis.C_QUALITE} ${devis.C_NOM}</h4>
<h4>${devis.C_ADR}</h4>
<h4 tal:condition="devis.C_ADR2">${devis.C_ADR2}<br /></h4>
<h4>${devis.C_CP} ${devis.C_VILLE}</h4>
<br />
<br />
<p>Rilieux-la-Pape, le ${devis.DATE.strftime('%d-%m-%Y')}</p>
<br />
<h4>${devis.QUALITE} ${devis.NOM}</h4> <h4>${devis.QUALITE} ${devis.NOM}</h4>
<h4>${devis.ADRESSE}</h4> <h4>${devis.ADRESSE}</h4>
<h4 tal:condition="devis.ADRESSE2">${devis.ADRESSE2}<br /></h4> <h4 tal:condition="devis.ADRESSE2">${devis.ADRESSE2}<br /></h4>
<h4>${devis.CP} ${devis.VILLE}</h4> <h4>${devis.CP} ${devis.VILLE}</h4>
<br />
<br />
<p>Rilieux-la-Pape, le ${devis.DATE.strftime('%d-%m-%Y')}</p>
<br />
<h4>${devis.C_QUALITE} ${devis.C_NOM}</h4>
<h4>${devis.C_ADR}</h4>
<h4 tal:condition="devis.C_ADR2">${devis.C_ADR2}<br /></h4>
<h4>${devis.C_CP} ${devis.C_VILLE}</h4>
</td> </td>
</tr> </tr>
</table> <!-- row : entête--> </table> <!-- row : entête-->

4
mondumas/views/dossier.py
View File

@@ -129,7 +129,7 @@ def dossier_view(request):
if 'form.close' in request.params: if 'form.close' in request.params:
update_dossier_cloture(request, nodossier, logged_in) update_dossier_cloture(request, nodossier, logged_in)
request.session.flash(u"Le dossier a été cloturé avec succès.", 'success') request.session.flash(u"Le dossier a été cloturé avec succès.", 'success')
return HTTPFound(location=request.route_url('demandes')) return HTTPFound(url)
return { return {
'page_title': "Dossier : %s" % (nodossier), 'page_title': "Dossier : %s" % (nodossier),
@@ -911,7 +911,7 @@ def demandes(request):
url = request.route_url('demandes') url = request.route_url('demandes')
message = '' message = ''
societes = ['PE','ME','PL'] societes = ['PE','ME','PL','PO']
# critères de recherche des demandes d'interventions de la MAIF # 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'] " # search_criteria = ['FROM service.sinistres@domus-services.fr SUBJECT "Ordre de mission DOMUS - Dossier" UNDELETED'] "