interdire de modifier un rapport déjà facturé
This commit is contained in:
@@ -282,10 +282,14 @@ def delete_rapport(request, no_id):
|
|||||||
query = "DELETE FROM dem_rdf WHERE no_id = :no_id"
|
query = "DELETE FROM dem_rdf WHERE no_id = :no_id"
|
||||||
execute_query(request, query, {'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"
|
query = "UPDATE dem_rdf SET date_relu=CURRENT_DATE WHERE no_id = :no_id"
|
||||||
execute_query(request, query, {'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):
|
def update_rapport_client(request, norapport, nomClient, codeClient):
|
||||||
societe = codeClient[0:2]
|
societe = codeClient[0:2]
|
||||||
cd_cli = int(codeClient[3:])
|
cd_cli = int(codeClient[3:])
|
||||||
|
|||||||
@@ -347,7 +347,7 @@
|
|||||||
<div class="form-group">
|
<div class="form-group">
|
||||||
<a class="btn btn-default" href="${request.route_url('dossier_view', nodossier=nodossier)}">
|
<a class="btn btn-default" href="${request.route_url('dossier_view', nodossier=nodossier)}">
|
||||||
<span class="glyphicon glyphicon-arrow-left"></span> Retour Dossier</a>
|
<span class="glyphicon glyphicon-arrow-left"></span> Retour Dossier</a>
|
||||||
<a class="btn btn-primary" href="/rdf_edit/${nodossier}/${rapport.date_inter.strftime('%Y-%m-%d')}">
|
<a class="btn btn-primary" href="/rdf_edit/${nodossier}/${rapport.date_inter.strftime('%Y-%m-%d')}" tal:condition="date_facture==''">
|
||||||
<span class="glyphicon glyphicon-pencil"></span> Modifier</a>
|
<span class="glyphicon glyphicon-pencil"></span> Modifier</a>
|
||||||
<button class="btn btn-danger" type="submit" name="form.delete" tal:condition="not rapport.signature_svg and date_relu==''">
|
<button class="btn btn-danger" type="submit" name="form.delete" tal:condition="not rapport.signature_svg and date_relu==''">
|
||||||
<span class="glyphicon glyphicon-remove"></span> Supprimer</button>
|
<span class="glyphicon glyphicon-remove"></span> Supprimer</button>
|
||||||
|
|||||||
@@ -595,6 +595,10 @@ def rdf_view(request):
|
|||||||
date_rapport = rapport.date_rapport.strftime('%d-%m-%Y')
|
date_rapport = rapport.date_rapport.strftime('%d-%m-%Y')
|
||||||
else:
|
else:
|
||||||
date_rapport = ''
|
date_rapport = ''
|
||||||
|
if rapport.date_facture:
|
||||||
|
date_facture = rapport.date_facture.strftime('%d-%m-%Y')
|
||||||
|
else:
|
||||||
|
date_facture = ''
|
||||||
|
|
||||||
# lire tous les photos attachées
|
# lire tous les photos attachées
|
||||||
photos1 = get_photos(request, nodossier, norapport, 1)
|
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))
|
return HTTPFound(location=request.route_url('dossier_view', nodossier=nodossier))
|
||||||
|
|
||||||
if 'form.validate' in request.params:
|
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')
|
request.session.flash(u"Le rapporta été validé avec succès.", 'success')
|
||||||
return HTTPFound(location=request.route_url('dossier_view', nodossier=nodossier))
|
return HTTPFound(location=request.route_url('dossier_view', nodossier=nodossier))
|
||||||
|
|
||||||
@@ -655,6 +659,7 @@ def rdf_view(request):
|
|||||||
'norapport': norapport,
|
'norapport': norapport,
|
||||||
'date_rapport': date_rapport,
|
'date_rapport': date_rapport,
|
||||||
'date_relu': date_relu,
|
'date_relu': date_relu,
|
||||||
|
'date_facture': date_facture,
|
||||||
'photos1': photos1,
|
'photos1': photos1,
|
||||||
'photos2': photos2,
|
'photos2': photos2,
|
||||||
'docs_url': request.static_url(request.registry.settings['mondumas.devfac_url']),
|
'docs_url': request.static_url(request.registry.settings['mondumas.devfac_url']),
|
||||||
@@ -744,6 +749,9 @@ def rdf_bill(request):
|
|||||||
article = request.params['article']
|
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'))
|
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')
|
request.session.flash("Le rapport a été généré avec succès.", 'success')
|
||||||
return HTTPFound(location=request.route_url('dossier_view', nodossier=nodossier))
|
return HTTPFound(location=request.route_url('dossier_view', nodossier=nodossier))
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user