diff --git a/mondumas/models/dossier.py b/mondumas/models/dossier.py index db032f7..ae3f957 100644 --- a/mondumas/models/dossier.py +++ b/mondumas/models/dossier.py @@ -282,10 +282,14 @@ def delete_rapport(request, no_id): query = "DELETE FROM dem_rdf WHERE no_id = :no_id" execute_query(request, query, {'no_id': no_id}) -def validate_rapport(request, no_id): +def update_rapport_validate(request, no_id): query = "UPDATE dem_rdf SET date_relu=CURRENT_DATE WHERE no_id = :no_id" execute_query(request, query, {'no_id': no_id}) +def update_rapport_facture(request, no_id): + query = "UPDATE dem_rdf SET date_facture=CURRENT_DATE WHERE no_id = :no_id" + execute_query(request, query, {'no_id': no_id}) + def update_rapport_client(request, norapport, nomClient, codeClient): societe = codeClient[0:2] cd_cli = int(codeClient[3:]) diff --git a/mondumas/templates/dossier/rdf_view.pt b/mondumas/templates/dossier/rdf_view.pt index 7f7aabc..0f95665 100644 --- a/mondumas/templates/dossier/rdf_view.pt +++ b/mondumas/templates/dossier/rdf_view.pt @@ -347,7 +347,7 @@
Retour Dossier - + Modifier diff --git a/mondumas/views/dossier.py b/mondumas/views/dossier.py index c6932ec..e94e8b8 100644 --- a/mondumas/views/dossier.py +++ b/mondumas/views/dossier.py @@ -595,6 +595,10 @@ def rdf_view(request): date_rapport = rapport.date_rapport.strftime('%d-%m-%Y') else: date_rapport = '' + if rapport.date_facture: + date_facture = rapport.date_facture.strftime('%d-%m-%Y') + else: + date_facture = '' # lire tous les photos attachées photos1 = get_photos(request, nodossier, norapport, 1) @@ -635,7 +639,7 @@ def rdf_view(request): return HTTPFound(location=request.route_url('dossier_view', nodossier=nodossier)) if 'form.validate' in request.params: - validate_rapport(request, norapport) + update_rapport_validate(request, norapport) request.session.flash(u"Le rapporta été validé avec succès.", 'success') return HTTPFound(location=request.route_url('dossier_view', nodossier=nodossier)) @@ -655,6 +659,7 @@ def rdf_view(request): 'norapport': norapport, 'date_rapport': date_rapport, 'date_relu': date_relu, + 'date_facture': date_facture, 'photos1': photos1, 'photos2': photos2, 'docs_url': request.static_url(request.registry.settings['mondumas.devfac_url']), @@ -744,6 +749,9 @@ def rdf_bill(request): article = request.params['article'] insert_facture_rdf(request, 'PL', rapport.nochantier, rapport.CD_CLI, rapport.NOMCLI, logged_in, article, rapport.date_inter.strftime('%d-%m-%Y')) + # marquer le rapport comme facturé + update_rapport_facture(request, norapport) + request.session.flash("Le rapport a été généré avec succès.", 'success') return HTTPFound(location=request.route_url('dossier_view', nodossier=nodossier))