diff --git a/modules/purchase_trade/__init__.py b/modules/purchase_trade/__init__.py index ddb2a70..b2fa644 100755 --- a/modules/purchase_trade/__init__.py +++ b/modules/purchase_trade/__init__.py @@ -163,6 +163,7 @@ def register(): purchase.ContractDocumentType, purchase.DocTemplate, purchase.DocTypeTemplate, + purchase.PurchaseStrategy, weight_report.WeightReport, module='purchase', type_='model') Pool.register( @@ -174,7 +175,6 @@ def register(): pricing.MtmStrategy, pricing.MtmScenario, pricing.MtmSnapshot, - pricing.ContractStrategy, pricing.PriceMatrix, pricing.PriceMatrixLine, pricing.Estimated, @@ -204,6 +204,7 @@ def register(): forex.SForex, forex.ForexCoverPhysicalSale, sale.ContractDocumentType, + sale.SaleStrategy, sale.OpenPosition, module='sale', type_='model') Pool.register( diff --git a/modules/purchase_trade/pricing.py b/modules/purchase_trade/pricing.py index 1910436..33e3c76 100755 --- a/modules/purchase_trade/pricing.py +++ b/modules/purchase_trade/pricing.py @@ -50,13 +50,6 @@ 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' diff --git a/modules/purchase_trade/purchase.py b/modules/purchase_trade/purchase.py index 845374f..1901858 100755 --- a/modules/purchase_trade/purchase.py +++ b/modules/purchase_trade/purchase.py @@ -61,6 +61,12 @@ class DocTypeTemplate(ModelSQL): template = fields.Many2One('doc.template') type = fields.Many2One('document.type') +class PurchaseStrategy(ModelSQL): + "Purchase - Document Type" + __name__ = 'purchase.strategy' + line = fields.Many2One('purchase.line', 'Purchase Line') + strategy = fields.Many2One('mtm.strategy', "Strategy") + class Estimated(metaclass=PoolMeta): "Estimated date" __name__ = 'pricing.estimated' @@ -417,7 +423,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.Many2Many('contract.strategy', 'line', 'strategy', 'Mtm Strategy') + mtm = fields.Many2Many('purchase.strategy', 'line', 'strategy', 'Mtm Strategy') tol_min = fields.Numeric("Tol - in %",states={ 'readonly': (Eval('inherit_tol')), }) diff --git a/modules/purchase_trade/sale.py b/modules/purchase_trade/sale.py index 34a62cc..3b021cb 100755 --- a/modules/purchase_trade/sale.py +++ b/modules/purchase_trade/sale.py @@ -52,6 +52,12 @@ class OpenPosition(metaclass=PoolMeta): sale_line = fields.Many2One('sale.line',"Sale Line") client = fields.Many2One('party.party',"Client") +class SaleStrategy(ModelSQL): + "Sale - Document Type" + __name__ = 'sale.strategy' + sale_line = fields.Many2One('sale.line', 'Sale Line') + strategy = fields.Many2One('mtm.strategy', "Strategy") + class Component(metaclass=PoolMeta): "Component" __name__ = 'pricing.component' @@ -358,7 +364,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.Many2Many('contract.strategy', 'sale_line', 'strategy', 'Mtm Strategy') + mtm = fields.Many2Many('sale.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")