Pnl
This commit is contained in:
@@ -1285,12 +1285,9 @@ 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")
|
||||
@@ -1322,12 +1319,9 @@ 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'),
|
||||
|
||||
@@ -9,19 +9,9 @@ this repository contains the full copyright notices and license terms. -->
|
||||
<field name="r_state"/>
|
||||
<field name="r_price"/>
|
||||
<field name="r_quantity" symbol="r_unit"/>
|
||||
<field name="r_amount"
|
||||
sum="1"
|
||||
sum_previous="r_amount_prev"
|
||||
sum_variation="1"/>
|
||||
<field name="r_amount_prev" optional="1"/>
|
||||
<field name="r_amount" sum="1"/>
|
||||
<field name="r_strategy"/>
|
||||
<field name="r_mtm_curve"/>
|
||||
<field name="r_mtm_price"
|
||||
widget="variation"
|
||||
variation_previous="r_mtm_price_prev"
|
||||
variation_group_by="r_mtm_curve"
|
||||
variation_summary="1"/>
|
||||
<field name="r_mtm_price_prev" optional="1"/>
|
||||
<field name="r_mtm_price"/>
|
||||
<field name="r_mtm" optional="0" sum="1"/>
|
||||
</tree>
|
||||
|
||||
|
||||
Reference in New Issue
Block a user