From 3e1ed6a6fdf2c5c2c1ffe995c17434985d3d882c Mon Sep 17 00:00:00 2001
From: Benjamin <Benjamin@MBP-de-Benj.(none)>
Date: Tue, 16 Oct 2018 10:16:47 +0200
Subject: [PATCH] fix erreur calcul dates fiscal_year
---
models/lefilament_tdb.py | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
diff --git a/models/lefilament_tdb.py b/models/lefilament_tdb.py
index c1e7561..64a0498 100644
--- a/models/lefilament_tdb.py
+++ b/models/lefilament_tdb.py
@@ -109,8 +109,13 @@ class LeFilamentTdb(models.Model):
@api.model
def retrieve_datas_dashboard(self):
## Get fiscal years
- fiscal_year = "'" + Date.to_string(datetime(datetime.now().year, self.env.user.company_id.fiscalyear_last_month, self.env.user.company_id.fiscalyear_last_day)) + "'"
- fiscal_year_next = "'" + Date.to_string(datetime((datetime.now() + relativedelta(years=1)).year, self.env.user.company_id.fiscalyear_last_month, self.env.user.company_id.fiscalyear_last_day)) + "'"
+ fiscal_date = datetime(datetime.now().year, self.env.user.company_id.fiscalyear_last_month, self.env.user.company_id.fiscalyear_last_day)
+ if datetime.now() > fiscal_date:
+ fiscal_year = "'" + Date.to_string(fiscal_date) + "'"
+ fiscal_year_next = "'" + Date.to_string(fiscal_date+relativedelta(years=1)) + "'"
+ else:
+ fiscal_year = "'" + Date.to_string(fiscal_date-relativedelta(years=1)) + "'"
+ fiscal_year_next = "'" + Date.to_string(fiscal_date) + "'"
## Prepare values
res = {
--
GitLab