trytond-patches/issue12414.diff

27 lines
1.2 KiB
Diff

diff --git a/tryton/modules/stock_lot_sled/stock.py b/tryton/modules/stock_lot_sled/stock.py
index 111b160821..ffa7e8dd04 100644
--- a/tryton/modules/stock_lot_sled/stock.py
+++ b/tryton/modules/stock_lot_sled/stock.py
@@ -51,7 +51,9 @@ class LotSledMixin:
states={
'required': (
Eval('shelf_life_expiration_state', 'none') == 'required'),
- 'invisible': Eval('shelf_life_expiration_state', 'none') == 'none',
+ 'invisible': (
+ (Eval('shelf_life_expiration_state', 'none') == 'none')
+ & ~Eval('shelf_life_expiration_date')),
})
shelf_life_expiration_state = fields.Function(
fields.Selection(DATE_STATE, 'Shelf Life Expiration State'),
@@ -59,7 +61,9 @@ class LotSledMixin:
expiration_date = fields.Date('Expiration Date',
states={
'required': Eval('expiration_state', 'none') == 'required',
- 'invisible': Eval('expiration_state', 'none') == 'none',
+ 'invisible': (
+ (Eval('expiration_state', 'none') == 'none')
+ & ~Eval('expiration_date')),
})
expiration_state = fields.Function(
fields.Selection(DATE_STATE, 'Expiration State'),