harmonisation dem_devis, devs et facture

This commit is contained in:
thienan
2021-07-12 15:10:38 +02:00
parent e83c5f2d53
commit fe2c58f65f
5 changed files with 357 additions and 85 deletions

View File

@@ -72,7 +72,7 @@ def dossier_lookup(request):
# construire la liste
for item in chantiers:
d = ('%s-%s' % (societe, item.numero),item.date.strftime('%d-%m-%Y'), item.nomcli, item.chantier, to_euro(item.montant),
item.nosin, item.status, item.usermaj)
item.nosin, item.libelle, item.usermaj)
liste.append(d)
if len(name) == 0 :
@@ -1546,38 +1546,97 @@ def upload_om(request):
@view_config(route_name='dem_devis', renderer='../templates/dossier/dem_devis.pt', permission='view')
def dem_devis(request):
logged_in = request.authenticated_userid.upper()
goto_url = '/dossier_selected/dossier_view/%s/' % date.today().strftime('%Y-%m-%d')
url = request.route_url('dem_devis')
member = get_member_by_id(request, logged_in)
societe_defaut = member.societe
societe = societe_defaut
access_defaut = member.access
liste=[]
dossiers_traites = get_dossiers_traites(request)
if 'form.submitted' in request.params:
societe = request.params['societe']
dossiers_traites = get_dossiers_traites(request, societe)
for item in dossiers_traites:
d = ('%s-%s' % (societe, item.numero),item.date.strftime('%d-%m-%Y'), item.nomcli, item.chantier, to_euro(item.montant),
item.nosin, item.libelle, item.usermaj)
liste.append(d)
order_option = 'desc'
return {
'page_title': 'Dossiers avec statut: "A TRAITER"',
'url': url,
'dossiers_traites':dossiers_traites,
'goto_url': goto_url,
'dt_data': json.dumps(liste),
'societe': societe,
'order_option': order_option,
}
@view_config(route_name='devis_en_att', renderer='../templates/dossier/devis_en_att.pt', permission='view')
def devis_en_att(request):
logged_in = request.authenticated_userid.upper()
goto_url = '/dossier_selected/dossier_view/%s/' % date.today().strftime('%Y-%m-%d')
url = request.route_url('devis_en_att')
member = get_member_by_id(request, logged_in)
societe_defaut = member.societe
societe = societe_defaut
access_defaut = member.access
liste=[]
list_devis_en_att = get_devis_en_att(request)
if 'form.submitted' in request.params:
societe = request.params['societe']
list_devis_en_att = get_devis_en_att(request, societe)
for item in list_devis_en_att:
d = ('%s-DE%s' % (societe, item.numero),item.date.strftime('%d-%m-%Y'), item.nomcli, item.chantier, to_euro(item.montant),
item.nosin, item.libelle, item.usermaj)
liste.append(d)
order_option = 'desc'
return {
'page_title': "Devis en attente d'acceptation",
'url': url,
'list_devis_en_att':list_devis_en_att,
'goto_url': goto_url,
'dt_data': json.dumps(liste),
'societe': societe,
'order_option': order_option,
}
@view_config(route_name='factures_en_att', renderer='../templates/dossier/factures_en_att.pt', permission='view')
def factures_en_att(request):
logged_in = request.authenticated_userid.upper()
goto_url = '/dossier_selected/dossier_view/%s/' % date.today().strftime('%Y-%m-%d')
url = request.route_url('factures_en_att')
member = get_member_by_id(request, logged_in)
societe_defaut = member.societe
societe = societe_defaut
access_defaut = member.access
liste=[]
list_factures_en_att = get_factures_en_att(request)
if 'form.submitted' in request.params:
societe = request.params['societe']
list_factures_en_att = get_factures_en_att(request, societe)
for item in list_factures_en_att:
d = ('%s-FA%s' % (societe, item.numero),item.date.strftime('%d-%m-%Y'), item.nomcli, item.chantier, to_euro(item.montant),
item.nosin, item.libelle, item.usermaj)
liste.append(d)
order_option = 'desc'
return {
'page_title': "Factures en attente de réglement",
'url': url,
'list_factures_en_att':list_factures_en_att,
'goto_url': goto_url,
'dt_data': json.dumps(liste),
'societe': societe,
'order_option': order_option,
}