08.02.26

modules/purchase/view/purchase_line_form.xml

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

modules/purchase_trade/purchase.py

@@ -425,6 +425,16 @@ class Line(metaclass=PoolMeta):
     del_period = fields.Many2One('product.month',"Delivery Period")
     from_del = fields.Date("From")
     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_pricing = fields.One2Many('pricing.pricing','line',"Pricing")
     price_summary = fields.One2Many('purchase.pricing.summary','line',"Summary")

modules/purchase_trade/sale.py

@@ -36,7 +36,7 @@ class AnalyticDimensionAssignment(metaclass=PoolMeta):
     'Analytic Dimension Assignment'
     __name__ = 'analytic.dimension.assignment'
     sale = fields.Many2One('sale.sale', "Sale")
-    
+
 class Estimated(metaclass=PoolMeta):
     "Estimated date"
     __name__ = 'pricing.estimated'
@@ -385,6 +385,16 @@ class SaleLine(metaclass=PoolMeta):
             }),'get_progress')
     from_del = fields.Date("From")
     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")
     mtm = fields.Many2Many('sale.strategy', 'sale_line', 'strategy', 'Mtm Strategy')
     derivatives = fields.One2Many('derivative.derivative','sale_line',"Derivatives")

modules/purchase_trade/view/purchase_form.xml

@@ -8,6 +8,13 @@ this repository contains the full copyright notices and license terms. -->
         <newline/>
         <label 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/>
         <label name="association"/>
         <field name="association"/>

modules/purchase_trade/view/purchase_line_form.xml

@@ -41,6 +41,12 @@ this repository contains the full copyright notices and license terms. -->
         <label name="tol_max_v"/>
         <field name="tol_max_v"/>
         <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"/>
         <field name="inherit_cer"/>
         <label name="certif"/>

modules/purchase_trade/view/sale_form.xml

@@ -7,7 +7,14 @@ this repository contains the full copyright notices and license terms. -->
         <field name="wb"/>
         <newline/>
         <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/>
         <label name="association"/>
         <field name="association"/>

modules/purchase_trade/view/sale_line_form.xml

@@ -41,6 +41,12 @@ this repository contains the full copyright notices and license terms. -->
         <label name="tol_max_v"/>
         <field name="tol_max_v"/>
         <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"/>
         <field name="inherit_cer"/>
         <label name="certif"/>

modules/sale/view/sale_line_form.xml

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