main #7

Merged
admin merged 620 commits from main into dev 2026-03-29 13:03:25 +00:00
8 changed files with 58 additions and 4 deletions
Showing only changes of commit 175b10e59d - Show all commits

View File

@@ -16,13 +16,18 @@ this repository contains the full copyright notices and license terms. -->
<label name="product_supplier"/> <label name="product_supplier"/>
<field name="product_supplier"/> <field name="product_supplier"/>
<newline/> <newline/>
<field name="concentration"/>
<newline/>
<label name="del_period"/>
<field name="del_period"/>
<label name="period_at"/>
<field name="period_at"/>
<newline/>
<label id="delivery_date" string="Delivery Date:"/> <label id="delivery_date" string="Delivery Date:"/>
<group id="delivery_date" col="-1"> <group id="delivery_date" col="-1">
<field name="delivery_date" xexpand="0"/> <field name="delivery_date" xexpand="0"/>
<field name="delivery_date_edit" xexpand="0" xalign="0"/> <field name="delivery_date_edit" xexpand="0" xalign="0"/>
</group> </group>
<label name="del_period"/>
<field name="del_period"/>
<newline/> <newline/>
<label name="from_del"/> <label name="from_del"/>
<field name="from_del"/> <field name="from_del"/>

View File

@@ -425,6 +425,16 @@ class Line(metaclass=PoolMeta):
del_period = fields.Many2One('product.month',"Delivery Period") del_period = fields.Many2One('product.month',"Delivery Period")
from_del = fields.Date("From") from_del = fields.Date("From")
to_del = fields.Date("To") to_del = fields.Date("To")
period_at = fields.Selection([
(None, ''),
('laycan', 'Laycan'),
('loading', 'Loading'),
('discharge', 'Discharge'),
('crossing_border', 'Crossing Border'),
('title_transfer', 'Title transfer'),
('arrival', 'Arrival'),
],"Period at")
concentration = fields.Numeric("Concentration")
price_components = fields.One2Many('pricing.component','line',"Components") price_components = fields.One2Many('pricing.component','line',"Components")
price_pricing = fields.One2Many('pricing.pricing','line',"Pricing") price_pricing = fields.One2Many('pricing.pricing','line',"Pricing")
price_summary = fields.One2Many('purchase.pricing.summary','line',"Summary") price_summary = fields.One2Many('purchase.pricing.summary','line',"Summary")

View File

@@ -385,6 +385,16 @@ class SaleLine(metaclass=PoolMeta):
}),'get_progress') }),'get_progress')
from_del = fields.Date("From") from_del = fields.Date("From")
to_del = fields.Date("To") to_del = fields.Date("To")
period_at = fields.Selection([
(None, ''),
('laycan', 'Laycan'),
('loading', 'Loading'),
('discharge', 'Discharge'),
('crossing_border', 'Crossing Border'),
('title_transfer', 'Title transfer'),
('arrival', 'Arrival'),
],"Period at")
concentration = fields.Numeric("Concentration")
price_components = fields.One2Many('pricing.component','sale_line',"Components") price_components = fields.One2Many('pricing.component','sale_line',"Components")
mtm = fields.Many2Many('sale.strategy', 'sale_line', 'strategy', 'Mtm Strategy') mtm = fields.Many2Many('sale.strategy', 'sale_line', 'strategy', 'Mtm Strategy')
derivatives = fields.One2Many('derivative.derivative','sale_line',"Derivatives") derivatives = fields.One2Many('derivative.derivative','sale_line',"Derivatives")

View File

@@ -8,6 +8,13 @@ this repository contains the full copyright notices and license terms. -->
<newline/> <newline/>
<label name="broker"/> <label name="broker"/>
<field name="broker"/> <field name="broker"/>
<label name="operator"/>
<field name="operator"/>
<newline/>
<label name="trader"/>
<field name="trader"/>
<label name="our_reference"/>
<field name="our_reference"/>
<newline/> <newline/>
<label name="association"/> <label name="association"/>
<field name="association"/> <field name="association"/>

View File

@@ -41,6 +41,12 @@ this repository contains the full copyright notices and license terms. -->
<label name="tol_max_v"/> <label name="tol_max_v"/>
<field name="tol_max_v"/> <field name="tol_max_v"/>
<newline/> <newline/>
<label name="tol_min_qt"/>
<field name="tol_min_qt"/>
<newline/>
<label name="tol_max_qt"/>
<field name="tol_max_qt"/>
<newline/>
<label name="inherit_cer"/> <label name="inherit_cer"/>
<field name="inherit_cer"/> <field name="inherit_cer"/>
<label name="certif"/> <label name="certif"/>

View File

@@ -7,7 +7,14 @@ this repository contains the full copyright notices and license terms. -->
<field name="wb"/> <field name="wb"/>
<newline/> <newline/>
<label name="agent"/> <label name="agent"/>
<field name="agent" colspan="3"/> <field name="agent"/>
<label name="operator"/>
<field name="operator"/>
<newline/>
<label name="trader"/>
<field name="trader"/>
<label name="our_reference"/>
<field name="our_reference"/>
<newline/> <newline/>
<label name="association"/> <label name="association"/>
<field name="association"/> <field name="association"/>

View File

@@ -41,6 +41,12 @@ this repository contains the full copyright notices and license terms. -->
<label name="tol_max_v"/> <label name="tol_max_v"/>
<field name="tol_max_v"/> <field name="tol_max_v"/>
<newline/> <newline/>
<label name="tol_min_qt"/>
<field name="tol_min_qt"/>
<newline/>
<label name="tol_max_qt"/>
<field name="tol_max_qt"/>
<newline/>
<label name="inherit_cer"/> <label name="inherit_cer"/>
<field name="inherit_cer"/> <field name="inherit_cer"/>
<label name="certif"/> <label name="certif"/>

View File

@@ -13,9 +13,12 @@ this repository contains the full copyright notices and license terms. -->
<label name="product"/> <label name="product"/>
<field name="product" <field name="product"
view_ids="sale.product_view_list_sale_line"/> view_ids="sale.product_view_list_sale_line"/>
<field name="concentration"/>
<newline/> <newline/>
<label name="del_period"/> <label name="del_period"/>
<field name="del_period"/> <field name="del_period"/>
<label name="period_at"/>
<field name="period_at"/>
<newline/> <newline/>
<label name="from_del"/> <label name="from_del"/>
<field name="from_del"/> <field name="from_del"/>