diff --git a/modules/purchase_trade/lot.py b/modules/purchase_trade/lot.py index f9252d7..060bd49 100755 --- a/modules/purchase_trade/lot.py +++ b/modules/purchase_trade/lot.py @@ -1336,7 +1336,11 @@ class LotQt( Case((lp.id>0, lp.lot_himself),else_=ls.lot_himself).as_('r_lot_himself'), Case((lp.id>0, lp.lot_container),else_=ls.lot_container).as_('r_lot_container'), Case((lp.id>0, lp.line),else_=None).as_('r_line'), - Case((pl.id>0, pl.del_period),else_=None).as_('r_del_period'), + Case( + (((lqt.lot_s != None) & (lqt.lot_p == None) & (sl.id > 0)), + sl.del_period), + else_=Case((pl.id>0, pl.del_period),else_=None) + ).as_('r_del_period'), Case((pu.id>0, pu.id),else_=None).as_('r_purchase'), Case((sa.id>0, sa.id),else_=None).as_('r_sale'), Case((ls.id>0, ls.sale_line),else_=None).as_('r_sale_line'),