diff --git a/modules/purchase_trade/lot.py b/modules/purchase_trade/lot.py index afeb73d..b818cea 100755 --- a/modules/purchase_trade/lot.py +++ b/modules/purchase_trade/lot.py @@ -1205,7 +1205,7 @@ class LotQt( # OpenPosition.create_from_purchase_line(pl) @classmethod - def getQuery(cls,purchase=None,sale=None,shipment=None,type=None,state=None,qttype=None,supplier=None,client=None,ps=None,lot_status=None,group=None,product=None,location=None,origin=None): + def getQuery(cls,purchase=None,sale=None,shipment=None,type=None,state=None,qttype=None,supplier=None,client=None,ps=None,lot_status=None,group=None,product=None,location=None,origin=None,finished=False): pool = Pool() LotQt = pool.get('lot.qt') lqt = LotQt.__table__() @@ -1292,6 +1292,8 @@ class LotQt( wh &= (pu.party == supplier) if client and sa: wh &= (sa.party == client) + if not finished: + wh &= (pl.finished == False) AvQt = Case(((lqt.lot_p>0) & (lqt.lot_s>0), 0),else_=Case((lqt.lot_p>0,lqt.lot_quantity),else_=-lqt.lot_quantity)) MaQt = Case(((lqt.lot_p>0) & (lqt.lot_s>0), lqt.lot_quantity),else_=0) @@ -1844,7 +1846,8 @@ class LotReport( supplier = context.get('supplier') #asof = context.get('asof') #todate = context.get('todate') - query = LotQt.getQuery(purchase,sale,shipment,type,state,None,supplier,None,None,wh,group,product,location,origin) + finished = context.get('finished') + query = LotQt.getQuery(purchase,sale,shipment,type,state,None,supplier,None,None,wh,group,product,location,origin,finished) return query @classmethod @@ -1934,6 +1937,12 @@ class LotContext(ModelView): ('pnl', 'Pnl'), ],'Mode') + finished = fields.Boolean("Display finished") + + @classmethod + def default_finished(cls): + return False + @classmethod def default_asof(cls): pool = Pool() diff --git a/modules/purchase_trade/view/lot_report_context_form.xml b/modules/purchase_trade/view/lot_report_context_form.xml index e3a30cb..8d51948 100755 --- a/modules/purchase_trade/view/lot_report_context_form.xml +++ b/modules/purchase_trade/view/lot_report_context_form.xml @@ -27,4 +27,6 @@