diff --git a/modules/purchase_trade/__init__.py b/modules/purchase_trade/__init__.py index 782f22a..3659672 100755 --- a/modules/purchase_trade/__init__.py +++ b/modules/purchase_trade/__init__.py @@ -73,7 +73,6 @@ def register(): ctrm_reporting.CTRMLongShortPeriodProduct, ctrm_reporting.CTRMLongShortPricingStatus, ctrm_reporting.CTRMLongShortDetail, - ctrm_reporting.CTRMLongShortDetailContext, ctrm_reporting.CTRMRealizedPnl, ctrm_reporting.CTRMRealizedPnlContext, ctrm_reporting.CTRMMtmPnl, diff --git a/modules/purchase_trade/ctrm_reporting.py b/modules/purchase_trade/ctrm_reporting.py index ac40c71..eef78e3 100644 --- a/modules/purchase_trade/ctrm_reporting.py +++ b/modules/purchase_trade/ctrm_reporting.py @@ -831,76 +831,6 @@ class CTRMLongShortPricingStatus( line_pricing=True) -class CTRMLongShortDetailContext(CTRMOpenPositionContext): - "CTRM Long & Short Detail Context" - __name__ = 'ctrm.reporting.position.long_short.detail.context' - - asof = fields.Date("From Date") - todate = fields.Date("To Date") - purchase = fields.Many2One('purchase.purchase', "Purchase") - sale = fields.Many2One('sale.sale', "Sale") - supplier = fields.Many2One('party.party', "Supplier") - client = fields.Many2One('party.party', "Client") - reference = fields.Char("Reference") - shipment = fields.Many2One('stock.shipment.in', "Shipment") - vessel = fields.Many2One('trade.vessel', "Vessel") - location = fields.Many2One('stock.location', "Location") - dimension = fields.Many2One('analytic.dimension.value', "Dimension") - matching_status = fields.Selection([ - ('all', 'All'), - ('matched', 'Matched'), - ('not matched', 'Not Matched'), - ], "Matching") - shipping_status = fields.Selection([ - ('all', 'All'), - ('unshipped', 'Unshipped'), - ('planned', 'Planned'), - ('scheduled', 'Scheduled'), - ('shipped', 'Shipped'), - ('received', 'Received'), - ], "Shipping Status") - lot_status = fields.Selection([ - ('all', 'All'), - ('forecast', 'Forecast'), - ('loading', 'Loading'), - ('destination', 'Destination'), - ('stock', 'Stock'), - ('delivered', 'Delivered'), - ], "Where") - lot_origin = fields.Selection([ - ('all', 'All'), - ('open', 'Open'), - ('physic', 'Physic'), - ], "Open/Physic") - availability = fields.Selection([ - ('all', 'All'), - ('available', 'Available'), - ('reserved', 'Reserved'), - ('locked', 'Locked'), - ], "Availability") - display_finished = fields.Boolean("Finished") - - @classmethod - def default_matching_status(cls): - return 'all' - - @classmethod - def default_shipping_status(cls): - return 'all' - - @classmethod - def default_lot_status(cls): - return 'all' - - @classmethod - def default_lot_origin(cls): - return 'all' - - @classmethod - def default_availability(cls): - return 'all' - - class CTRMLongShortDetail(ModelSQL, ModelView): "CTRM Long & Short Detail" __name__ = 'ctrm.reporting.position.long_short.detail' diff --git a/modules/purchase_trade/global_reporting.xml b/modules/purchase_trade/global_reporting.xml index 635c36e..97716e7 100644 --- a/modules/purchase_trade/global_reporting.xml +++ b/modules/purchase_trade/global_reporting.xml @@ -55,11 +55,6 @@ tree ctrm_open_position_list - - ctrm.reporting.position.long_short.detail.context - form - ctrm_long_short_detail_context_form - ctrm.reporting.position.long_short.detail tree @@ -99,7 +94,7 @@ Long & Short Detail ctrm.reporting.position.long_short.detail - ctrm.reporting.position.long_short.detail.context + ctrm.reporting.risk.open_position.context diff --git a/modules/purchase_trade/view/ctrm_long_short_detail_context_form.xml b/modules/purchase_trade/view/ctrm_long_short_detail_context_form.xml deleted file mode 100644 index 272959d..0000000 --- a/modules/purchase_trade/view/ctrm_long_short_detail_context_form.xml +++ /dev/null @@ -1,43 +0,0 @@ -
- - - - - - -