diff --git a/modules/purchase_trade/coffee.py b/modules/purchase_trade/coffee.py
index 78f6b24..13fb19c 100644
--- a/modules/purchase_trade/coffee.py
+++ b/modules/purchase_trade/coffee.py
@@ -1128,7 +1128,7 @@ class CoffeeLineMixin:
     coffee_packing_weight_unit = fields.Many2One(
         'product.uom', 'Package weight unit')
     coffee_packing_unit = fields.Many2One(
-        'product.uom', 'Package unit')
+        'product.uom', 'Unit')
     coffee_packing_description = fields.Char('Packing description')
     coffee_market_reference = fields.Many2One(
         'price.price', 'Market reference')
diff --git a/modules/purchase_trade/lot.xml b/modules/purchase_trade/lot.xml
index 7a210e5..35543f9 100755
--- a/modules/purchase_trade/lot.xml
+++ b/modules/purchase_trade/lot.xml
@@ -415,7 +415,7 @@ this repository contains the full copyright notices and license terms. -->
         </record>
 
         <record model="ir.action.wizard" id="act_mark_finished">
-            <field name="name">Mark as finished</field>
+            <field name="name">Finished</field>
             <field name="wiz_name">lot.mark_finished</field>
             <field name="model">lot.report</field>
         </record>
diff --git a/modules/purchase_trade/purchase.py b/modules/purchase_trade/purchase.py
index f0a1710..9738e4d 100755
--- a/modules/purchase_trade/purchase.py
+++ b/modules/purchase_trade/purchase.py
@@ -2691,7 +2691,7 @@ class Line(metaclass=PoolMeta):
     tol_max_qt = fields.Numeric("Tol +",states={
             'readonly': (Eval('inherit_tol')),
             })
-    inherit_tol = fields.Boolean("Inherit tolerance")
+    inherit_tol = fields.Boolean("Inh.")
     tol_min_v = fields.Function(fields.Numeric("Qt min"),'get_tol_min')
     tol_max_v = fields.Function(fields.Numeric("Qt max"),'get_tol_max')
     tolerance_used = fields.Function(
@@ -2706,7 +2706,7 @@ class Line(metaclass=PoolMeta):
     #     ('bci', 'BCI'),
     # ],"Certification",states={'readonly': (Eval('inherit_cer')),})
     certif = fields.Many2One('purchase.certification',"Certification",states={'readonly': (Eval('inherit_cer')),})
-    inherit_cer = fields.Boolean("Inherit certification")
+    inherit_cer = fields.Boolean("Inh.")
     enable_linked_currency = fields.Boolean("Linked currencies")
     linked_price = fields.Numeric("Price", digits='unit',states={
             'invisible': (~Eval('enable_linked_currency')),
@@ -2847,7 +2847,7 @@ class Line(metaclass=PoolMeta):
     specification = fields.Function(
         fields.Char("Specification"), 'on_change_with_specification')
 
-    finished = fields.Boolean("Mark as finished")
+    finished = fields.Boolean("Finished")
 
     quality_analysis = fields.One2Many('quality.analysis','line',"Quality analysis")
     assays = fields.One2Many('assay.assay','line',"Assays")
diff --git a/modules/purchase_trade/sale.py b/modules/purchase_trade/sale.py
index 3f888ce..8b0b58f 100755
--- a/modules/purchase_trade/sale.py
+++ b/modules/purchase_trade/sale.py
@@ -2490,7 +2490,7 @@ class SaleLine(metaclass=PoolMeta):
     tol_max_qt = fields.Numeric("Tol +",states={
             'readonly': (Eval('inherit_tol')),
             })
-    inherit_tol = fields.Boolean("Inherit tolerance")
+    inherit_tol = fields.Boolean("Inh.")
     tol_min_v = fields.Function(fields.Numeric("Qt min"),'get_tol_min')
     tol_max_v = fields.Function(fields.Numeric("Qt max"),'get_tol_max')
     tolerance_used = fields.Function(
@@ -2505,7 +2505,7 @@ class SaleLine(metaclass=PoolMeta):
     #     (None, ''),
     #     ('bci', 'BCI'),
     # ],"Certification",states={'readonly': (Eval('inherit_cer')),})
-    inherit_cer = fields.Boolean("Inherit certification")
+    inherit_cer = fields.Boolean("Inh.")
     enable_linked_currency = fields.Boolean("Linked currencies")
     linked_price = fields.Numeric("Price", digits='unit',states={
             'invisible': (~Eval('enable_linked_currency')),
@@ -2549,7 +2549,7 @@ class SaleLine(metaclass=PoolMeta):
     specification = fields.Function(
         fields.Char("Specification"), 'on_change_with_specification')
 
-    finished = fields.Boolean("Mark as finished")
+    finished = fields.Boolean("Finished")
     pricing_rule = fields.Text("Pricing description")
     price_composition = fields.One2Many('price.composition','sale_line',"Price composition")
     parent_trader = fields.Function(
diff --git a/modules/purchase_trade/view/purchase_line_form.xml b/modules/purchase_trade/view/purchase_line_form.xml
index 2f14868..fe3dd76 100755
--- a/modules/purchase_trade/view/purchase_line_form.xml
+++ b/modules/purchase_trade/view/purchase_line_form.xml
@@ -19,14 +19,12 @@ this repository contains the full copyright notices and license terms. -->
     <xpath expr="/form/notebook/page[@id='general']" position="replace">
         <page string="General" id="general" col="12"
             col_widths="1fr,1fr,1fr,1fr,1fr,1fr,1fr,1fr,1fr,1fr,1fr,1fr">
-            <group id="identity" colspan="12" col="12" panel="summary"
+            <group id="identity" colspan="12" col="10" panel="summary"
                 xalign="0" yalign="0"
-                col_widths="min-content,2fr,min-content,1.2fr,min-content,1.2fr,min-content,1fr,min-content,0.8fr,min-content,min-content">
+                col_widths="min-content,2fr,min-content,1.2fr,min-content,1fr,min-content,0.8fr,min-content,min-content">
                 <label name="product"/>
                 <field name="product"
                     view_ids="purchase.product_view_list_purchase_line"/>
-                <label name="product_supplier"/>
-                <field name="product_supplier"/>
                 <label name="del_period" string="Execution Period:"/>
                 <field name="del_period"/>
                 <label name="period_at"/>
@@ -104,30 +102,27 @@ this repository contains the full copyright notices and license terms. -->
                 <group id="pricing_amounts" string="Pricing &amp; Amounts"
                     colspan="1" col="6" panel="card" icon="tryton-public"
                     xalign="0" yalign="0"
-                    col_widths="min-content,1fr,min-content,1fr,min-content,min-content">
+                    col_widths="min-content,1fr,min-content,1fr,min-content,1fr">
                     <label name="price_type"/>
                     <field name="price_type"/>
                     <label name="unit_price"/>
                     <field name="unit_price" width="150" xexpand="0" xfill="0"/>
+                    <newline/>
                     <label name="enable_linked_currency"/>
                     <field name="enable_linked_currency" xexpand="0" xfill="0"/>
                     <newline/>
+                    <label name="linked_currency"/>
+                    <field name="linked_currency"/>
+                    <label name="linked_unit"/>
+                    <field name="linked_unit"/>
+                    <label name="linked_price"/>
+                    <field name="linked_price"/>
+                    <newline/>
                     <label name="premium"/>
                     <field name="premium" width="120" xexpand="0" xfill="0"/>
                     <label name="amount"/>
                     <field name="amount" width="160" xexpand="0" xfill="0"/>
                     <newline/>
-                    <label name="progress"/>
-                    <field name="progress" widget="progressbar" colspan="5"/>
-                    <newline/>
-                    <label name="linked_currency"/>
-                    <field name="linked_currency"/>
-                    <newline/>
-                    <label name="linked_unit"/>
-                    <field name="linked_unit"/>
-                    <label name="linked_price"/>
-                    <field name="linked_price"/>
-                    <newline/>
                     <label name="coffee_market_reference"/>
                     <field name="coffee_market_reference"/>
                     <label name="coffee_market_price"/>
diff --git a/modules/purchase_trade/view/sale_line_form.xml b/modules/purchase_trade/view/sale_line_form.xml
index de484bd..8ca6366 100755
--- a/modules/purchase_trade/view/sale_line_form.xml
+++ b/modules/purchase_trade/view/sale_line_form.xml
@@ -99,30 +99,27 @@ this repository contains the full copyright notices and license terms. -->
                 <group id="pricing_amounts" string="Pricing &amp; Amounts"
                     colspan="1" col="6" panel="card" icon="tryton-public"
                     xalign="0" yalign="0"
-                    col_widths="min-content,1fr,min-content,1fr,min-content,min-content">
+                    col_widths="min-content,1fr,min-content,1fr,min-content,1fr">
                     <label name="price_type"/>
                     <field name="price_type"/>
                     <label name="unit_price"/>
                     <field name="unit_price" width="150" xexpand="0" xfill="0"/>
+                    <newline/>
                     <label name="enable_linked_currency"/>
                     <field name="enable_linked_currency" xexpand="0" xfill="0"/>
                     <newline/>
+                    <label name="linked_currency"/>
+                    <field name="linked_currency"/>
+                    <label name="linked_unit"/>
+                    <field name="linked_unit"/>
+                    <label name="linked_price"/>
+                    <field name="linked_price"/>
+                    <newline/>
                     <label name="premium"/>
                     <field name="premium" width="120" xexpand="0" xfill="0"/>
                     <label name="amount"/>
                     <field name="amount" width="160" xexpand="0" xfill="0"/>
                     <newline/>
-                    <label name="progress"/>
-                    <field name="progress" widget="progressbar" colspan="5"/>
-                    <newline/>
-                    <label name="linked_currency"/>
-                    <field name="linked_currency"/>
-                    <newline/>
-                    <label name="linked_unit"/>
-                    <field name="linked_unit"/>
-                    <label name="linked_price"/>
-                    <field name="linked_price"/>
-                    <newline/>
                     <label name="coffee_market_reference"/>
                     <field name="coffee_market_reference"/>
                     <label name="coffee_market_price"/>