Ajout libellé clients + retrait CA internes

This commit is contained in:
thienan
2021-06-17 11:24:10 +02:00
parent 16af3ebb73
commit c87263d5a6
2 changed files with 18 additions and 21 deletions

View File

@@ -90,8 +90,6 @@ def get_ca_clients_12m(request, societe, datedeb, datefin):
SUM(IF(typecli = 'E', 1, 0)) AS E_nb,
SUM(IF(typecli = 'G', totalht, 0)) AS G_ca,
SUM(IF(typecli = 'G', 1, 0)) AS G_nb,
SUM(IF(typecli = 'I', totalht, 0)) AS I_ca,
SUM(IF(typecli = 'I', 1, 0)) AS I_nb,
SUM(IF(typecli = 'P', totalht, 0)) AS P_ca,
SUM(IF(typecli = 'P', 1, 0)) AS P_nb,
SUM(IF(typecli = 'R', totalht, 0)) AS R_ca,
@@ -108,15 +106,15 @@ def get_ca_clients_3y(request, societe, datedeb):
date2 = datedeb + relativedelta(years=-1)
date3 = datedeb + relativedelta(years=-2)
query = """SELECT typecli,
query = """SELECT LIB,
SUM(IF (date_format(date, '%Y') = :date_n-2, TOTALHT, 0)) as Annee1,
SUM(IF (date_format(date, '%Y') = :date_n-2, 1, 0)) as Count1,
SUM(IF (date_format(date, '%Y') = :date_n-1, TOTALHT, 0)) as Annee2,
SUM(IF (date_format(date, '%Y') = :date_n-1, 1, 0)) as Count2,
SUM(IF (date_format(date, '%Y') = :date_n, TOTALHT, 0)) as Annee3,
SUM(IF (date_format(date, '%Y') = :date_n, 1, 0)) as Count3
FROM bddevfac.facture
WHERE societe=:societe GROUP BY typecli;"""
FROM bddevfac.facture JOIN bddevfac.p_type ON bddevfac.facture.typecli = bddevfac.p_type.CODE
WHERE societe=:societe AND typecli <> 'I' GROUP BY typecli;"""
results = request.dbsession.execute(query, {'societe': societe, 'date_n': date3.strftime("%Y"), 'date_n-1': date2.strftime("%Y"), 'date_n': datedeb.strftime("%Y")})
return results.fetchall()