diff --git a/modules/purchase_trade/valuation.py b/modules/purchase_trade/valuation.py index 3583b28..ed2fc8d 100644 --- a/modules/purchase_trade/valuation.py +++ b/modules/purchase_trade/valuation.py @@ -85,8 +85,10 @@ class ValuationBase(ModelSQL): qty = lot.get_current_quantity_converted() price = pc.price + logger.info("TERMS:%s",line.terms) if line.terms: c = [t for t in line.terms if t.component == pc.price_component.id] + logger.info("COMPONENTS:%s",c) if c: price = c[0].manual_price @@ -106,8 +108,8 @@ class ValuationBase(ModelSQL): base = sale_line.quantity_theorical if sale_line else line.quantity_theorical values['state'] = f"part. fixed {round(pc.fixed_qt / Decimal(base) * 100, 0)}%" - if pc.price and pc.ratio: - amount = round(price * qty * Decimal(sign) * pc.ratio / 100, 2) + if price != None: + amount = round(price * qty * Decimal(sign), 2) base_amount = amount currency = sale_line.sale.currency.id if sale_line else line.purchase.currency.id rate = Decimal(1)