diff --git a/modules/purchase_trade/view/purchase_form.xml b/modules/purchase_trade/view/purchase_form.xml
index ce01bfd..356e1f5 100755
--- a/modules/purchase_trade/view/purchase_form.xml
+++ b/modules/purchase_trade/view/purchase_form.xml
@@ -32,8 +32,13 @@ this repository contains the full copyright notices and license terms. -->
                 height="168"/>
         </group>
 
-        <group id="purchase_header_terms_people" colspan="6" col="2"
-            xalign="0" yalign="0" col_widths="1fr,1fr">
+        <field name="tolerance_min" invisible="1"/>
+        <field name="tolerance_max" invisible="1"/>
+    </xpath>
+    <xpath expr="/form/notebook/page[@id='purchase']" position="replace">
+        <page string="Header" id="purchase">
+            <group id="purchase_header_terms_people" colspan="6" col="2"
+                xalign="0" yalign="0" col_widths="1fr,1fr">
             <group id="purchase_commercial_terms" string="Commercial Terms"
                 colspan="1" col="1" panel="card" icon="tryton-public"
                 xalign="0" yalign="0"
@@ -102,13 +107,30 @@ this repository contains the full copyright notices and license terms. -->
                 <field name="certif"/>
             </group>
 
-        </group>
-        <field name="tolerance_min" invisible="1"/>
-        <field name="tolerance_max" invisible="1"/>
-    </xpath>
-    <xpath expr="/form/notebook/page[@id='purchase']/field[@name='lines']" position="replace">
-        <field name="lines" colspan="4" mode="form,tree"
-            view_ids="purchase.purchase_line_view_form,purchase.purchase_line_view_tree_sequence"/>
+            </group>
+            <field name="lines" colspan="4" mode="form,tree"
+                view_ids="purchase.purchase_line_view_form,purchase.purchase_line_view_tree_sequence"/>
+            <notebook colspan="6">
+                <page string="State" id="state">
+                    <group col="2" colspan="2" id="states" yfill="1">
+                        <label name="invoice_state"/>
+                        <field name="invoice_state"/>
+                        <label name="shipment_state"/>
+                        <field name="shipment_state"/>
+                        <label name="state"/>
+                        <field name="state"/>
+                    </group>
+                    <group col="2" colspan="2" id="amount" yfill="1">
+                        <label name="untaxed_amount" xalign="1.0" xexpand="1"/>
+                        <field name="untaxed_amount" xalign="1.0" xexpand="0"/>
+                        <label name="tax_amount" xalign="1.0" xexpand="1"/>
+                        <field name="tax_amount" xalign="1.0" xexpand="0"/>
+                        <label name="total_amount" xalign="1.0" xexpand="1"/>
+                        <field name="total_amount" xalign="1.0" xexpand="0"/>
+                    </group>
+                </page>
+            </notebook>
+        </page>
     </xpath>
     <xpath expr="/form/notebook/page[@id='purchase']" position="after">
         <page string="Contract Clauses" col="4" id="contract_clauses">
diff --git a/modules/purchase_trade/view/purchase_line_form.xml b/modules/purchase_trade/view/purchase_line_form.xml
index cfe6536..a86b4aa 100755
--- a/modules/purchase_trade/view/purchase_line_form.xml
+++ b/modules/purchase_trade/view/purchase_line_form.xml
@@ -53,7 +53,7 @@ this repository contains the full copyright notices and license terms. -->
                     <label name="unit"/>
                     <field name="unit"/>
                 </group>
-                <group id="coffee_packing" string="Packing"
+                <group id="coffee_packing" string="Packing &amp; Tolerance"
                     colspan="1" col="4" panel="card" icon="tryton-archive"
                     xalign="0" yalign="0"
                     col_widths="min-content,1fr,min-content,1fr">
@@ -61,8 +61,9 @@ this repository contains the full copyright notices and license terms. -->
                     <field name="coffee_packing_count" width="120" xexpand="0" xfill="0"/>
                     <label name="coffee_packing_unit"/>
                     <field name="coffee_packing_unit"/>
-                    <label name="coffee_packing_description"/>
-                    <field name="coffee_packing_description"/>
+                    <label name="coffee_packing_description"
+                        states="{'invisible': True}"/>
+                    <field name="coffee_packing_description" invisible="1"/>
                     <newline/>
                     <label name="inherit_tol"/>
                     <field name="inherit_tol"/>
@@ -77,10 +78,10 @@ this repository contains the full copyright notices and license terms. -->
                     <label name="tol_max"/>
                     <field name="tol_max"/>
                     <newline/>
-                    <label name="tol_min_qt"/>
-                    <field name="tol_min_qt"/>
-                    <label name="tol_max_qt"/>
-                    <field name="tol_max_qt"/>
+                    <label name="tol_min_qt" states="{'invisible': True}"/>
+                    <field name="tol_min_qt" invisible="1"/>
+                    <label name="tol_max_qt" states="{'invisible': True}"/>
+                    <field name="tol_max_qt" invisible="1"/>
                     <newline/>
                     <label name="tolerance_used"/>
                     <field name="tolerance_used" widget="tolerance_gauge"