07.02.26

modules/purchase_trade/__init__.py

@@ -163,7 +163,6 @@ def register():
         purchase.ContractDocumentType,
         purchase.DocTemplate,
         purchase.DocTypeTemplate,
-        purchase.MtmStrategy,
         weight_report.WeightReport,
         module='purchase', type_='model')
     Pool.register(
@@ -204,7 +203,6 @@ def register():
         forex.SForex,
         forex.ForexCoverPhysicalSale,
         sale.ContractDocumentType,
-        sale.MtmStrategy,
         sale.OpenPosition,
         module='sale', type_='model')
     Pool.register(

modules/purchase_trade/pricing.py

@@ -50,6 +50,13 @@ DAYS = [
     ('sunday', 'Sunday'),
     ]
 
+class ContractStrategy(ModelSQL):
+    "Contract - Document Type"
+    __name__ = 'contract.strategy'
+    line = fields.Many2One('purchase.line', 'Purchase Line')
+    sale_line = fields.Many2One('sale.line', 'Sale Line')
+    strategy = fields.Many2One('mtm.strategy', "Strategy")
+
 class Estimated(ModelSQL, ModelView):
     "Estimated date"
     __name__ = 'pricing.estimated'

modules/purchase_trade/purchase.py

@@ -61,11 +61,6 @@ class DocTypeTemplate(ModelSQL):
     template = fields.Many2One('doc.template')
     type = fields.Many2One('document.type')
 
-class MtmStrategy(metaclass=PoolMeta):
-    "Mtm Strategy"
-    __name__ = 'mtm.strategy'
-    line = fields.Many2One('purchase.line',"Line",ondelete='CASCADE')
-
 class Estimated(metaclass=PoolMeta):
     "Estimated date"
     __name__ = 'pricing.estimated'
@@ -422,11 +417,7 @@ class Line(metaclass=PoolMeta):
     purchase_line = fields.Many2One('purchase.line',"Lines")
     fees = fields.One2Many('fee.fee', 'line', 'Fees')#, filter=[('product.type', '=', 'service')])
     derivatives = fields.One2Many('derivative.derivative','line',"Derivatives")
-    # mtm = fields.One2Many('mtm.component','line',"Mtm")
-    mtm = fields.One2Many(
-        'mtm.strategy', 'line',
-        "MtM Strategies"
-    )
+    mtm = fields.Many2Many('contract.strategy', 'line', 'strategy', 'Mtm Strategy')
     tol_min = fields.Numeric("Tol - in %",states={
             'readonly': (Eval('inherit_tol')),
             })

modules/purchase_trade/sale.py

@@ -52,11 +52,6 @@ class OpenPosition(metaclass=PoolMeta):
     sale_line = fields.Many2One('sale.line',"Sale Line")
     client = fields.Many2One('party.party',"Client")
 
-class MtmStrategy(metaclass=PoolMeta):
-    "Mtm Strategy"
-    __name__ = 'mtm.strategy'
-    sale_line = fields.Many2One('sale.line',"Line",ondelete='CASCADE')
-
 class Component(metaclass=PoolMeta):
     "Component"
     __name__ = 'pricing.component'
@@ -363,11 +358,7 @@ class SaleLine(metaclass=PoolMeta):
     from_del = fields.Date("From")
     to_del = fields.Date("To")
     price_components = fields.One2Many('pricing.component','sale_line',"Components")
-    # mtm = fields.One2Many('mtm.component','sale_line',"Mtm")
-    mtm = fields.One2Many(
-        'mtm.strategy', 'sale_line',
-        "MtM Strategies"
-    )
+    mtm = fields.Many2Many('contract.strategy', 'sale_line', 'strategy', 'Mtm Strategy')
     derivatives = fields.One2Many('derivative.derivative','sale_line',"Derivatives")
     price_pricing = fields.One2Many('pricing.pricing','sale_line',"Pricing")
     price_summary = fields.One2Many('sale.pricing.summary','sale_line',"Summary")