Skip to content
Extraits de code Groupes Projets
Valider e02151aa rédigé par Juliana's avatar Juliana
Parcourir les fichiers

[MIG] migration 14

parent bf7d2873
Aucune branche associée trouvée
Aucune étiquette associée trouvée
Aucune requête de fusion associée trouvée
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
'author': "LE FILAMENT", 'author': "LE FILAMENT",
'category': 'dashboard', 'category': 'dashboard',
'website': "https://le-filament.com", 'website': "https://le-filament.com",
'version': '13.0.1.0.0', 'version': '14.0.1.0.0',
'license': 'AGPL-3', 'license': 'AGPL-3',
'depends': ['account', 'crm', 'hr_expense', 'sale'], 'depends': ['account', 'crm', 'hr_expense', 'sale'],
'data': [ 'data': [
......
...@@ -44,7 +44,7 @@ class LeFilamentTdb(models.Model): ...@@ -44,7 +44,7 @@ class LeFilamentTdb(models.Model):
"SELECT SUM(amount_untaxed_signed) \ "SELECT SUM(amount_untaxed_signed) \
FROM account_move \ FROM account_move \
WHERE state != 'draft' \ WHERE state != 'draft' \
AND (type = 'out_invoice' OR type = 'out_refund') \ AND (move_type = 'out_invoice' OR move_type = 'out_refund') \
AND date >= date_trunc('month', %s) \ AND date >= date_trunc('month', %s) \
AND date < date_trunc('month', %s + interval '1' month);", AND date < date_trunc('month', %s + interval '1' month);",
(date_tdb, date_tdb) (date_tdb, date_tdb)
...@@ -102,7 +102,7 @@ class LeFilamentTdb(models.Model): ...@@ -102,7 +102,7 @@ class LeFilamentTdb(models.Model):
# PIPE # PIPE
self.env.cr.execute( self.env.cr.execute(
"SELECT SUM(planned_revenue * probability / 100) \ "SELECT SUM(expected_revenue * probability / 100) \
FROM crm_lead \ FROM crm_lead \
WHERE active = True" WHERE active = True"
) )
...@@ -198,32 +198,32 @@ class LeFilamentTdb(models.Model): ...@@ -198,32 +198,32 @@ class LeFilamentTdb(models.Model):
(SELECT SUM(amount_untaxed_signed) (SELECT SUM(amount_untaxed_signed)
FROM account_move FROM account_move
WHERE state!='draft' WHERE state!='draft'
AND (type='out_invoice' OR type='out_refund') AND (move_type='out_invoice' OR move_type='out_refund')
AND date > %s AND date <= %s AND date > %s AND date <= %s
) AS facture, ) AS facture,
(SELECT SUM(amount_residual_signed) (SELECT SUM(amount_residual_signed)
FROM account_move FROM account_move
WHERE state!='draft' AND type='out_invoice' WHERE state!='draft' AND move_type='out_invoice'
) AS a_encaisser, ) AS a_encaisser,
(SELECT SUM(amount_residual_signed) (SELECT SUM(amount_residual_signed)
FROM account_move FROM account_move
WHERE state!='draft' AND type='in_invoice' WHERE state!='draft' AND move_type='in_invoice'
) AS a_payer, ) AS a_payer,
(SELECT SUM(planned_revenue * probability / 100) (SELECT SUM(expected_revenue * probability / 100)
FROM crm_lead FROM crm_lead
WHERE active=True WHERE active=True
AND (date_deadline <= %s OR date_deadline is NULL) AND (date_deadline <= %s OR date_deadline is NULL)
) AS pipe, ) AS pipe,
(SELECT SUM(planned_revenue * probability / 100) (SELECT SUM(expected_revenue * probability / 100)
FROM crm_lead WHERE active=True AND date_deadline > %s FROM crm_lead WHERE active=True AND date_deadline > %s
) AS pipe_n1, ) AS pipe_n1,
(SELECT SUM(planned_revenue * probability / 100) (SELECT SUM(expected_revenue * probability / 100)
FROM crm_lead FROM crm_lead
WHERE active=True WHERE active=True
AND probability = 100 AND probability = 100
AND (date_deadline <= %s OR date_deadline is NULL) AND (date_deadline <= %s OR date_deadline is NULL)
) AS pipe_win, ) AS pipe_win,
(SELECT SUM(planned_revenue * probability / 100) (SELECT SUM(expected_revenue * probability / 100)
FROM crm_lead FROM crm_lead
WHERE active=True WHERE active=True
AND probability != 100 AND probability != 100
...@@ -378,11 +378,11 @@ class LeFilamentTdb(models.Model): ...@@ -378,11 +378,11 @@ class LeFilamentTdb(models.Model):
self._cr.execute( self._cr.execute(
""" """
SELECT to_char(date_trunc('month', invoice_date_due),'YYYY-MM') AS mois, SELECT to_char(date_trunc('month', invoice_date_due),'YYYY-MM') AS mois,
SUM(CASE WHEN type = 'in_invoice' SUM(CASE WHEN move_type = 'in_invoice'
THEN amount_residual_signed THEN amount_residual_signed
ELSE 0 END ELSE 0 END
) AS f_fournisseur, ) AS f_fournisseur,
SUM(CASE WHEN type = 'out_invoice' SUM(CASE WHEN move_type = 'out_invoice'
THEN amount_residual_signed THEN amount_residual_signed
ELSE 0 END ELSE 0 END
) AS f_client ) AS f_client
......
0% Chargement en cours ou .
You are about to add 0 people to the discussion. Proceed with caution.
Veuillez vous inscrire ou vous pour commenter