diff --git a/modules/purchase_trade/ctrm_reporting.py b/modules/purchase_trade/ctrm_reporting.py index 9dd9c93..611450d 100644 --- a/modules/purchase_trade/ctrm_reporting.py +++ b/modules/purchase_trade/ctrm_reporting.py @@ -342,12 +342,12 @@ class CTRMOpenPositionContext(ModelView): ('around_3m', 'Around 3M'), ('around_6m', 'Around 6M'), ('range', 'Range'), - ], "Purchase Period") - purchase_period = fields.Many2One('product.month', "Purchase Period") + ], "Purchase Filter") + purchase_period = fields.Many2One('product.month', "Exact Period") purchase_period_from = fields.Many2One( - 'product.month', "Purchase Period From") + 'product.month', "From") purchase_period_to = fields.Many2One( - 'product.month', "Purchase Period To") + 'product.month', "To") sale_period_mode = fields.Selection([ (None, ''), ('all', 'All'), @@ -356,12 +356,12 @@ class CTRMOpenPositionContext(ModelView): ('around_3m', 'Around 3M'), ('around_6m', 'Around 6M'), ('range', 'Range'), - ], "Sale Period") - sale_period = fields.Many2One('product.month', "Sale Period") + ], "Sale Filter") + sale_period = fields.Many2One('product.month', "Exact Period") sale_period_from = fields.Many2One( - 'product.month', "Sale Period From") + 'product.month', "From") sale_period_to = fields.Many2One( - 'product.month', "Sale Period To") + 'product.month', "To") strategy = fields.Many2One('mtm.strategy', "Strategy") counterparty = fields.Many2One('party.party', "Counterparty") direction = fields.Selection([ diff --git a/modules/purchase_trade/view/ctrm_open_position_context_form.xml b/modules/purchase_trade/view/ctrm_open_position_context_form.xml index ba3b777..278fb49 100644 --- a/modules/purchase_trade/view/ctrm_open_position_context_form.xml +++ b/modules/purchase_trade/view/ctrm_open_position_context_form.xml @@ -1,34 +1,43 @@ -
-