admin/tradon
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

07.02.26

Browse Source
This commit is contained in:
laurentbarontini
2026-02-07 17:08:29 +01:00
parent 67eca35a9a
commit 1b92b1d207
4 changed files with 9 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
modules/purchase_trade/__init__.py
View File

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

7
modules/purchase_trade/pricing.py
View File

@@ -50,6 +50,13 @@ DAYS = [
('sunday', 'Sunday'), ('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): class Estimated(ModelSQL, ModelView):
"Estimated date" "Estimated date"
__name__ = 'pricing.estimated' __name__ = 'pricing.estimated'

11
modules/purchase_trade/purchase.py
View File

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

11
modules/purchase_trade/sale.py
View File

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