diff --git a/modules/purchase_trade/valuation.py b/modules/purchase_trade/valuation.py index 9c49721..089e6c5 100644 --- a/modules/purchase_trade/valuation.py +++ b/modules/purchase_trade/valuation.py @@ -1285,9 +1285,12 @@ class ValuationDyn(ModelSQL,ModelView): r_quantity = fields.Numeric("Quantity",digits='r_unit') r_unit = fields.Many2One('product.uom',"Unit") r_amount = fields.Numeric("Amount",digits='r_unit') + r_amount_prev = fields.Numeric("Amount -1", digits='r_unit') r_base_amount = fields.Numeric("Base Amount",digits='r_unit') r_rate = fields.Numeric("Rate",digits=(16,6)) r_mtm_price = fields.Numeric("Mtm Price",digits='r_unit') + r_mtm_price_prev = fields.Numeric("Mtm Price -1", digits='r_unit') + r_mtm_curve = fields.Many2One('price.price', "Curve") r_mtm = fields.Numeric("Mtm",digits='r_unit') r_strategy = fields.Many2One('mtm.strategy',"Strategy") r_lot = fields.Many2One('lot.lot',"Lot") @@ -1319,9 +1322,12 @@ class ValuationDyn(ModelSQL,ModelView): Sum(val.quantity).as_('r_quantity'), Max(val.unit).as_('r_unit'), Sum(val.amount).as_('r_amount'), + Sum(val.amount_prev).as_('r_amount_prev'), Sum(val.base_amount).as_('r_base_amount'), Sum(val.rate).as_('r_rate'), Avg(val.mtm_price).as_('r_mtm_price'), + Avg(val.mtm_price_prev).as_('r_mtm_price_prev'), + Max(val.mtm_curve).as_('r_mtm_curve'), Sum(val.mtm).as_('r_mtm'), Max(val.strategy).as_('r_strategy'), Max(val.lot).as_('r_lot'), @@ -1369,9 +1375,12 @@ class ValuationReport(ValuationBase, ModelView): val.quantity.as_('quantity'), val.unit.as_('unit'), val.amount.as_('amount'), + val.amount_prev.as_('amount_prev'), val.base_amount.as_('base_amount'), val.rate.as_('rate'), val.mtm_price.as_('mtm_price'), + val.mtm_price_prev.as_('mtm_price_prev'), + val.mtm_curve.as_('mtm_curve'), val.mtm.as_('mtm'), val.strategy.as_('strategy'), val.lot.as_('lot'),