From 3a52ea9a7878de6eb2740b8903685a035f94eff1 Mon Sep 17 00:00:00 2001
From: Benjamin <benjamin@le-filament.com>
Date: Mon, 8 Jun 2020 16:11:36 +0200
Subject: [PATCH] [cgscop #210] fix erreur comparaison date + modification
fonction
---
models/hr_timesheet.py | 13 ++++++++++---
1 file changed, 10 insertions(+), 3 deletions(-)
diff --git a/models/hr_timesheet.py b/models/hr_timesheet.py
index 45ced85..ef4b0c4 100644
--- a/models/hr_timesheet.py
+++ b/models/hr_timesheet.py
@@ -88,12 +88,19 @@ class ScopHrTimesheet(models.Model):
@api.onchange('partner_id')
def onchange_partner_id(self):
+ # affiche le Dispositif Financier par défaut sur la LdT
+ # si il n'y a pas de date limite du dispositif
+ # ou si la date de la Ldt est inférieure à la date limite du dispositif
if not self.partner_id.ur_financial_system_date or \
- fields.Datetime.now() > self.partner_id.ur_financial_system_date:
+ self.date <= self.partner_id.ur_financial_system_date:
self.ur_financial_system_id = self.partner_id.ur_financial_system_id
+ # affiche la Convention par défaut sur la LdT
+ # si il n'y a pas de date limite de la convention
+ # ou si la date de la LdT est inférieure à la date limite de la convention
if not self.partner_id.ur_regional_convention_date or \
- fields.Datetime.now() > self.partner_id.ur_regional_convention_date:
- self.ur_regional_convention_id = self.partner_id.ur_regional_convention_id
+ self.date <= self.partner_id.ur_regional_convention_date:
+ self.ur_regional_convention_id = self.partner_id.\
+ ur_regional_convention_id
# ------------------------------------------------------
# Contrains
--
GitLab