From 423ca12a8134a8cffb65bc6fe7e8baf8e0f35aef Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Thu, 16 Dec 2021 22:39:44 +0100 Subject: [PATCH] Do not reset period or date if changed fill is empty issue11035 review370401002 (grafted from d471d45ddc0596f28cbefcf4830db73c60b918cd) --HG-- branch : 6.0 --- account.py | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/account.py b/account.py index d1bdd08b0b..a35b9b5285 100644 --- a/account.py +++ b/account.py @@ -1899,7 +1899,7 @@ class GeneralLedgerAccountContext(ModelView): ()), ], states={ - 'invisible': (Eval('start_period', 'False') + 'invisible': (Eval('start_period', False) | Eval('end_period', False)), }, depends=['to_date', 'start_period', 'end_period']) @@ -1910,7 +1910,7 @@ class GeneralLedgerAccountContext(ModelView): ()), ], states={ - 'invisible': (Eval('start_period', 'False') + 'invisible': (Eval('start_period', False) | Eval('end_period', False)), }, depends=['from_date', 'start_period', 'end_period']) @@ -1970,17 +1970,25 @@ class GeneralLedgerAccountContext(ModelView): and self.end_period.fiscalyear != self.fiscalyear): self.end_period = None + @fields.depends('start_period') def on_change_start_period(self): - self.from_date = self.to_date = None + if self.start_period: + self.from_date = self.to_date = None + @fields.depends('end_period') def on_change_end_period(self): - self.from_date = self.to_date = None + if self.end_period: + self.from_date = self.to_date = None + @fields.depends('from_date') def on_change_from_date(self): - self.start_period = self.end_period = None + if self.from_date: + self.start_period = self.end_period = None + @fields.depends('to_date') def on_change_to_date(self): - self.start_period = self.end_period = None + if self.to_date: + self.start_period = self.end_period = None class GeneralLedgerAccountParty(_GeneralLedgerAccount):