14.02.26
This commit is contained in:
@@ -1200,9 +1200,9 @@ class LotQt(
|
|||||||
# Pnl.save(pnl_lines)
|
# Pnl.save(pnl_lines)
|
||||||
|
|
||||||
#Open position update
|
#Open position update
|
||||||
if pl.quantity_theorical:
|
# if pl.quantity_theorical:
|
||||||
OpenPosition = Pool().get('open.position')
|
# OpenPosition = Pool().get('open.position')
|
||||||
OpenPosition.create_from_purchase_line(pl)
|
# OpenPosition.create_from_purchase_line(pl)
|
||||||
|
|
||||||
@classmethod
|
@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):
|
||||||
|
|||||||
@@ -593,9 +593,9 @@ class Line(metaclass=PoolMeta):
|
|||||||
valuations = Valuation.search([('lot','in',line.lots)])
|
valuations = Valuation.search([('lot','in',line.lots)])
|
||||||
if valuations:
|
if valuations:
|
||||||
Valuation.delete(valuations)
|
Valuation.delete(valuations)
|
||||||
op = OpenPosition.search(['line','=',line.id])
|
# op = OpenPosition.search(['line','=',line.id])
|
||||||
if op:
|
# if op:
|
||||||
OpenPosition.delete(op)
|
# OpenPosition.delete(op)
|
||||||
super(Line, cls).delete(lines)
|
super(Line, cls).delete(lines)
|
||||||
|
|
||||||
@classmethod
|
@classmethod
|
||||||
|
|||||||
@@ -691,9 +691,9 @@ class SaleLine(metaclass=PoolMeta):
|
|||||||
valuations = Valuation.search([('lot','in',line.lots)])
|
valuations = Valuation.search([('lot','in',line.lots)])
|
||||||
if valuations:
|
if valuations:
|
||||||
Valuation.delete(valuations)
|
Valuation.delete(valuations)
|
||||||
op = OpenPosition.search(['sale_line','=',line.id])
|
# op = OpenPosition.search(['sale_line','=',line.id])
|
||||||
if op:
|
# if op:
|
||||||
OpenPosition.delete(op)
|
# OpenPosition.delete(op)
|
||||||
|
|
||||||
super(SaleLine, cls).delete(lines)
|
super(SaleLine, cls).delete(lines)
|
||||||
|
|
||||||
|
|||||||
@@ -537,6 +537,7 @@ class ValuationReport(ValuationBase, ModelView):
|
|||||||
context = Transaction().context
|
context = Transaction().context
|
||||||
valuation_date = context.get('valuation_date')
|
valuation_date = context.get('valuation_date')
|
||||||
strategy = context.get('strategy')
|
strategy = context.get('strategy')
|
||||||
|
if val.date:
|
||||||
wh = (val.date == valuation_date)
|
wh = (val.date == valuation_date)
|
||||||
if strategy:
|
if strategy:
|
||||||
wh &= (val.strategy == strategy)
|
wh &= (val.strategy == strategy)
|
||||||
|
|||||||
Reference in New Issue
Block a user