From bbc9a70255cbba36139563952ae9bd59be05d697 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Adri=C3=A1n=20Bernardi?= <abernardi@kalenislims.com>
Date: Fri, 21 Aug 2020 19:40:00 -0300
Subject: [PATCH] clean and reorder xml files (2)

---
 lims/department.xml                           |   1 -
 lims/results_report.xml                       |   1 -
 lims/user.xml                                 |   2 -
 lims/view/analysis_form.xml                   |   1 -
 lims/view/company_form.xml                    |   4 +-
 lims/view/model_form.xml                      |  18 +-
 lims/view/party_address_form.xml              |   4 +-
 lims/view/party_address_list.xml              |   4 +-
 lims/view/party_party_form.xml                |   4 +-
 lims/view/product_uom_category_form.xml       |   3 +-
 lims/view/product_uom_category_list.xml       |   3 +-
 lims/view/product_uom_form.xml                |   4 +-
 lims/view/product_uom_list.xml                |   4 +-
 lims/view/stock_location_form.xml             |   4 +-
 lims/view/stock_location_list.xml             |   4 +-
 lims/view/stock_move_form.xml                 |  18 +-
 lims/view/stock_move_list.xml                 |   4 +-
 lims/view/stock_shipment_in_form.xml          |   3 +-
 lims/view/user_form.xml                       |   4 +-
 lims_account_invoice/configuration.xml        |   2 -
 lims_account_invoice/invoice.xml              |  13 +-
 lims_account_invoice/lims.xml                 |   2 +-
 .../view/configuration_form.xml               |   5 +-
 .../view/fraction_type_form.xml               |   4 +-
 .../view/fraction_type_list.xml               |   4 +-
 lims_account_invoice/view/invoice_form.xml    |   7 +-
 .../view/invoice_line_form.xml                |   3 +-
 .../view/invoice_line_tree.xml                |   4 +-
 .../view/invoice_line_tree_sequence.xml       |   4 +-
 .../view/party_address_form.xml               |   4 +-
 .../view/party_address_list.xml               |   4 +-
 .../view/party_party_form.xml                 |   6 +-
 .../view/stock_inventory_line_form.xml        |   4 +-
 .../view/stock_inventory_line_list.xml        |   4 +-
 lims_administrative_task/task.xml             |  58 ++--
 .../view/department_form.xml                  |   4 +-
 .../view/department_list.xml                  |   3 +-
 lims_analysis_sheet/planification.xml         |  23 +-
 lims_analysis_sheet/sheet.xml                 |  21 +-
 .../view/interface_column_form.xml            |   3 +-
 lims_analytic/view/stock_location_form.xml    |   4 +-
 lims_analytic/view/stock_location_list.xml    |   4 +-
 lims_device_maintenance/maintenance.xml       |  75 ++---
 .../view/lab_device_form.xml                  |   4 +-
 lims_diagnosis/results_report.xml             |   3 +
 lims_diagnosis/view/analysis_form.xml         |   3 +-
 lims_diagnosis/view/party_party_form.xml      |   3 +-
 lims_diagnosis/view/plant_form.xml            |   3 +-
 lims_diagnosis/view/product_type_form.xml     |   3 +-
 lims_digital_sign/view/configuration_form.xml |   4 +-
 .../view/results_report_list.xml              |   4 +-
 lims_industry/industry.xml                    |   9 +
 lims_industry/results_report.xml              |   1 +
 lims_industry/sample.xml                      |   1 +
 lims_industry/view/address_list.xml           |   4 +-
 lims_industry/view/analysis_form.xml          |   3 +-
 lims_industry/view/party_form.xml             |  17 +-
 lims_industry/view/party_list.xml             |   3 +-
 lims_industry/view/product_type_form.xml      |   3 +-
 lims_industry/view/sample_form.xml            |   6 +-
 lims_industry/view/sample_list.xml            |   3 +-
 lims_interface/interface.xml                  |  58 ++--
 lims_interface/message.xml                    |   1 +
 lims_interface/sample.xml                     |   1 +
 lims_production/user.xml                      |  12 +-
 lims_production/view/configuration_form.xml   |   4 +-
 lims_production/view/product_product_form.xml |   3 +-
 .../view/product_product_form_simple.xml      |   3 +-
 lims_production/view/product_product_list.xml |   4 +-
 .../view/product_template_form.xml            |   4 +-
 .../view/product_template_list.xml            |   4 +-
 lims_production/view/production_bom_form.xml  |   4 +-
 lims_production/view/production_bom_list.xml  |   4 +-
 .../view/production_configuration_form.xml    |   4 +-
 .../view/production_production_form.xml       |   7 +-
 .../view/production_production_list.xml       |   4 +-
 lims_production/view/stock_lot_form.xml       |   5 +-
 lims_production/view/stock_lot_list.xml       |   5 +-
 lims_project/view/entry_list.xml              |   4 +-
 lims_project_study_plan/project.xml           | 189 ++++++------
 .../view/create_sample_start_form.xml         |   4 +-
 .../view/report_glp_10_print_start_form.xml   |   1 -
 lims_project_study_plan/view/sample_form.xml  |   4 +-
 .../view/stock_lot_form.xml                   |   4 +-
 .../view/workyear_form.xml                    |   3 +-
 lims_project_tas/invoice.xml                  |  13 +-
 lims_project_tas/project.xml                  |  12 +-
 lims_project_tas/view/invoice_form.xml        |   3 +-
 lims_project_tas/view/workyear_form.xml       |   3 +-
 lims_project_water/project.xml                |   1 +
 .../view/create_sample_start_form.xml         |   4 +-
 lims_project_water/view/sample_form.xml       |   4 +-
 lims_quality_control/configuration.xml        |  11 +-
 lims_quality_control/lims.xml                 |  36 ++-
 lims_quality_control/quality.xml              | 273 ++++++++++--------
 lims_quality_control/sample.xml               |  22 +-
 .../view/configuration_form.xml               |   4 +-
 lims_quality_control/view/template_form.xml   |   3 +-
 lims_report_html/results_report.xml           |   2 +-
 .../results_report_version_detail_form.xml    |  29 +-
 .../results_report_version_detail_list.xml    |   3 +-
 lims_sale/results_report.xml                  |   2 +
 lims_sale/sale.xml                            |  23 +-
 lims_sale/view/configuration_form.xml         |   3 +-
 lims_sale/view/create_sample_start_form.xml   |   3 +-
 lims_sale/view/party_form.xml                 |   3 +-
 lims_sale/view/sale_form.xml                  |  14 +-
 lims_sale/view/sale_line_form.xml             |   3 +-
 lims_sale/view/sale_line_list.xml             |   4 +-
 lims_sale/view/sale_line_list_sequence.xml    |   4 +-
 lims_sale_industry/product.xml                |   2 +-
 lims_sale_industry/sale.xml                   |  16 +-
 lims_sale_industry/view/analysis_form.xml     |   3 +-
 .../view/configuration_form.xml               |   3 +-
 .../view/create_sample_start_form.xml         |   6 +-
 lims_sale_industry/view/sale_form.xml         |   3 +-
 116 files changed, 618 insertions(+), 665 deletions(-)

diff --git a/lims/department.xml b/lims/department.xml
index df56fba..2003bce 100644
--- a/lims/department.xml
+++ b/lims/department.xml
@@ -2,7 +2,6 @@
 <tryton>
     <data>
 
-
 <!-- Department -->
 
         <record model="ir.ui.view" id="company_department_view_form">
diff --git a/lims/results_report.xml b/lims/results_report.xml
index eb9b08c..e31dc1b 100644
--- a/lims/results_report.xml
+++ b/lims/results_report.xml
@@ -2,7 +2,6 @@
 <tryton>
     <data>
 
-
 <!-- Sequences for Results Report -->
 
         <record model="ir.sequence.type" id="seq_type_results_report">
diff --git a/lims/user.xml b/lims/user.xml
index a058a62..13c2b82 100644
--- a/lims/user.xml
+++ b/lims/user.xml
@@ -1,6 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- This file is part of Tryton. The COPYRIGHT file at the top level of
-this repository contains the full copyright notices and license terms. -->
 <tryton>
     <data>
 
diff --git a/lims/view/analysis_form.xml b/lims/view/analysis_form.xml
index dd9e035..134295e 100644
--- a/lims/view/analysis_form.xml
+++ b/lims/view/analysis_form.xml
@@ -30,7 +30,6 @@
         <label name="disable_as_individual"/>
         <field name="disable_as_individual" xexpand="0"/>
     </group>
-
     <notebook>
         <page string="Laboratories" id="laboratories" >
             <field name="laboratories" colspan="4"/>
diff --git a/lims/view/company_form.xml b/lims/view/company_form.xml
index 6c17f52..e1f9bca 100644
--- a/lims/view/company_form.xml
+++ b/lims/view/company_form.xml
@@ -1,8 +1,6 @@
 <?xml version="1.0"?>
 <data>
-    <xpath
-        expr="/form/notebook/page[@id='reports']"
-        position="inside">
+    <xpath expr="/form/notebook/page[@id='reports']" position="inside">
         <group id="short_namne" colspan="1" col="4">
             <label name="short_name"/>
             <field name="short_name"/>
diff --git a/lims/view/model_form.xml b/lims/view/model_form.xml
index 574619e..42f6e3b 100644
--- a/lims/view/model_form.xml
+++ b/lims/view/model_form.xml
@@ -1,16 +1,12 @@
 <?xml version="1.0"?>
 <data>
-    <xpath
-        expr="/form/separator[@name='info']"
-        position="replace">
-            <newline/>
-            <separator name="info" colspan="3"/>
-            <separator name="docs" colspan="3"/>
+    <xpath expr="/form/separator[@name='info']" position="replace">
+        <newline/>
+        <separator name="info" colspan="3"/>
+        <separator name="docs" colspan="3"/>
     </xpath>
-    <xpath
-        expr="/form/field[@name='info']"
-        position="replace">
-            <field name="info" colspan="3"/>
-            <field name="docs" colspan="3"/>
+    <xpath expr="/form/field[@name='info']" position="replace">
+        <field name="info" colspan="3"/>
+        <field name="docs" colspan="3"/>
     </xpath>
 </data>
diff --git a/lims/view/party_address_form.xml b/lims/view/party_address_form.xml
index 20fc210..9b54e6f 100644
--- a/lims/view/party_address_form.xml
+++ b/lims/view/party_address_form.xml
@@ -1,8 +1,6 @@
 <?xml version="1.0"?>
 <data>
-    <xpath
-        expr="/form/field[@name='subdivision']"
-        position="after">
+    <xpath expr="/form/field[@name='subdivision']" position="after">
         <newline/>
         <label name="email"/>
         <field name="email"/>
diff --git a/lims/view/party_address_list.xml b/lims/view/party_address_list.xml
index cde7e17..419e162 100644
--- a/lims/view/party_address_list.xml
+++ b/lims/view/party_address_list.xml
@@ -1,8 +1,6 @@
 <?xml version="1.0"?>
 <data>
-    <xpath
-        expr="/tree/field[@name='subdivision']"
-        position="after">
+    <xpath expr="/tree/field[@name='subdivision']" position="after">
         <field name="email"/>
         <field name="report_contact"/>
         <field name="report_contact_default"/>
diff --git a/lims/view/party_party_form.xml b/lims/view/party_party_form.xml
index 0231ec5..1845ba9 100644
--- a/lims/view/party_party_form.xml
+++ b/lims/view/party_party_form.xml
@@ -1,8 +1,6 @@
 <?xml version="1.0"?>
 <data>
-    <xpath
-        expr="/form/notebook/page[@id='stock']"
-        position="after">
+    <xpath expr="/form/notebook/page[@id='stock']" position="after">
         <page string="Lims" id="lims">
             <group id="lims_checkboxes" colspan="4" col="8">
                 <label name="block_entry_confirmation"/>
diff --git a/lims/view/product_uom_category_form.xml b/lims/view/product_uom_category_form.xml
index 53c42e9..302e832 100644
--- a/lims/view/product_uom_category_form.xml
+++ b/lims/view/product_uom_category_form.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0"?>
 <data>
-    <xpath
-        expr="/form/field[@name='name']" position="after">
+    <xpath expr="/form/field[@name='name']" position="after">
         <label name="lims_only_available"/>
         <field name="lims_only_available"/>
     </xpath>
diff --git a/lims/view/product_uom_category_list.xml b/lims/view/product_uom_category_list.xml
index 6856994..61e8a82 100644
--- a/lims/view/product_uom_category_list.xml
+++ b/lims/view/product_uom_category_list.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0"?>
 <data>
-    <xpath
-        expr="/tree/field[@name='name']" position="after">
+    <xpath expr="/tree/field[@name='name']" position="after">
         <field name="lims_only_available"/>
     </xpath>
 </data>
diff --git a/lims/view/product_uom_form.xml b/lims/view/product_uom_form.xml
index b4b5c10..ee935e0 100644
--- a/lims/view/product_uom_form.xml
+++ b/lims/view/product_uom_form.xml
@@ -1,8 +1,6 @@
 <?xml version="1.0"?>
 <data>
-    <xpath
-        expr="/form/field[@name='digits']"
-        position="after">
+    <xpath expr="/form/field[@name='digits']" position="after">
         <label name="maximum_concentration"/>
         <field name="maximum_concentration"/>
         <label name="rsd_horwitz"/>
diff --git a/lims/view/product_uom_list.xml b/lims/view/product_uom_list.xml
index a8be7b1..85d1ce2 100644
--- a/lims/view/product_uom_list.xml
+++ b/lims/view/product_uom_list.xml
@@ -1,8 +1,6 @@
 <?xml version="1.0"?>
 <data>
-    <xpath
-        expr="/tree/field[@name='rounding']"
-        position="after">
+    <xpath expr="/tree/field[@name='rounding']" position="after">
         <field name="maximum_concentration"/>
         <field name="rsd_horwitz"/>
     </xpath>
diff --git a/lims/view/stock_location_form.xml b/lims/view/stock_location_form.xml
index 22edbbd..4460558 100644
--- a/lims/view/stock_location_form.xml
+++ b/lims/view/stock_location_form.xml
@@ -1,8 +1,6 @@
 <?xml version="1.0"?>
 <data>
-    <xpath
-        expr="/form/field[@name='type']"
-        position="after">
+    <xpath expr="/form/field[@name='type']" position="after">
         <group col="2" colspan="2" id="storage_time">
             <label name="storage_time"/>
             <field name="storage_time"/>
diff --git a/lims/view/stock_location_list.xml b/lims/view/stock_location_list.xml
index 57caf9d..53e164c 100644
--- a/lims/view/stock_location_list.xml
+++ b/lims/view/stock_location_list.xml
@@ -1,8 +1,6 @@
 <?xml version="1.0"?>
 <data>
-    <xpath
-        expr="/tree/field[@name='type']"
-        position="after">
+    <xpath expr="/tree/field[@name='type']" position="after">
         <field name="storage_time"/>
     </xpath>
 </data>
diff --git a/lims/view/stock_move_form.xml b/lims/view/stock_move_form.xml
index 6893208..c91770a 100644
--- a/lims/view/stock_move_form.xml
+++ b/lims/view/stock_move_form.xml
@@ -1,23 +1,13 @@
 <?xml version="1.0"?>
 <data>
-    <xpath
-        expr="/form/label[@name='origin']"
-        position="replace">
-    </xpath>
-    <xpath
-        expr="/form/field[@name='origin']"
-        position="replace">
-    </xpath>
-    <xpath
-        expr="/form/field[@name='shipment']"
-        position="replace">
+    <xpath expr="/form/label[@name='origin']" position="replace"/>
+    <xpath expr="/form/field[@name='origin']" position="replace"/>
+    <xpath expr="/form/field[@name='shipment']" position="replace">
         <field name="shipment"/>
         <label name="origin"/>
         <field name="origin"/>
     </xpath>
-    <xpath
-        expr="/form/field[@name='effective_date']"
-        position="after">
+    <xpath expr="/form/field[@name='effective_date']" xposition="after">
         <label name="fraction"/>
         <field name="fraction"/>
         <field name="fraction_readonly" invisible="1" colspan="4"/>
diff --git a/lims/view/stock_move_list.xml b/lims/view/stock_move_list.xml
index e3dc284..1ce8514 100644
--- a/lims/view/stock_move_list.xml
+++ b/lims/view/stock_move_list.xml
@@ -1,8 +1,6 @@
 <?xml version="1.0"?>
 <data>
-    <xpath
-        expr="/tree/field[@name='state']"
-        position="after">
+    <xpath expr="/tree/field[@name='state']" position="after">
         <field name="fraction"/>
     </xpath>
 </data>
diff --git a/lims/view/stock_shipment_in_form.xml b/lims/view/stock_shipment_in_form.xml
index 360dbd2..4ba0b22 100644
--- a/lims/view/stock_shipment_in_form.xml
+++ b/lims/view/stock_shipment_in_form.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0"?>
 <data>
-    <xpath
-        expr="/form/group[@id='buttons']/button[@name='draft']"
+    <xpath expr="/form/group[@id='buttons']/button[@name='draft']"
         position="replace">
     </xpath>
 </data>
diff --git a/lims/view/user_form.xml b/lims/view/user_form.xml
index 5cf3cf5..20714e1 100644
--- a/lims/view/user_form.xml
+++ b/lims/view/user_form.xml
@@ -1,8 +1,6 @@
 <?xml version="1.0"?>
 <data>
-    <xpath
-        expr="/form/notebook/page[@id='preferences']"
-        position="after">
+    <xpath expr="/form/notebook/page[@id='preferences']" position="after">
         <page string="LIMS" id="lims">
             <label name="notebook_view"/>
             <field name="notebook_view"/>
diff --git a/lims_account_invoice/configuration.xml b/lims_account_invoice/configuration.xml
index 7ce37cb..e7cdf1a 100644
--- a/lims_account_invoice/configuration.xml
+++ b/lims_account_invoice/configuration.xml
@@ -1,6 +1,4 @@
 <?xml version="1.0"?>
-<!-- This file is part of Tryton. The COPYRIGHT file at the top level of
-this repository contains the full copyright notices and license terms. -->
 <tryton>
     <data>
 
diff --git a/lims_account_invoice/invoice.xml b/lims_account_invoice/invoice.xml
index e57ef16..7f3520a 100644
--- a/lims_account_invoice/invoice.xml
+++ b/lims_account_invoice/invoice.xml
@@ -2,14 +2,16 @@
 <tryton>
     <data>
 
-      <!-- Invoice -->
+<!-- Invoice -->
+
       <record model="ir.ui.view" id="lims_invoice_view_form">
           <field name="model">account.invoice</field>
           <field name="inherit" ref="account_invoice.invoice_view_form"/>
           <field name="name">invoice_form</field>
       </record>
 
-      <!-- Invoice Contacts -->
+<!-- Invoice Contacts -->
+
       <record model="ir.ui.view" id="invoice_contacts_view_form">
           <field name="model">account.invoice.invoice_contacts</field>
           <field name="type">form</field>
@@ -21,19 +23,18 @@
           <field name="name">invoice_contacts_list</field>
       </record>
 
-      <!-- Invoice Line -->
+<!-- Invoice Line -->
+
       <record model="ir.ui.view" id="lims_invoice_line_view_form">
           <field name="model">account.invoice.line</field>
           <field name="inherit" ref="account_invoice.invoice_line_view_form"/>
           <field name="name">invoice_line_form</field>
       </record>
-
       <record model="ir.ui.view" id="lims_invoice_line_view_tree">
           <field name="model">account.invoice.line</field>
           <field name="inherit" ref="account_invoice.invoice_line_view_tree"/>
           <field name="name">invoice_line_tree</field>
       </record>
-
       <record model="ir.ui.view" id="lims_invoice_line_view_tree_sequence">
           <field name="model">account.invoice.line</field>
           <field name="inherit" ref="account_invoice.invoice_line_view_tree_sequence"/>
@@ -53,6 +54,7 @@
           <field name="wiz_name">account.invoice.populate_invoice_contacts</field>
           <field name="model">account.invoice</field>
       </record>
+
       <record model="ir.action.keyword" id="lims_populate_invoice_contacts_keyword">
           <field name="keyword">form_action</field>
           <field name="model">account.invoice,-1</field>
@@ -71,6 +73,7 @@
             <field name="name">Send Invoice</field>
             <field name="wiz_name">account.invoice.send_invoice</field>
         </record>
+
         <record model="ir.action.keyword" id="account_invoice_send_invoice_keyword">
             <field name="keyword">form_action</field>
             <field name="model">account.invoice,-1</field>
diff --git a/lims_account_invoice/lims.xml b/lims_account_invoice/lims.xml
index f250f4d..000e5c7 100644
--- a/lims_account_invoice/lims.xml
+++ b/lims_account_invoice/lims.xml
@@ -2,7 +2,7 @@
 <tryton>
     <data>
 
-      <!-- Fraction Type -->
+<!-- Fraction Type -->
 
       <record model="ir.ui.view" id="lims_fraction_type_view_form">
           <field name="model">lims.fraction.type</field>
diff --git a/lims_account_invoice/view/configuration_form.xml b/lims_account_invoice/view/configuration_form.xml
index b2e81a1..cdb6787 100644
--- a/lims_account_invoice/view/configuration_form.xml
+++ b/lims_account_invoice/view/configuration_form.xml
@@ -1,8 +1,6 @@
 <?xml version="1.0"?>
 <data>
-    <xpath
-        expr="/form/notebook/page[@id='general']"
-        position="after">
+    <xpath expr="/form/notebook/page[@id='general']" position="after">
         <page string="Mail Invoice Report" id="mail_send_invoice_report">
             <separator string="Email subject of Invoice report"
                 colspan="4" id="mail_send_invoice_subject"/>
@@ -12,5 +10,4 @@
             <field name="mail_send_invoice_body" colspan="4"/>
         </page>
     </xpath>
-
 </data>
diff --git a/lims_account_invoice/view/fraction_type_form.xml b/lims_account_invoice/view/fraction_type_form.xml
index 212e740..2aa868c 100644
--- a/lims_account_invoice/view/fraction_type_form.xml
+++ b/lims_account_invoice/view/fraction_type_form.xml
@@ -1,8 +1,6 @@
 <?xml version="1.0"?>
 <data>
-    <xpath
-        expr="/form/field[@name='control_charts']"
-        position="after">
+    <xpath expr="/form/field[@name='control_charts']" position="after">
         <label name="invoiceable"/>
         <field name="invoiceable"/>
     </xpath>
diff --git a/lims_account_invoice/view/fraction_type_list.xml b/lims_account_invoice/view/fraction_type_list.xml
index 831b0d5..8398065 100644
--- a/lims_account_invoice/view/fraction_type_list.xml
+++ b/lims_account_invoice/view/fraction_type_list.xml
@@ -1,8 +1,6 @@
 <?xml version="1.0"?>
 <data>
-    <xpath
-        expr="/tree/field[@name='control_charts']" 
-        position="after">
+    <xpath expr="/tree/field[@name='control_charts']"  position="after">
         <field name="invoiceable"/>
     </xpath>
 </data>
diff --git a/lims_account_invoice/view/invoice_form.xml b/lims_account_invoice/view/invoice_form.xml
index 8bc43cb..36e55a9 100644
--- a/lims_account_invoice/view/invoice_form.xml
+++ b/lims_account_invoice/view/invoice_form.xml
@@ -1,8 +1,6 @@
 <?xml version="1.0"?>
 <data>
-    <xpath
-        expr="/form/notebook/page[@id='info']"
-        position="after">
+    <xpath expr="/form/notebook/page[@id='info']" position="after">
         <page string="Contacts" id="contacts">
             <field name="invoice_contacts" colspan="4"/>
             <label name="no_send_invoice"/>
@@ -11,8 +9,7 @@
             <field name="sent_date"/>
         </page>
     </xpath>
-    <xpath
-        expr="/form/notebook/page[@id='info']/field[@name='comment']"
+    <xpath expr="/form/notebook/page[@id='info']/field[@name='comment']"
         position="after">
         <separator name="entries_comments" colspan="4"/>
         <field name="entries_comments" colspan="4"/>
diff --git a/lims_account_invoice/view/invoice_line_form.xml b/lims_account_invoice/view/invoice_line_form.xml
index f35fd9a..e08f45a 100644
--- a/lims_account_invoice/view/invoice_line_form.xml
+++ b/lims_account_invoice/view/invoice_line_form.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0"?>
 <data>
-    <xpath expr="/form/notebook/page[@id='general']/field[@name='taxes']" position="before">
+    <xpath expr="/form/notebook/page[@id='general']/field[@name='taxes']"
+        position="before">
         <group colspan="4" id="origin_group">
             <label name="origin"/>
             <field name="origin"/>
diff --git a/lims_account_invoice/view/invoice_line_tree.xml b/lims_account_invoice/view/invoice_line_tree.xml
index 3efa137..56b33dd 100644
--- a/lims_account_invoice/view/invoice_line_tree.xml
+++ b/lims_account_invoice/view/invoice_line_tree.xml
@@ -1,8 +1,6 @@
 <?xml version="1.0"?>
 <data>
-    <xpath
-        expr="/tree/field[@name='amount']"
-        position="after">
+    <xpath expr="/tree/field[@name='amount']" position="after">
         <field name="lims_service_entry"/>
         <field name="lims_service_sample"/>
         <field name="lims_service_party"/>
diff --git a/lims_account_invoice/view/invoice_line_tree_sequence.xml b/lims_account_invoice/view/invoice_line_tree_sequence.xml
index 3efa137..56b33dd 100644
--- a/lims_account_invoice/view/invoice_line_tree_sequence.xml
+++ b/lims_account_invoice/view/invoice_line_tree_sequence.xml
@@ -1,8 +1,6 @@
 <?xml version="1.0"?>
 <data>
-    <xpath
-        expr="/tree/field[@name='amount']"
-        position="after">
+    <xpath expr="/tree/field[@name='amount']" position="after">
         <field name="lims_service_entry"/>
         <field name="lims_service_sample"/>
         <field name="lims_service_party"/>
diff --git a/lims_account_invoice/view/party_address_form.xml b/lims_account_invoice/view/party_address_form.xml
index 332eaa0..ad2a34c 100644
--- a/lims_account_invoice/view/party_address_form.xml
+++ b/lims_account_invoice/view/party_address_form.xml
@@ -1,8 +1,6 @@
 <?xml version="1.0"?>
 <data>
-    <xpath
-        expr="/form/field[@name='subdivision']"
-        position="after">
+    <xpath expr="/form/field[@name='subdivision']" position="after">
         <newline/>
         <label name="commercial_item"/>
         <field name="commercial_item"/>
diff --git a/lims_account_invoice/view/party_address_list.xml b/lims_account_invoice/view/party_address_list.xml
index 70c2088..f36d223 100644
--- a/lims_account_invoice/view/party_address_list.xml
+++ b/lims_account_invoice/view/party_address_list.xml
@@ -1,8 +1,6 @@
 <?xml version="1.0"?>
 <data>
-    <xpath
-        expr="/tree/field[@name='subdivision']"
-        position="after">
+    <xpath expr="/tree/field[@name='subdivision']" position="after">
         <field name="commercial_item"/>
         <field name="commercial_zone"/>
     </xpath>
diff --git a/lims_account_invoice/view/party_party_form.xml b/lims_account_invoice/view/party_party_form.xml
index 2cefe28..d7039f1 100644
--- a/lims_account_invoice/view/party_party_form.xml
+++ b/lims_account_invoice/view/party_party_form.xml
@@ -1,13 +1,11 @@
 <?xml version="1.0"?>
 <data>
-    <xpath
-        expr="/form/notebook/page[@id='lims']/group[@id='lims_checkboxes']"
+    <xpath expr="/form/notebook/page[@id='lims']/group[@id='lims_checkboxes']"
         position="inside">
         <label name="no_send_invoice"/>
         <field name="no_send_invoice"/>
     </xpath>
-    <xpath
-        expr="/form/notebook/page[@id='lims']/group[@id='lims_checkboxes']"
+    <xpath expr="/form/notebook/page[@id='lims']/group[@id='lims_checkboxes']"
         position="after">
         <label name="commercial_item"/>
         <field name="commercial_item"/>
diff --git a/lims_account_invoice/view/stock_inventory_line_form.xml b/lims_account_invoice/view/stock_inventory_line_form.xml
index 3dcd1c3..115a97e 100644
--- a/lims_account_invoice/view/stock_inventory_line_form.xml
+++ b/lims_account_invoice/view/stock_inventory_line_form.xml
@@ -1,8 +1,6 @@
 <?xml version="1.0"?>
 <data>
-    <xpath
-        expr="/form/field[@name='uom']"
-        position="after">
+    <xpath expr="/form/field[@name='uom']" position="after">
         <label name="account_move"/>
         <field name="account_move"/>
     </xpath>
diff --git a/lims_account_invoice/view/stock_inventory_line_list.xml b/lims_account_invoice/view/stock_inventory_line_list.xml
index 04ca0bd..f24ce47 100644
--- a/lims_account_invoice/view/stock_inventory_line_list.xml
+++ b/lims_account_invoice/view/stock_inventory_line_list.xml
@@ -1,8 +1,6 @@
 <?xml version="1.0"?>
 <data>
-    <xpath
-        expr="/tree/field[@name='uom']"
-        position="after">
+    <xpath expr="/tree/field[@name='uom']" position="after">
         <field name="account_move"/>
     </xpath>
 </data>
diff --git a/lims_administrative_task/task.xml b/lims_administrative_task/task.xml
index 5dff46c..5bf8bad 100644
--- a/lims_administrative_task/task.xml
+++ b/lims_administrative_task/task.xml
@@ -2,7 +2,12 @@
 <tryton>
     <data>
 
+<!-- Menu -->
+
+        <!-- Administrative Tasks -->
         <menuitem name="Administrative Tasks" id="menu_administrative_task"/>
+
+        <!-- Administrative Tasks / Configuration -->
         <menuitem name="Configuration" id="menu_config"
             parent="menu_administrative_task" sequence="10"
             icon="lims-configuration"/>
@@ -144,6 +149,31 @@
         <menuitem action="act_task" id="menu_task"
             parent="menu_administrative_task" sequence="30"/>
 
+        <record model="ir.model.button" id="administrative_task_pending_button">
+            <field name="name">pending</field>
+            <field name="model" search="[('model', '=', 'lims.administrative.task')]"/>
+        </record>
+        <record model="ir.model.button" id="administrative_task_reject_button">
+            <field name="name">reject</field>
+            <field name="model" search="[('model', '=', 'lims.administrative.task')]"/>
+        </record>
+        <record model="ir.model.button" id="administrative_task_ongoing_button">
+            <field name="name">ongoing</field>
+            <field name="model" search="[('model', '=', 'lims.administrative.task')]"/>
+        </record>
+        <record model="ir.model.button" id="administrative_task_standby_button">
+            <field name="name">standby</field>
+            <field name="model" search="[('model', '=', 'lims.administrative.task')]"/>
+        </record>
+        <record model="ir.model.button" id="administrative_task_discard_button">
+            <field name="name">discard</field>
+            <field name="model" search="[('model', '=', 'lims.administrative.task')]"/>
+        </record>
+        <record model="ir.model.button" id="administrative_task_do_button">
+            <field name="name">do</field>
+            <field name="model" search="[('model', '=', 'lims.administrative.task')]"/>
+        </record>
+
 <!-- My Administrative Task -->
 
         <record model="ir.action.act_window" id="act_task_mine">
@@ -250,38 +280,12 @@
             <field name="name">Edit Administrative Task</field>
             <field name="wiz_name">lims.administrative.task.edit</field>
         </record>
+
         <record model="ir.action.keyword" id="wiz_edit_task_keyword">
             <field name="keyword">form_action</field>
             <field name="model">lims.administrative.task,-1</field>
             <field name="action" ref="wiz_edit_task"/>
         </record>
 
-<!-- Administrative Task Buttons -->
-
-        <record model="ir.model.button" id="administrative_task_pending_button">
-            <field name="name">pending</field>
-            <field name="model" search="[('model', '=', 'lims.administrative.task')]"/>
-        </record>
-        <record model="ir.model.button" id="administrative_task_reject_button">
-            <field name="name">reject</field>
-            <field name="model" search="[('model', '=', 'lims.administrative.task')]"/>
-        </record>
-        <record model="ir.model.button" id="administrative_task_ongoing_button">
-            <field name="name">ongoing</field>
-            <field name="model" search="[('model', '=', 'lims.administrative.task')]"/>
-        </record>
-        <record model="ir.model.button" id="administrative_task_standby_button">
-            <field name="name">standby</field>
-            <field name="model" search="[('model', '=', 'lims.administrative.task')]"/>
-        </record>
-        <record model="ir.model.button" id="administrative_task_discard_button">
-            <field name="name">discard</field>
-            <field name="model" search="[('model', '=', 'lims.administrative.task')]"/>
-        </record>
-        <record model="ir.model.button" id="administrative_task_do_button">
-            <field name="name">do</field>
-            <field name="model" search="[('model', '=', 'lims.administrative.task')]"/>
-        </record>
-
     </data>
 </tryton>
diff --git a/lims_administrative_task/view/department_form.xml b/lims_administrative_task/view/department_form.xml
index 1c6fde2..e4b77f3 100644
--- a/lims_administrative_task/view/department_form.xml
+++ b/lims_administrative_task/view/department_form.xml
@@ -1,8 +1,6 @@
 <?xml version="1.0"?>
 <data>
-    <xpath
-        expr="/form/field[@name='default_location']"
-        position="after">
+    <xpath expr="/form/field[@name='default_location']" position="after">
     <label name="responsible"/>
     <field name="responsible"/>
     </xpath>
diff --git a/lims_administrative_task/view/department_list.xml b/lims_administrative_task/view/department_list.xml
index acf8229..b67aa18 100644
--- a/lims_administrative_task/view/department_list.xml
+++ b/lims_administrative_task/view/department_list.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0"?>
 <data>
-    <xpath expr="/tree/field[@name='default_location']"
-        position="after">
+    <xpath expr="/tree/field[@name='default_location']" position="after">
         <field name="responsible"/>
     </xpath>
 </data>
diff --git a/lims_analysis_sheet/planification.xml b/lims_analysis_sheet/planification.xml
index 452833f..63799b6 100644
--- a/lims_analysis_sheet/planification.xml
+++ b/lims_analysis_sheet/planification.xml
@@ -88,9 +88,13 @@
             <field name="view" ref="planification_professional_view_graph"/>
             <field name="act_window" ref="act_planification_professional_form"/>
         </record>
-        <menuitem parent="lims.lims_planification_menu" action="act_planification_professional_form"
-            id="menu_planification_professional" name="Planifications by Professional"
-            sequence="30"/>
+
+        <menuitem name="Planifications by Professional"
+            action="act_planification_professional_form"
+            id="menu_planification_professional"
+            parent="lims.lims_planification_menu" sequence="30"/>
+
+<!-- Planifications by Professional - Sheets -->
 
         <record model="ir.ui.view" id="planification_professional_line_view_list">
             <field name="model">lims.planification.professional.line</field>
@@ -122,16 +126,20 @@
             <field name="view" ref="planification_professional_line_view_calendar"/>
             <field name="act_window" ref="act_planification_professional_line_form"/>
         </record> -->
+
         <record model="ir.action.keyword" id="act_planification_professional_line_form_keyword">
             <field name="keyword">tree_open</field>
             <field name="model">lims.planification.professional,-1</field>
             <field name="action" ref="act_planification_professional_line_form"/>
         </record>
 
+<!-- Open Sheet Sample -->
+
         <record model="ir.action.wizard" id="act_open_sheet_sample">
             <field name="name">Open Sheet Sample</field>
             <field name="wiz_name">lims.planification.professional.open_sheet_sample</field>
         </record>
+
         <record model="ir.action.keyword" id="act_open_sheet_sample_keyword">
             <field name="keyword">tree_open</field>
             <field name="model">lims.planification.professional.line,-1</field>
@@ -174,14 +182,17 @@
             <field name="view" ref="planification_pending_view_graph"/>
             <field name="act_window" ref="act_planification_pending_form"/>
         </record>
-        <menuitem parent="lims.lims_planification_menu" action="act_planification_pending_form"
-            id="menu_planification_pending" name="Samples Pending Planning"
-            sequence="40"/>
+
+        <menuitem name="Samples Pending Planning"
+            action="act_planification_pending_form"
+            id="menu_planification_pending"
+            parent="lims.lims_planification_menu" sequence="40"/>
 
         <record model="ir.action.wizard" id="act_open_pending_sample">
             <field name="name">Open Pending Sample</field>
             <field name="wiz_name">lims.planification.pending.open_pending_sample</field>
         </record>
+
         <record model="ir.action.keyword" id="act_open_pending_sample_keyword">
             <field name="keyword">tree_open</field>
             <field name="model">lims.planification.pending,-1</field>
diff --git a/lims_analysis_sheet/sheet.xml b/lims_analysis_sheet/sheet.xml
index fa2eef4..f95b177 100644
--- a/lims_analysis_sheet/sheet.xml
+++ b/lims_analysis_sheet/sheet.xml
@@ -172,10 +172,12 @@
             <field name="type">form</field>
             <field name="name">analysis_sheet_export_form</field>
         </record>
+
         <record model="ir.action.wizard" id="wiz_analysis_sheet_export_file">
             <field name="name">Export Analysis Sheet File</field>
             <field name="wiz_name">lims.analysis_sheet.export_file</field>
         </record>
+
         <record model="ir.action.keyword"
             id="wiz_analysis_sheet_export_file_keyword">
             <field name="keyword">form_action</field>
@@ -191,15 +193,24 @@
 
 <!-- Analysis Sheet Report -->
 
+        <record model="ir.action.report" id="report_analysis_sheet">
+            <field name="name">Analysis Sheet Report</field>
+            <field name="model">lims.analysis_sheet</field>
+            <field name="report_name">lims.analysis_sheet.report</field>
+            <field name="report">lims_analysis_sheet/report/analysis_sheet.fods</field>
+        </record>
+
         <record model="ir.ui.view" id="analysis_sheet_print_report_ask_view_form">
             <field name="model">lims.analysis_sheet.print_report.ask</field>
             <field name="type">form</field>
             <field name="name">analysis_sheet_print_report_ask_form</field>
         </record>
+
         <record model="ir.action.wizard" id="wiz_analysis_sheet_print_report">
             <field name="name">Analysis Sheet Report</field>
             <field name="wiz_name">lims.analysis_sheet.print_report</field>
         </record>
+
         <record model="ir.action.keyword"
             id="wiz_analysis_sheet_print_report_keyword">
             <field name="keyword">form_print</field>
@@ -213,13 +224,6 @@
             <field name="action" ref="wiz_analysis_sheet_print_report"/>
         </record>
 
-        <record model="ir.action.report" id="report_analysis_sheet">
-            <field name="name">Analysis Sheet Report</field>
-            <field name="model">lims.analysis_sheet</field>
-            <field name="report_name">lims.analysis_sheet.report</field>
-            <field name="report">lims_analysis_sheet/report/analysis_sheet.fods</field>
-        </record>
-
 <!-- Wizard Import Analysis Sheet File -->
 
         <record model="ir.ui.view" id="analysis_sheet_import_start_view_form">
@@ -227,10 +231,12 @@
             <field name="type">form</field>
             <field name="name">analysis_sheet_import_form</field>
         </record>
+
         <record model="ir.action.wizard" id="wiz_analysis_sheet_import_file">
             <field name="name">Import Analysis Sheet File</field>
             <field name="wiz_name">lims.analysis_sheet.import_file</field>
         </record>
+
         <record model="ir.action.keyword"
             id="wiz_analysis_sheet_import_file_keyword">
             <field name="keyword">form_action</field>
@@ -250,6 +256,7 @@
             <field name="name">Analysis Sheet Samples</field>
             <field name="wiz_name">lims.analysis_sheet.open_sample</field>
         </record>
+
         <record model="ir.action.keyword"
             id="wiz_analysis_sheet_open_sample_keyword">
             <field name="keyword">form_relate</field>
diff --git a/lims_analysis_sheet/view/interface_column_form.xml b/lims_analysis_sheet/view/interface_column_form.xml
index 3e9233a..d4f1f4b 100644
--- a/lims_analysis_sheet/view/interface_column_form.xml
+++ b/lims_analysis_sheet/view/interface_column_form.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0"?>
 <data>
-    <xpath expr="/form/field[@name='source_end']"
-        position="after">
+    <xpath expr="/form/field[@name='source_end']" position="after">
         <separator id="export" colspan="4" string="Export:"/>
         <group id="export_spreadsheet" colspan="4" col="4">
             <label name="destination_column"/>
diff --git a/lims_analytic/view/stock_location_form.xml b/lims_analytic/view/stock_location_form.xml
index 86fdd04..dae0d68 100644
--- a/lims_analytic/view/stock_location_form.xml
+++ b/lims_analytic/view/stock_location_form.xml
@@ -1,8 +1,6 @@
 <?xml version="1.0"?>
 <data>
-    <xpath
-        expr="/form/field[@name='type']"
-        position="after">
+    <xpath expr="/form/field[@name='type']" position="after">
         <label name="cost_center"/>
         <field name="cost_center"/>
     </xpath>
diff --git a/lims_analytic/view/stock_location_list.xml b/lims_analytic/view/stock_location_list.xml
index 761cdfa..8523dd5 100644
--- a/lims_analytic/view/stock_location_list.xml
+++ b/lims_analytic/view/stock_location_list.xml
@@ -1,8 +1,6 @@
 <?xml version="1.0"?>
 <data>
-    <xpath
-        expr="/tree/field[@name='type']"
-        position="after">
+    <xpath expr="/tree/field[@name='type']" position="after">
         <field name="cost_center"/>
     </xpath>
 </data>
diff --git a/lims_device_maintenance/maintenance.xml b/lims_device_maintenance/maintenance.xml
index 947ca40..960ea86 100644
--- a/lims_device_maintenance/maintenance.xml
+++ b/lims_device_maintenance/maintenance.xml
@@ -2,6 +2,20 @@
 <tryton>
     <data>
 
+<!-- Menu -->
+
+        <!-- Devices Maintenance -->
+        <menuitem name="Devices Maintenance" id="menu_device_maintenance"/>
+
+        <!-- Devices Maintenance / Configuration -->
+        <menuitem name="Configuration" id="menu_device_maintenance_config"
+            parent="menu_device_maintenance" sequence="10"
+            icon="lims-configuration"/>
+
+        <menuitem action="lims.act_lims_lab_device_list"
+            id="menu_device_maintenance_device"
+            parent="menu_device_maintenance" sequence="20"/>
+
 <!-- Laboratory Device -->
 
         <record model="ir.ui.view" id="lab_device_view_form">
@@ -19,6 +33,7 @@
             <field name="domain" eval="[('device', 'in', Eval('active_ids'))]"
                 pyson="1"/>
         </record>
+
         <record model="ir.action.keyword"
             id="act_lab_device_maintenance_calendar_related_keyword">
             <field name="keyword">form_relate</field>
@@ -57,6 +72,11 @@
             <field name="act_window" ref="act_lab_device_maintenance_type_list"/>
         </record>
 
+        <menuitem name="Maintenance Types"
+            action="act_lab_device_maintenance_type_list"
+            id="menu_device_maintenance_type"
+            parent="menu_device_maintenance_config" sequence="10"/>
+
 <!-- Device Maintenance Activity -->
 
         <record model="ir.ui.view" id="lab_device_maintenance_activity_view_form">
@@ -88,6 +108,11 @@
             <field name="act_window" ref="act_lab_device_maintenance_activity_list"/>
         </record>
 
+        <menuitem name="Activities"
+            action="act_lab_device_maintenance_activity_list"
+            id="menu_device_maintenance_activity"
+            parent="menu_device_maintenance_config" sequence="20"/>
+
 <!-- Device Maintenance Program -->
 
         <record model="ir.ui.view" id="lab_device_maintenance_program_view_form">
@@ -119,6 +144,11 @@
             <field name="act_window" ref="act_lab_device_maintenance_program_list"/>
         </record>
 
+        <menuitem name="Maintenance Programs"
+            action="act_lab_device_maintenance_program_list"
+            id="menu_device_maintenance_program"
+            parent="menu_device_maintenance" sequence="30"/>
+
 <!-- Wizard Generate Device Maintenance Calendar -->
 
         <record model="ir.ui.view"
@@ -127,10 +157,12 @@
             <field name="type">form</field>
             <field name="name">lab_device_generate_maintenance_calendar_start_form</field>
         </record>
+
         <record model="ir.action.wizard" id="wizard_device_generate_maintenance_calendar">
             <field name="name">Generate Maintenance Calendar</field>
             <field name="wiz_name">lims.lab.device.maintenance.generate</field>
         </record>
+
         <record model="ir.action.keyword" id="wizard_device_generate_maintenance_calendar_keyword">
             <field name="keyword">form_action</field>
             <field name="model">lims.lab.device,-1</field>
@@ -179,15 +211,10 @@
             <field name="act_window" ref="act_lab_device_maintenance_calendar_list"/>
         </record>
 
-<!-- Cron -->
-
-        <record model="ir.cron" id="cron_device_maintenance_send_notice">
-            <field name="interval_number" eval="1"/>
-            <field name="interval_type">days</field>
-            <field name="method">lims.lab.device.maintenance|send_notice</field>
-        </record>
-
-<!-- Device Maintenance Buttons -->
+        <menuitem name="Calendar"
+            action="act_lab_device_maintenance_calendar_list"
+            id="menu_device_maintenance_calendar"
+            parent="menu_device_maintenance" sequence="40"/>
 
         <record model="ir.model.button" id="device_maintenance_pending_button">
             <field name="name">pending</field>
@@ -202,31 +229,13 @@
             <field name="model" search="[('model', '=', 'lims.lab.device.maintenance')]"/>
         </record>
 
-<!-- Device Maintenance Menu -->
+<!-- Cron -->
 
-        <menuitem name="Devices Maintenance" id="menu_device_maintenance"/>
-        <menuitem name="Configuration" id="menu_device_maintenance_config"
-            parent="menu_device_maintenance" sequence="10"
-            icon="lims-configuration"/>
-        <menuitem name="Maintenance Types"
-            action="act_lab_device_maintenance_type_list"
-            id="menu_device_maintenance_type"
-            parent="menu_device_maintenance_config" sequence="10"/>
-        <menuitem name="Activities"
-            action="act_lab_device_maintenance_activity_list"
-            id="menu_device_maintenance_activity"
-            parent="menu_device_maintenance_config" sequence="20"/>
-        <menuitem action="lims.act_lims_lab_device_list"
-            id="menu_device_maintenance_device"
-            parent="menu_device_maintenance" sequence="20"/>
-        <menuitem name="Maintenance Programs"
-            action="act_lab_device_maintenance_program_list"
-            id="menu_device_maintenance_program"
-            parent="menu_device_maintenance" sequence="30"/>
-        <menuitem name="Calendar"
-            action="act_lab_device_maintenance_calendar_list"
-            id="menu_device_maintenance_calendar"
-            parent="menu_device_maintenance" sequence="40"/>
+        <record model="ir.cron" id="cron_device_maintenance_send_notice">
+            <field name="interval_number" eval="1"/>
+            <field name="interval_type">days</field>
+            <field name="method">lims.lab.device.maintenance|send_notice</field>
+        </record>
 
     </data>
 </tryton>
diff --git a/lims_device_maintenance/view/lab_device_form.xml b/lims_device_maintenance/view/lab_device_form.xml
index f23d772..f376ac3 100644
--- a/lims_device_maintenance/view/lab_device_form.xml
+++ b/lims_device_maintenance/view/lab_device_form.xml
@@ -1,8 +1,6 @@
 <?xml version="1.0"?>
 <data>
-    <xpath
-        expr="/form/notebook/page[@id='corrections']"
-        position="after">
+    <xpath expr="/form/notebook/page[@id='corrections']" position="after">
         <page string="Maintenance Program" id="maintenance_program">
             <field name="maintenance_program" colspan="4"/>
         </page>
diff --git a/lims_diagnosis/results_report.xml b/lims_diagnosis/results_report.xml
index 5085d42..d2a4d26 100644
--- a/lims_diagnosis/results_report.xml
+++ b/lims_diagnosis/results_report.xml
@@ -68,6 +68,7 @@
             <field name="name">Change Sample Diagnostician</field>
             <field name="wiz_name">lims.notebook.change_diagnostician</field>
         </record>
+
         <record model="ir.action.keyword" id="wiz_notebook_change_diagnostician_keyword">
             <field name="keyword">form_action</field>
             <field name="model">lims.notebook,-2</field>
@@ -86,11 +87,13 @@
             <field name="name">Samples Comparator</field>
             <field name="wiz_name">lims.samples_comparator.open</field>
         </record>
+
         <record model="ir.action.keyword" id="wiz_open_samples_comparator_keyword">
             <field name="keyword">form_action</field>
             <field name="model">lims.results_report.version.detail.sample,-1</field>
             <field name="action" ref="wiz_open_samples_comparator"/>
         </record>
+
         <menuitem action="wiz_open_samples_comparator"
             id="lims_open_samples_comparator_menu"
             parent="lims.lims_results_report_version_detail_menu" sequence="10"/>
diff --git a/lims_diagnosis/view/analysis_form.xml b/lims_diagnosis/view/analysis_form.xml
index 70d35d2..19aec33 100644
--- a/lims_diagnosis/view/analysis_form.xml
+++ b/lims_diagnosis/view/analysis_form.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0"?>
 <data>
-    <xpath expr="/form/notebook/page[@id='times']"
-        position="after">
+    <xpath expr="/form/notebook/page[@id='times']" position="after">
         <page id="diagnosis" string="Diagnosis">
             <label name="diagnostician"/>
             <field name="diagnostician"/>
diff --git a/lims_diagnosis/view/party_party_form.xml b/lims_diagnosis/view/party_party_form.xml
index 124461c..58616b5 100644
--- a/lims_diagnosis/view/party_party_form.xml
+++ b/lims_diagnosis/view/party_party_form.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0"?>
 <data>
-    <xpath
-        expr="/form/notebook/page[@id='lims']/field[@name='entry_zone']"
+    <xpath expr="/form/notebook/page[@id='lims']/field[@name='entry_zone']"
         position="after">
         <label name="diagnostician"/>
         <field name="diagnostician"/>
diff --git a/lims_diagnosis/view/plant_form.xml b/lims_diagnosis/view/plant_form.xml
index db2ac62..a89513a 100644
--- a/lims_diagnosis/view/plant_form.xml
+++ b/lims_diagnosis/view/plant_form.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0"?>
 <data>
-    <xpath expr="/form/notebook/page[@id='contacts']"
-        position="after">
+    <xpath expr="/form/notebook/page[@id='contacts']" position="after">
         <page id="diagnosis" string="Diagnosis">
             <label name="diagnostician"/>
             <field name="diagnostician"/>
diff --git a/lims_diagnosis/view/product_type_form.xml b/lims_diagnosis/view/product_type_form.xml
index 00a4274..a8a1253 100644
--- a/lims_diagnosis/view/product_type_form.xml
+++ b/lims_diagnosis/view/product_type_form.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0"?>
 <data>
-    <xpath expr="/form/field[@name='department']"
-        position="after">
+    <xpath expr="/form/field[@name='department']" position="after">
         <label name="diagnostician"/>
         <field name="diagnostician"/>
     </xpath>
diff --git a/lims_digital_sign/view/configuration_form.xml b/lims_digital_sign/view/configuration_form.xml
index ba38a6c..9028af0 100644
--- a/lims_digital_sign/view/configuration_form.xml
+++ b/lims_digital_sign/view/configuration_form.xml
@@ -1,8 +1,6 @@
 <?xml version="1.0"?>
 <data>
-    <xpath
-        expr="/form/notebook/page[@id='general']"
-        position="after">
+    <xpath expr="/form/notebook/page[@id='general']" position="after">
         <page string="Mail Acknowledgment Report" id="mail_ack_report">
             <separator string="Email subject of Acknowledgment of results report"
                 colspan="4" id="mail_ack_report_subject"/>
diff --git a/lims_digital_sign/view/results_report_list.xml b/lims_digital_sign/view/results_report_list.xml
index 7c6a3a6..9d1cbe0 100644
--- a/lims_digital_sign/view/results_report_list.xml
+++ b/lims_digital_sign/view/results_report_list.xml
@@ -1,8 +1,6 @@
 <?xml version="1.0"?>
 <data>
-    <xpath
-        expr="/tree/field[@name='cie_fraction_type']"
-        position="after">
+    <xpath expr="/tree/field[@name='cie_fraction_type']" position="after">
         <field name="signed"/>
         <field name="signed_date" widget="date"/>
         <field name="signed_date" widget="time" string="Time"/>
diff --git a/lims_industry/industry.xml b/lims_industry/industry.xml
index 3e58e4f..7cc6211 100644
--- a/lims_industry/industry.xml
+++ b/lims_industry/industry.xml
@@ -2,7 +2,12 @@
 <tryton>
     <data>
 
+<!-- Menu -->
+
+        <!-- Industry -->
         <menuitem name="Industry" id="menu_industry"/>
+
+        <!-- Industry / Configuration -->
         <menuitem name="Configuration" id="menu_config"
             parent="menu_industry" sequence="10"
             icon="lims-configuration"/>
@@ -199,6 +204,8 @@
         <menuitem action="act_equipment" id="menu_equipment"
             parent="menu_industry" sequence="30"/>
 
+<!-- Equipment from Party -->
+
         <record model="ir.action.act_window" id="act_equipment_from_party">
             <field name="name">Equipments</field>
             <field name="res_model">lims.equipment</field>
@@ -255,6 +262,8 @@
         <menuitem action="act_component" id="menu_component"
             parent="menu_industry" sequence="40"/>
 
+<!-- Component from Party -->
+
         <record model="ir.action.act_window" id="act_component_from_party">
             <field name="name">Components</field>
             <field name="res_model">lims.component</field>
diff --git a/lims_industry/results_report.xml b/lims_industry/results_report.xml
index cacb516..426d823 100644
--- a/lims_industry/results_report.xml
+++ b/lims_industry/results_report.xml
@@ -24,6 +24,7 @@
             <field name="name">Results Report Precedents</field>
             <field name="wiz_name">lims.results_report.version.detail.open_precedent</field>
         </record>
+
         <record model="ir.action.keyword" id="wiz_results_detail_open_precedent_keyword">
             <field name="keyword">form_relate</field>
             <field name="model">lims.results_report.version.detail,-1</field>
diff --git a/lims_industry/sample.xml b/lims_industry/sample.xml
index 5fd2766..603b373 100644
--- a/lims_industry/sample.xml
+++ b/lims_industry/sample.xml
@@ -35,6 +35,7 @@
             <field name="name">Edit Samples</field>
             <field name="wiz_name">lims.sample.edit</field>
         </record>
+
         <record model="ir.action.keyword" id="wiz_edit_sample_keyword">
             <field name="keyword">form_action</field>
             <field name="model">lims.sample,-1</field>
diff --git a/lims_industry/view/address_list.xml b/lims_industry/view/address_list.xml
index 99a1486..8483fd3 100644
--- a/lims_industry/view/address_list.xml
+++ b/lims_industry/view/address_list.xml
@@ -1,8 +1,6 @@
 <?xml version="1.0"?>
 <data>
-    <xpath
-        expr="/tree/field[@name='email']"
-        position="after">
+    <xpath expr="/tree/field[@name='email']" position="after">
         <field name="phone"/>
         <field name="plant"/>
         <field name="equipment"/>
diff --git a/lims_industry/view/analysis_form.xml b/lims_industry/view/analysis_form.xml
index a46de54..ecddd6a 100644
--- a/lims_industry/view/analysis_form.xml
+++ b/lims_industry/view/analysis_form.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0"?>
 <data>
-    <xpath expr="/form/group[@id='disable_as_individual']"
-        position="after">
+    <xpath expr="/form/group[@id='disable_as_individual']" position="after">
         <label name="ind_volume"/>
         <field name="ind_volume"/>
     </xpath>
diff --git a/lims_industry/view/party_form.xml b/lims_industry/view/party_form.xml
index 3aff732..17cbd8e 100644
--- a/lims_industry/view/party_form.xml
+++ b/lims_industry/view/party_form.xml
@@ -1,28 +1,21 @@
 <?xml version="1.0"?>
 <data>
-    <xpath expr="/form/label[@name='code']"
-        position="replace">
+    <xpath expr="/form/label[@name='code']" position="replace">
         <label name="fantasy_name"/>
     </xpath>
-    <xpath expr="/form/field[@name='code']"
-        position="replace">
+    <xpath expr="/form/field[@name='code']" position="replace">
         <field name="fantasy_name"/>
     </xpath>
-    <xpath
-        expr="/form/group[@id='checkboxes']/label[@name='active']"
+    <xpath expr="/form/group[@id='checkboxes']/label[@name='active']"
         position="before">
         <label name="code"/>
         <field name="code" xexpand="0"/>
     </xpath>
-    <xpath
-        expr="/form/group[@id='checkboxes']"
-        position="inside">
+    <xpath expr="/form/group[@id='checkboxes']" position="inside">
         <label name="complete_file"/>
         <field name="complete_file" xexpand="0" width="25"/>
     </xpath>
-    <xpath
-        expr="/form/notebook/page[@id='stock']"
-        position="after">
+    <xpath expr="/form/notebook/page[@id='stock']" position="after">
         <page id="plants" string="Plants">
             <field name="plants" colspan="4"/>
         </page>
diff --git a/lims_industry/view/party_list.xml b/lims_industry/view/party_list.xml
index 5df2179..ce16f73 100644
--- a/lims_industry/view/party_list.xml
+++ b/lims_industry/view/party_list.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0"?>
 <data>
-    <xpath expr="/tree/field[@name='name']"
-        position="after">
+    <xpath expr="/tree/field[@name='name']" position="after">
         <field name="fantasy_name"/>
     </xpath>
 </data>
diff --git a/lims_industry/view/product_type_form.xml b/lims_industry/view/product_type_form.xml
index 924d4cb..38b5410 100644
--- a/lims_industry/view/product_type_form.xml
+++ b/lims_industry/view/product_type_form.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0"?>
 <data>
-    <xpath expr="/form/field[@name='description']"
-        position="after">
+    <xpath expr="/form/field[@name='description']" position="after">
         <label name="attribute_set"/>
         <field name="attribute_set"/>
     </xpath>
diff --git a/lims_industry/view/sample_form.xml b/lims_industry/view/sample_form.xml
index f0eddfa..49e4ea2 100644
--- a/lims_industry/view/sample_form.xml
+++ b/lims_industry/view/sample_form.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0"?>
 <data>
-    <xpath
-        expr="/form/notebook/page[@id='general']/field[@name='variety']"
+    <xpath expr="/form/notebook/page[@id='general']/field[@name='variety']"
         position="after">
         <newline/>
         <group id="oil_fields" colspan="4" col="8">
@@ -21,8 +20,7 @@
             <field name="changed_air_filter"/>
         </group>
     </xpath>
-    <xpath expr="/form/notebook/page[@id='general']"
-        position="after">
+    <xpath expr="/form/notebook/page[@id='general']" position="after">
         <page id="industry" string="Industry">
             <label name="equipment"/>
             <field name="equipment"/>
diff --git a/lims_industry/view/sample_list.xml b/lims_industry/view/sample_list.xml
index a5d97f3..6d1eacf 100644
--- a/lims_industry/view/sample_list.xml
+++ b/lims_industry/view/sample_list.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0"?>
 <data>
-    <xpath expr="/tree/field[@name='label']"
-        position="after">
+    <xpath expr="/tree/field[@name='label']" position="after">
         <field name="equipment"/>
         <field name="component"/>
         <field name="comercial_product"/>
diff --git a/lims_interface/interface.xml b/lims_interface/interface.xml
index 61495f3..e0b5918 100644
--- a/lims_interface/interface.xml
+++ b/lims_interface/interface.xml
@@ -2,9 +2,8 @@
 <tryton>
     <data>
 
-    <!-- Menu items in lims_menu.xml -->
+<!-- Interface -->
 
-        <!-- Interface -->
         <record model="ir.ui.view" id="lims_interface_view_form">
             <field name="model">lims.interface</field>
             <field name="type">form</field>
@@ -31,6 +30,10 @@
             <field name="act_window" ref="act_lims_interface_list"/>
         </record>
 
+        <menuitem action="act_lims_interface_list"
+            id="lims_interface_menu"
+            parent="lims.lims_config_laboratory" sequence="80"/>
+
         <record model="ir.model.button" id="lims_interface_draft_button">
             <field name="name">draft</field>
             <field name="string">Draft</field>
@@ -46,7 +49,8 @@
             <field name="model" search="[('model', '=', 'lims.interface')]"/>
         </record>
 
-        <!-- Column -->
+<!-- Column -->
+
         <record model="ir.ui.view" id="lims_interface_column_view_form">
             <field name="model">lims.interface.column</field>
             <field name="type">form</field>
@@ -58,7 +62,8 @@
             <field name="name">interface_column_list</field>
         </record>
 
-        <!-- Wizard Copy Interface Column -->
+<!-- Wizard Copy Interface Column -->
+
         <record model="ir.ui.view" id="interface_copy_column_start_view_form">
             <field name="model">lims.interface.copy_column.start</field>
             <field name="type">form</field>
@@ -69,7 +74,8 @@
             <field name="wiz_name">lims.interface.copy_column</field>
         </record>
 
-        <!-- Compilation -->
+<!-- Compilation -->
+
         <record model="ir.ui.view" id="lims_interface_compilation_view_form">
             <field name="model">lims.interface.compilation</field>
             <field name="type">form</field>
@@ -96,6 +102,10 @@
             <field name="act_window" ref="act_lims_interface_compilation_list"/>
         </record>
 
+        <menuitem action="act_lims_interface_compilation_list"
+            id="lims_interface_compilation_menu"
+            parent="lims.lims_laboratory_results" sequence="40"/>
+
         <record model="ir.model.button" id="lims_interface_compilation_view_data_button">
             <field name="name">view_data</field>
             <field name="string">View data</field>
@@ -127,7 +137,8 @@
             <field name="model" search="[('model', '=', 'lims.interface.compilation')]"/>
         </record>
 
-        <!-- Compilation Origin -->
+<!-- Compilation Origin -->
+
         <record model="ir.ui.view" id="lims_interface_compilation_origin_view_form">
             <field name="model">lims.interface.compilation.origin</field>
             <field name="type">form</field>
@@ -139,13 +150,15 @@
             <field name="name">compilation_origin_list</field>
         </record>
 
-        <!-- Wizard Open Compilation Data -->
+<!-- Wizard Open Compilation Data -->
+
         <record model="ir.action.wizard" id="wiz_compilation_open_data">
             <field name="name">Open Compilation Data</field>
             <field name="wiz_name">lims.interface.compilation.open_data</field>
         </record>
 
-        <!-- Compilation Data -->
+<!-- Compilation Data -->
+
         <record model="ir.action.act_window" id="act_open_compilation_data">
             <field name="name">Compilation Data</field>
             <field name="res_model">lims.interface.data</field>
@@ -169,7 +182,8 @@
             <field name="perm_delete" eval="True"/>
         </record>
 
-        <!-- Wizard Test Formula -->
+<!-- Wizard Test Formula -->
+
         <record model="ir.ui.view" id="interface_formula_test_view_form">
             <field name="model">lims.interface.formula.test</field>
             <field name="type">form</field>
@@ -180,17 +194,20 @@
             <field name="type">tree</field>
             <field name="name">interface_formula_test_variable_list</field>
         </record>
+
         <record model="ir.action.wizard" id="wiz_interface_formula_test">
             <field name="name">Test Formula</field>
             <field name="wiz_name">lims.interface.formula.test</field>
         </record>
+
         <record model="ir.action.keyword" id="wiz_interface_formula_test_keyword1">
             <field name="keyword">form_action</field>
             <field name="model">lims.interface,-1</field>
             <field name="action" ref="wiz_interface_formula_test"/>
         </record>
 
-        <!-- Variable -->
+<!-- Variable -->
+
         <record model="ir.ui.view" id="interface_variable_view_form">
             <field name="model">lims.interface.variable</field>
             <field name="type">form</field>
@@ -217,7 +234,12 @@
             <field name="act_window" ref="act_interface_variable_list"/>
         </record>
 
-        <!-- Variable Value -->
+        <menuitem action="act_interface_variable_list"
+            id="lims_interface_variable_menu"
+            parent="lims_interface_menu" sequence="10"/>
+
+<!-- Variable Value -->
+
         <record model="ir.ui.view" id="interface_variable_value_view_form">
             <field name="model">lims.interface.variable.value</field>
             <field name="type">form</field>
@@ -229,19 +251,5 @@
             <field name="name">variable_value_list</field>
         </record>
 
-    <!-- Menu -->
-
-        <!-- Configuration / Laboratory / Interfaces -->
-        <menuitem parent="lims.lims_config_laboratory" action="act_lims_interface_list"
-            id="lims_interface_menu" sequence="80"/>
-
-        <!-- Configuration / Laboratory / Interfaces / Variables -->
-        <menuitem parent="lims_interface_menu" action="act_interface_variable_list"
-            id="lims_interface_variable_menu" sequence="10"/>
-
-        <!-- Laboratory / Results entry / Interface Compilation -->
-        <menuitem parent="lims.lims_laboratory_results" action="act_lims_interface_compilation_list"
-            id="lims_interface_compilation_menu" sequence="40"/>
-
     </data>
 </tryton>
diff --git a/lims_interface/message.xml b/lims_interface/message.xml
index 548af04..f6b348b 100644
--- a/lims_interface/message.xml
+++ b/lims_interface/message.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0"?>
 <tryton>
     <data grouped="1">
         <record model="ir.message" id="invalid_alias">
diff --git a/lims_interface/sample.xml b/lims_interface/sample.xml
index 6e4515b..490ca72 100644
--- a/lims_interface/sample.xml
+++ b/lims_interface/sample.xml
@@ -8,6 +8,7 @@
             <field name="name">Interface Compilations</field>
             <field name="wiz_name">lims.referral.open_compilation</field>
         </record>
+
         <record model="ir.action.keyword" id="wiz_referral_open_compilation_keyword">
             <field name="keyword">form_relate</field>
             <field name="model">lims.referral,-1</field>
diff --git a/lims_production/user.xml b/lims_production/user.xml
index 8f9567a..2229d1b 100644
--- a/lims_production/user.xml
+++ b/lims_production/user.xml
@@ -56,20 +56,24 @@
             <field name="group" ref="group_lims_conf_material_admin"/>
         </record>
 
-        <record model="ir.ui.menu-res.group" id="menu_config_group_conf_material_readonly">
+        <record model="ir.ui.menu-res.group"
+            id="menu_config_group_conf_material_readonly">
             <field name="menu" ref="lims.lims_config"/>
             <field name="group" ref="group_lims_conf_material_readonly"/>
         </record>
-        <record model="ir.ui.menu-res.group" id="menu_config_group_conf_material_admin">
+        <record model="ir.ui.menu-res.group"
+            id="menu_config_group_conf_material_admin">
             <field name="menu" ref="lims.lims_config"/>
             <field name="group" ref="group_lims_conf_material_admin"/>
         </record>
 
-        <record model="ir.ui.menu-res.group" id="menu_lims_laboratory_group_conf_material_readonly">
+        <record model="ir.ui.menu-res.group"
+            id="menu_lims_laboratory_group_conf_material_readonly">
             <field name="menu" ref="lims.lims_laboratory"/>
             <field name="group" ref="group_lims_conf_material_readonly"/>
         </record>
-        <record model="ir.ui.menu-res.group" id="menu_lims_laboratory_group_conf_material_admin">
+        <record model="ir.ui.menu-res.group"
+            id="menu_lims_laboratory_group_conf_material_admin">
             <field name="menu" ref="lims.lims_laboratory"/>
             <field name="group" ref="group_lims_conf_material_admin"/>
         </record>
diff --git a/lims_production/view/configuration_form.xml b/lims_production/view/configuration_form.xml
index 3dd5afd..1ee18c6 100644
--- a/lims_production/view/configuration_form.xml
+++ b/lims_production/view/configuration_form.xml
@@ -1,8 +1,6 @@
 <?xml version="1.0"?>
 <data>
-    <xpath
-        expr="/form/notebook/page[@id='general']"
-        position="after">
+    <xpath expr="/form/notebook/page[@id='general']" position="after">
         <page string="Solvents" id="solvents">
             <field name="solvents" colspan="4"/>
         </page>
diff --git a/lims_production/view/product_product_form.xml b/lims_production/view/product_product_form.xml
index 74f4457..a56f070 100644
--- a/lims_production/view/product_product_form.xml
+++ b/lims_production/view/product_product_form.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0"?>
 <data>
-    <xpath
-        expr="/form/notebook/page[@id='general']/field[@name='categories']"
+    <xpath expr="/form/notebook/page[@id='general']/field[@name='categories']"
         position="after">
         <label name="catalog"/>
         <field name="catalog"/>
diff --git a/lims_production/view/product_product_form_simple.xml b/lims_production/view/product_product_form_simple.xml
index 5062e24..dced9cf 100644
--- a/lims_production/view/product_product_form_simple.xml
+++ b/lims_production/view/product_product_form_simple.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0"?>
 <data>
-    <xpath
-        expr="/form/field[@name='description']" position="after">
+    <xpath expr="/form/field[@name='description']" position="after">
         <group id="production" colspan="6" col="4">
             <label name="catalog"/>
             <field name="catalog"/>
diff --git a/lims_production/view/product_product_list.xml b/lims_production/view/product_product_list.xml
index fefef56..6571528 100644
--- a/lims_production/view/product_product_list.xml
+++ b/lims_production/view/product_product_list.xml
@@ -1,8 +1,6 @@
 <?xml version="1.0"?>
 <data>
-    <xpath
-        expr="/tree/field[@name='certified']"
-        position="after">
+    <xpath expr="/tree/field[@name='certified']" position="after">
         <field name="common_name"/>
         <field name="chemical_name"/>
         <field name="commercial_name"/>
diff --git a/lims_production/view/product_template_form.xml b/lims_production/view/product_template_form.xml
index e5d80fd..2ed6197 100644
--- a/lims_production/view/product_template_form.xml
+++ b/lims_production/view/product_template_form.xml
@@ -1,8 +1,6 @@
 <?xml version="1.0"?>
 <data>
-    <xpath
-        expr="/form/notebook/page[@id='general']"
-        position="after">
+    <xpath expr="/form/notebook/page[@id='general']" position="after">
         <page string="LIMS" id="lims">
             <label name="common_name"/>
             <field name="common_name"/>
diff --git a/lims_production/view/product_template_list.xml b/lims_production/view/product_template_list.xml
index 36cfc62..fd83ab0 100644
--- a/lims_production/view/product_template_list.xml
+++ b/lims_production/view/product_template_list.xml
@@ -1,8 +1,6 @@
 <?xml version="1.0"?>
 <data>
-    <xpath
-        expr="/tree/field[@name='default_uom']"
-        position="after">
+    <xpath expr="/tree/field[@name='default_uom']" position="after">
         <field name="common_name"/>
         <field name="chemical_name"/>
         <field name="commercial_name"/>
diff --git a/lims_production/view/production_bom_form.xml b/lims_production/view/production_bom_form.xml
index 3579dea..0b5a043 100644
--- a/lims_production/view/production_bom_form.xml
+++ b/lims_production/view/production_bom_form.xml
@@ -1,8 +1,6 @@
 <?xml version="1.0"?>
 <data>
-    <xpath
-        expr="/form/field[@name='active']"
-        position="after">
+    <xpath expr="/form/field[@name='active']" position="after">
         <label name="divide_lots"/>
         <field name="divide_lots"/>
     </xpath>
diff --git a/lims_production/view/production_bom_list.xml b/lims_production/view/production_bom_list.xml
index d513865..b32f4ec 100644
--- a/lims_production/view/production_bom_list.xml
+++ b/lims_production/view/production_bom_list.xml
@@ -1,8 +1,6 @@
 <?xml version="1.0"?>
 <data>
-    <xpath
-        expr="/tree/field[@name='name']"
-        position="after">
+    <xpath expr="/tree/field[@name='name']" position="after">
         <field name="divide_lots"/>
     </xpath>
 </data>
diff --git a/lims_production/view/production_configuration_form.xml b/lims_production/view/production_configuration_form.xml
index 7963171..a4029f9 100644
--- a/lims_production/view/production_configuration_form.xml
+++ b/lims_production/view/production_configuration_form.xml
@@ -1,8 +1,6 @@
 <?xml version="1.0"?>
 <data>
-    <xpath
-        expr="/form/field[@name='production_sequence']"
-        position="after">
+    <xpath expr="/form/field[@name='production_sequence']" position="after">
         <label name="lot_sequence"/>
         <field name="lot_sequence"/>
     </xpath>
diff --git a/lims_production/view/production_production_form.xml b/lims_production/view/production_production_form.xml
index 516ed06..e92129a 100644
--- a/lims_production/view/production_production_form.xml
+++ b/lims_production/view/production_production_form.xml
@@ -1,8 +1,6 @@
 <?xml version="1.0"?>
 <data>
-    <xpath
-        expr="/form/notebook/page[@id='lines']"
-        position="after">
+    <xpath expr="/form/notebook/page[@id='lines']" position="after">
         <page string="Lims" id="lims">
             <label name="concentration"/>
             <field name="concentration"/>
@@ -16,8 +14,7 @@
             <field name="solvent"/>
         </page>
     </xpath>
-    <xpath
-        expr="/form/notebook/page[@id='other']/field[@name='cost']"
+    <xpath expr="/form/notebook/page[@id='other']/field[@name='cost']"
         position="after">
         <separator string="Comments" colspan="4" id="comments"/>
         <field name="comments" colspan="4"/>
diff --git a/lims_production/view/production_production_list.xml b/lims_production/view/production_production_list.xml
index 4640ea0..f8589a0 100644
--- a/lims_production/view/production_production_list.xml
+++ b/lims_production/view/production_production_list.xml
@@ -1,8 +1,6 @@
 <?xml version="1.0"?>
 <data>
-    <xpath
-        expr="/tree/field[@name='state']"
-        position="after">
+    <xpath expr="/tree/field[@name='state']" position="after">
         <field name="concentration"/>
         <field name="preparation_date"/>
         <field name="expiration_date"/>
diff --git a/lims_production/view/stock_lot_form.xml b/lims_production/view/stock_lot_form.xml
index 1a5e9e0..308f395 100644
--- a/lims_production/view/stock_lot_form.xml
+++ b/lims_production/view/stock_lot_form.xml
@@ -6,10 +6,7 @@
         position="replace"/>
     <xpath expr="/form/label[@name='expiration_date']" position="replace"/>
     <xpath expr="/form/field[@name='expiration_date']" position="replace"/>
-
-    <xpath
-        expr="/form/field[@name='product']"
-        position="after">
+    <xpath expr="/form/field[@name='product']" position="after">
         <label name="category"/>
         <field name="category" colspan="3"/>
         <label name="account_category"/>
diff --git a/lims_production/view/stock_lot_list.xml b/lims_production/view/stock_lot_list.xml
index 20d5a17..ae8456a 100644
--- a/lims_production/view/stock_lot_list.xml
+++ b/lims_production/view/stock_lot_list.xml
@@ -4,10 +4,7 @@
         position="replace"/>
     <xpath expr="/tree/field[@name='expiration_date']"
         position="replace"/>
-
-    <xpath
-        expr="/tree/field[@name='product']"
-        position="after">
+    <xpath expr="/tree/field[@name='product']" position="after">
         <field name="category"/>
         <field name="account_category"/>
         <field name="stability"/>
diff --git a/lims_project/view/entry_list.xml b/lims_project/view/entry_list.xml
index b1678ef..042dd1c 100644
--- a/lims_project/view/entry_list.xml
+++ b/lims_project/view/entry_list.xml
@@ -1,8 +1,6 @@
 <?xml version="1.0"?>
 <data>
-    <xpath
-        expr="/tree/field[@name='carrier']"
-        position="after">
+    <xpath expr="/tree/field[@name='carrier']" position="after">
         <field name="project"/>
     </xpath>
 </data>
diff --git a/lims_project_study_plan/project.xml b/lims_project_study_plan/project.xml
index 56fa505..1d20586 100644
--- a/lims_project_study_plan/project.xml
+++ b/lims_project_study_plan/project.xml
@@ -38,6 +38,24 @@
             <field name="name">project_form</field>
         </record>
 
+        <record model="ir.model.button" id="project_get_stp_test_system_button">
+            <field name="name">get_stp_test_system</field>
+            <field name="string">Update</field>
+            <field name="model" search="[('model', '=', 'lims.project')]"/>
+        </record>
+
+        <record model="ir.model.button" id="project_get_stp_test_method_button">
+            <field name="name">get_stp_test_method</field>
+            <field name="string">Update</field>
+            <field name="model" search="[('model', '=', 'lims.project')]"/>
+        </record>
+
+        <record model="ir.model.button" id="project_re_open_button">
+            <field name="name">re_open</field>
+            <field name="string">Open</field>
+            <field name="model" search="[('model', '=', 'lims.project')]"/>
+        </record>
+
 <!-- Project Professional-->
 
         <record model="ir.ui.view" id="lims_project_stp_professional_view_form">
@@ -79,6 +97,26 @@
             <field name="act_window" ref="act_lims_project_stp_professional_position_list"/>
         </record>
 
+        <menuitem action="act_lims_project_stp_professional_position_list"
+            id="lims_project_stp_professional_position_menu"
+            parent="lims_project.lims_config_projects" sequence="20"/>
+
+        <record model="ir.model.access" id="access_project_stp_professional_position">
+            <field name="model" search="[('model', '=', 'lims.project.stp_professional.position')]"/>
+            <field name="perm_read" eval="True"/>
+            <field name="perm_write" eval="False"/>
+            <field name="perm_create" eval="False"/>
+            <field name="perm_delete" eval="False"/>
+        </record>
+        <record model="ir.model.access" id="access_project_stp_professional_position_group_conf_project_admin">
+            <field name="model" search="[('model', '=', 'lims.project.stp_professional.position')]"/>
+            <field name="group" ref="lims_project.group_lims_conf_project_admin"/>
+            <field name="perm_read" eval="True"/>
+            <field name="perm_write" eval="True"/>
+            <field name="perm_create" eval="True"/>
+            <field name="perm_delete" eval="True"/>
+        </record>
+
 <!-- Reference Element in GLP-->
 
         <record model="ir.ui.view" id="lims_project_reference_element_view_form">
@@ -181,13 +219,6 @@
             <field name="name">notebook_line_list</field>
         </record>
 
-<!-- Menu -->
-
-        <!-- Configuration / Projects / Professional Positions -->
-        <menuitem parent="lims_project.lims_config_projects"
-            action="act_lims_project_stp_professional_position_list"
-            id="lims_project_stp_professional_position_menu" sequence="20"/>
-
 <!-- BPL 01. BPL-005- Anexo 3 Ingreso y egreso provisorio de muestras al archivo -->
 
         <record model="ir.action.report" id="report_glp_01">
@@ -197,13 +228,13 @@
             <field name="report">lims_project_study_plan/report/glp_01.fodt</field>
             <field name="extension">pdf</field>
         </record>
+
         <record model="ir.action.keyword" id="report_glp_01_keyword">
             <field name="keyword">form_print</field>
             <field name="model">lims.project,-1</field>
             <field name="action" ref="report_glp_01"/>
         </record>
 
-
 <!-- BPL 02. BPL-005- Anexo 4 Ingreso y egreso definitivo de muestras para analizar -->
 
         <record model="ir.action.report" id="report_glp_02">
@@ -213,6 +244,7 @@
             <field name="report">lims_project_study_plan/report/glp_02.fodt</field>
             <field name="extension">pdf</field>
         </record>
+
         <record model="ir.action.keyword" id="report_glp_02_keyword">
             <field name="keyword">form_print</field>
             <field name="model">lims.project,-1</field>
@@ -221,16 +253,6 @@
 
 <!-- BPL 03. BPL-005- Anexo 5 Almacenamiento de muestras de planes de estudio -->
 
-        <record model="ir.ui.view" id="report_glp_03_print_start_view_form">
-            <field name="model">lims.project.glp_report.03.print.start</field>
-            <field name="type">form</field>
-            <field name="name">report_glp_03_print_start_form</field>
-        </record>
-        <record model="ir.action.wizard" id="wiz_report_glp_03_print">
-            <field name="name">GLP 03. GLP-005- Annex 5 Storage of samples</field>
-            <field name="wiz_name">lims.project.glp_report.03.print</field>
-        </record>
-
         <record model="ir.action.report" id="report_glp_03">
             <field name="name">GLP 03. GLP-005- Annex 5 Storage of samples</field>
             <field name="model">lims.project</field>
@@ -238,6 +260,18 @@
             <field name="report">lims_project_study_plan/report/glp_03.fodt</field>
             <field name="extension">pdf</field>
         </record>
+
+        <record model="ir.ui.view" id="report_glp_03_print_start_view_form">
+            <field name="model">lims.project.glp_report.03.print.start</field>
+            <field name="type">form</field>
+            <field name="name">report_glp_03_print_start_form</field>
+        </record>
+
+        <record model="ir.action.wizard" id="wiz_report_glp_03_print">
+            <field name="name">GLP 03. GLP-005- Annex 5 Storage of samples</field>
+            <field name="wiz_name">lims.project.glp_report.03.print</field>
+        </record>
+
         <record model="ir.action.keyword" id="report_glp_03_keyword">
             <field name="keyword">form_print</field>
             <field name="model">lims.project,-1</field>
@@ -253,6 +287,7 @@
             <field name="report">lims_project_study_plan/report/glp_04.fodt</field>
             <field name="extension">pdf</field>
         </record>
+
         <record model="ir.action.keyword" id="report_glp_04_keyword">
             <field name="keyword">form_print</field>
             <field name="model">lims.project,-1</field>
@@ -261,16 +296,6 @@
 
 <!-- BPL 05. BPL-005- Anexo 7 Descarte de muestras de planes de estudio -->
 
-        <record model="ir.ui.view" id="report_glp_05_print_start_view_form">
-            <field name="model">lims.project.glp_report.05.print.start</field>
-            <field name="type">form</field>
-            <field name="name">report_glp_05_print_start_form</field>
-        </record>
-        <record model="ir.action.wizard" id="wiz_report_glp_05_print">
-            <field name="name">GLP 05. GLP-005- Annex 7 Discharge of samples</field>
-            <field name="wiz_name">lims.project.glp_report.05.print</field>
-        </record>
-
         <record model="ir.action.report" id="report_glp_05">
             <field name="name">GLP 05. GLP-005- Annex 7 Discharge of samples</field>
             <field name="model">lims.project</field>
@@ -278,6 +303,18 @@
             <field name="report">lims_project_study_plan/report/glp_05.fodt</field>
             <field name="extension">pdf</field>
         </record>
+
+        <record model="ir.ui.view" id="report_glp_05_print_start_view_form">
+            <field name="model">lims.project.glp_report.05.print.start</field>
+            <field name="type">form</field>
+            <field name="name">report_glp_05_print_start_form</field>
+        </record>
+
+        <record model="ir.action.wizard" id="wiz_report_glp_05_print">
+            <field name="name">GLP 05. GLP-005- Annex 7 Discharge of samples</field>
+            <field name="wiz_name">lims.project.glp_report.05.print</field>
+        </record>
+
         <record model="ir.action.keyword" id="report_glp_05_keyword">
             <field name="keyword">form_print</field>
             <field name="model">lims.project,-1</field>
@@ -293,6 +330,7 @@
             <field name="report">lims_project_study_plan/report/glp_06.fodt</field>
             <field name="extension">pdf</field>
         </record>
+
         <record model="ir.action.keyword" id="report_glp_06_keyword">
             <field name="keyword">form_print</field>
             <field name="model">lims.project,-1</field>
@@ -308,6 +346,7 @@
             <field name="report">lims_project_study_plan/report/glp_07.fodt</field>
             <field name="extension">pdf</field>
         </record>
+
         <record model="ir.action.keyword" id="report_glp_07_keyword">
             <field name="keyword">form_print</field>
             <field name="model">lims.project,-1</field>
@@ -323,6 +362,7 @@
             <field name="report">lims_project_study_plan/report/glp_08.fodt</field>
             <field name="extension">pdf</field>
         </record>
+
         <record model="ir.action.keyword" id="report_glp_08_keyword">
             <field name="keyword">form_print</field>
             <field name="model">lims.project,-1</field>
@@ -338,6 +378,7 @@
             <field name="report">lims_project_study_plan/report/glp_09.fodt</field>
             <field name="extension">pdf</field>
         </record>
+
         <record model="ir.action.keyword" id="report_glp_09_keyword">
             <field name="keyword">form_print</field>
             <field name="model">lims.project,-1</field>
@@ -346,16 +387,6 @@
 
 <!-- BPL 10. Esquema rector -->
 
-        <record model="ir.ui.view" id="report_glp_10_print_start_view_form">
-            <field name="model">lims.project.glp_report.10.print.start</field>
-            <field name="type">form</field>
-            <field name="name">report_glp_10_print_start_form</field>
-        </record>
-        <record model="ir.action.wizard" id="wiz_report_glp_10_print">
-            <field name="name">GLP 10. Rector scheme</field>
-            <field name="wiz_name">lims.project.glp_report.10.print</field>
-        </record>
-
         <record model="ir.action.report" id="report_glp_10">
             <field name="name">GLP 10. Rector scheme</field>
             <field name="model">lims.project</field>
@@ -363,6 +394,18 @@
             <field name="report">lims_project_study_plan/report/glp_10.fodt</field>
             <field name="extension">pdf</field>
         </record>
+
+        <record model="ir.ui.view" id="report_glp_10_print_start_view_form">
+            <field name="model">lims.project.glp_report.10.print.start</field>
+            <field name="type">form</field>
+            <field name="name">report_glp_10_print_start_form</field>
+        </record>
+
+        <record model="ir.action.wizard" id="wiz_report_glp_10_print">
+            <field name="name">GLP 10. Rector scheme</field>
+            <field name="wiz_name">lims.project.glp_report.10.print</field>
+        </record>
+
         <record model="ir.action.keyword" id="report_glp_10_keyword">
             <field name="keyword">form_print</field>
             <field name="model">lims.project,-1</field>
@@ -378,6 +421,7 @@
             <field name="report">lims_project_study_plan/report/glp_11.fodt</field>
             <field name="extension">pdf</field>
         </record>
+
         <record model="ir.action.keyword" id="report_glp_11_keyword">
             <field name="keyword">form_print</field>
             <field name="model">lims.project,-1</field>
@@ -386,16 +430,6 @@
 
 <!-- BPL 12. Registro de cambios -->
 
-        <record model="ir.ui.view" id="report_glp_12_print_start_view_form">
-            <field name="model">lims.project.glp_report.12.print.start</field>
-            <field name="type">form</field>
-            <field name="name">report_glp_12_print_start_form</field>
-        </record>
-        <record model="ir.action.wizard" id="wiz_report_glp_12_print">
-            <field name="name">GLP 12. Changelog</field>
-            <field name="wiz_name">lims.project.glp_report.12.print</field>
-        </record>
-
         <record model="ir.action.report" id="report_glp_12">
             <field name="name">GLP 12. Changelog</field>
             <field name="model">lims.project</field>
@@ -403,15 +437,24 @@
             <field name="report">lims_project_study_plan/report/glp_12.fodt</field>
             <field name="extension">pdf</field>
         </record>
+
+        <record model="ir.ui.view" id="report_glp_12_print_start_view_form">
+            <field name="model">lims.project.glp_report.12.print.start</field>
+            <field name="type">form</field>
+            <field name="name">report_glp_12_print_start_form</field>
+        </record>
+
+        <record model="ir.action.wizard" id="wiz_report_glp_12_print">
+            <field name="name">GLP 12. Changelog</field>
+            <field name="wiz_name">lims.project.glp_report.12.print</field>
+        </record>
+
         <record model="ir.action.keyword" id="report_glp_12_keyword">
             <field name="keyword">form_print</field>
             <field name="model">lims.project,-1</field>
             <field name="action" ref="wiz_report_glp_12_print"/>
         </record>
 
-
-
-        
 <!-- BPL Study plan -->
 
         <record model="ir.action.report" id="report_glp_study_plan">
@@ -421,6 +464,7 @@
             <field name="report">lims_project_study_plan/report/glp_study_plan.fodt</field>
             <field name="extension">pdf</field>
         </record>
+
         <record model="ir.action.keyword" id="report_glp_study_plan_keyword">
             <field name="keyword">form_print</field>
             <field name="model">lims.project,-1</field>
@@ -436,6 +480,7 @@
             <field name="report">lims_project_study_plan/report/glp_final_report_rp.fodt</field>
             <field name="extension">pdf</field>
         </record>
+
         <record model="ir.action.keyword" id="report_glp_final_rp_keyword">
             <field name="keyword">form_print</field>
             <field name="model">lims.project,-1</field>
@@ -451,6 +496,7 @@
             <field name="report">lims_project_study_plan/report/glp_final_report_for.fodt</field>
             <field name="extension">pdf</field>
         </record>
+
         <record model="ir.action.keyword" id="report_glp_final_for_keyword">
             <field name="keyword">form_print</field>
             <field name="model">lims.project,-1</field>
@@ -466,13 +512,13 @@
             <field name="report">lims_project_study_plan/report/glp_analytical_phase_report.fodt</field>
             <field name="extension">pdf</field>
         </record>
+
         <record model="ir.action.keyword" id="report_glp_analytical_phase_keyword">
             <field name="keyword">form_print</field>
             <field name="model">lims.project,-1</field>
             <field name="action" ref="report_glp_analytical_phase"/>
         </record>
-        
-        
+
 <!-- BPL 13. Registro de preparación de muestras BPL -->
 
         <record model="ir.action.report" id="report_glp_13">
@@ -482,30 +528,13 @@
             <field name="report">lims_project_study_plan/report/glp_13.fods</field>
             <field name="extension">xls</field>
         </record>
+
         <record model="ir.action.keyword" id="report_glp_13_keyword">
             <field name="keyword">form_print</field>
             <field name="model">lims.project,-1</field>
             <field name="action" ref="report_glp_13"/>
         </record>
 
-        <record model="ir.model.button" id="project_get_stp_test_system_button">
-            <field name="name">get_stp_test_system</field>
-            <field name="string">Update</field>
-            <field name="model" search="[('model', '=', 'lims.project')]"/>
-        </record>
-
-        <record model="ir.model.button" id="project_get_stp_test_method_button">
-            <field name="name">get_stp_test_method</field>
-            <field name="string">Update</field>
-            <field name="model" search="[('model', '=', 'lims.project')]"/>
-        </record>
-
-        <record model="ir.model.button" id="project_re_open_button">
-            <field name="name">re_open</field>
-            <field name="string">Open</field>
-            <field name="model" search="[('model', '=', 'lims.project')]"/>
-        </record>
-
 <!-- Wizard Open Project -->
 
         <record model="ir.ui.view" id="lims_project_re_open_start_view_form">
@@ -519,23 +548,5 @@
             <field name="wiz_name">lims.project.re_open</field>
         </record>
 
-<!-- Access Rights on Models -->
-
-        <record model="ir.model.access" id="access_project_stp_professional_position">
-            <field name="model" search="[('model', '=', 'lims.project.stp_professional.position')]"/>
-            <field name="perm_read" eval="True"/>
-            <field name="perm_write" eval="False"/>
-            <field name="perm_create" eval="False"/>
-            <field name="perm_delete" eval="False"/>
-        </record>
-        <record model="ir.model.access" id="access_project_stp_professional_position_group_conf_project_admin">
-            <field name="model" search="[('model', '=', 'lims.project.stp_professional.position')]"/>
-            <field name="group" ref="lims_project.group_lims_conf_project_admin"/>
-            <field name="perm_read" eval="True"/>
-            <field name="perm_write" eval="True"/>
-            <field name="perm_create" eval="True"/>
-            <field name="perm_delete" eval="True"/>
-        </record>
-
     </data>
 </tryton>
diff --git a/lims_project_study_plan/view/create_sample_start_form.xml b/lims_project_study_plan/view/create_sample_start_form.xml
index de6508b..62445f7 100644
--- a/lims_project_study_plan/view/create_sample_start_form.xml
+++ b/lims_project_study_plan/view/create_sample_start_form.xml
@@ -1,8 +1,6 @@
 <?xml version="1.0"?>
 <data>
-    <xpath
-        expr="/form/notebook/page[@id='general']"
-        position="after">
+    <xpath expr="/form/notebook/page[@id='general']" position="after">
         <page string="Study plan" id="study_plan">
             <label name="application_date"/>
             <field name="application_date"/>
diff --git a/lims_project_study_plan/view/report_glp_10_print_start_form.xml b/lims_project_study_plan/view/report_glp_10_print_start_form.xml
index d350277..e7f8fe5 100644
--- a/lims_project_study_plan/view/report_glp_10_print_start_form.xml
+++ b/lims_project_study_plan/view/report_glp_10_print_start_form.xml
@@ -8,5 +8,4 @@
     <field name="stp_state" colspan="3"/>
     <label name="professional"/>
     <field name="professional" colspan="3"/>
-
 </form>
diff --git a/lims_project_study_plan/view/sample_form.xml b/lims_project_study_plan/view/sample_form.xml
index de6508b..62445f7 100644
--- a/lims_project_study_plan/view/sample_form.xml
+++ b/lims_project_study_plan/view/sample_form.xml
@@ -1,8 +1,6 @@
 <?xml version="1.0"?>
 <data>
-    <xpath
-        expr="/form/notebook/page[@id='general']"
-        position="after">
+    <xpath expr="/form/notebook/page[@id='general']" position="after">
         <page string="Study plan" id="study_plan">
             <label name="application_date"/>
             <field name="application_date"/>
diff --git a/lims_project_study_plan/view/stock_lot_form.xml b/lims_project_study_plan/view/stock_lot_form.xml
index da71ae4..0c46646 100644
--- a/lims_project_study_plan/view/stock_lot_form.xml
+++ b/lims_project_study_plan/view/stock_lot_form.xml
@@ -1,8 +1,6 @@
 <?xml version="1.0"?>
 <data>
-    <xpath
-        expr="/form/field[@name='purity_degree']"
-        position="after">
+    <xpath expr="/form/field[@name='purity_degree']" position="after">
         <label name="formula"/>
         <field name="formula"/>
         <label name="molecular_weight"/>
diff --git a/lims_project_study_plan/view/workyear_form.xml b/lims_project_study_plan/view/workyear_form.xml
index 467602a..4b6f972 100644
--- a/lims_project_study_plan/view/workyear_form.xml
+++ b/lims_project_study_plan/view/workyear_form.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0"?>
 <data>
-    <xpath
-        expr="/form/field[@name='results_report_sequence']"
+    <xpath expr="/form/field[@name='results_report_sequence']"
         position="after">
         <label name="project_study_plan_sequence"/>
         <field name="project_study_plan_sequence"/>
diff --git a/lims_project_tas/invoice.xml b/lims_project_tas/invoice.xml
index da0cb81..63323f4 100644
--- a/lims_project_tas/invoice.xml
+++ b/lims_project_tas/invoice.xml
@@ -2,12 +2,13 @@
 <tryton>
     <data depends="lims_account_invoice">
 
-      <!-- Invoice -->
-      <record model="ir.ui.view" id="lims_invoice_view_form">
-          <field name="model">account.invoice</field>
-          <field name="inherit" ref="account_invoice.invoice_view_form"/>
-          <field name="name">invoice_form</field>
-      </record>
+<!-- Invoice -->
+
+        <record model="ir.ui.view" id="lims_invoice_view_form">
+            <field name="model">account.invoice</field>
+            <field name="inherit" ref="account_invoice.invoice_view_form"/>
+            <field name="name">invoice_form</field>
+        </record>
 
     </data>
 </tryton>
diff --git a/lims_project_tas/project.xml b/lims_project_tas/project.xml
index d262045..e673175 100644
--- a/lims_project_tas/project.xml
+++ b/lims_project_tas/project.xml
@@ -2,8 +2,6 @@
 <tryton>
     <data>
 
-<!-- Menu items in lims_menu.xml -->
-
 <!-- Project -->
 
         <record model="ir.ui.view" id="lims_project_view_form">
@@ -40,14 +38,8 @@
             <field name="act_window" ref="act_lims_tas_type_list"/>
         </record>
 
-<!-- Menu -->
-
-        <!-- Configuration / Projects / TAS Types -->
-        <menuitem parent="lims_project.lims_config_projects"
-            action="act_lims_tas_type_list"
-            id="lims_tas_type_menu" sequence="10"/>
-
-<!-- Access Rights on Models -->
+        <menuitem action="act_lims_tas_type_list" id="lims_tas_type_menu"
+            parent="lims_project.lims_config_projects" sequence="10"/>
 
         <record model="ir.model.access" id="access_tas_type">
             <field name="model" search="[('model', '=', 'lims.tas.type')]"/>
diff --git a/lims_project_tas/view/invoice_form.xml b/lims_project_tas/view/invoice_form.xml
index 534c8ca..e975746 100644
--- a/lims_project_tas/view/invoice_form.xml
+++ b/lims_project_tas/view/invoice_form.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0"?>
 <data>
-    <xpath
-        expr="/form/notebook/page[@id='info']/field[@name='cancel_move']"
+    <xpath expr="/form/notebook/page[@id='info']/field[@name='cancel_move']"
         position="after">
         <label name="lims_project"/>
         <field name="lims_project"/>
diff --git a/lims_project_tas/view/workyear_form.xml b/lims_project_tas/view/workyear_form.xml
index ca68712..daf6bea 100644
--- a/lims_project_tas/view/workyear_form.xml
+++ b/lims_project_tas/view/workyear_form.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0"?>
 <data>
-    <xpath
-        expr="/form/field[@name='results_report_sequence']"
+    <xpath expr="/form/field[@name='results_report_sequence']"
         position="after">
         <label name="project_tas_sequence"/>
         <field name="project_tas_sequence"/>
diff --git a/lims_project_water/project.xml b/lims_project_water/project.xml
index f6d9c5b..b446749 100644
--- a/lims_project_water/project.xml
+++ b/lims_project_water/project.xml
@@ -33,6 +33,7 @@
             <field name="report">lims_project_water/report/wtr_01.fodt</field>
             <field name="extension">pdf</field>
         </record>
+
         <record model="ir.action.keyword" id="report_wtr_01_keyword">
             <field name="keyword">form_print</field>
             <field name="model">lims.project,-1</field>
diff --git a/lims_project_water/view/create_sample_start_form.xml b/lims_project_water/view/create_sample_start_form.xml
index 74aaa19..225876c 100644
--- a/lims_project_water/view/create_sample_start_form.xml
+++ b/lims_project_water/view/create_sample_start_form.xml
@@ -1,8 +1,6 @@
 <?xml version="1.0"?>
 <data>
-    <xpath
-        expr="/form/notebook/page[@id='general']"
-        position="after">
+    <xpath expr="/form/notebook/page[@id='general']" position="after">
         <page string="Water sampling" id="water_sampling">
             <label name="sampling_point"/>
             <field name="sampling_point"/>
diff --git a/lims_project_water/view/sample_form.xml b/lims_project_water/view/sample_form.xml
index 74aaa19..225876c 100644
--- a/lims_project_water/view/sample_form.xml
+++ b/lims_project_water/view/sample_form.xml
@@ -1,8 +1,6 @@
 <?xml version="1.0"?>
 <data>
-    <xpath
-        expr="/form/notebook/page[@id='general']"
-        position="after">
+    <xpath expr="/form/notebook/page[@id='general']" position="after">
         <page string="Water sampling" id="water_sampling">
             <label name="sampling_point"/>
             <field name="sampling_point"/>
diff --git a/lims_quality_control/configuration.xml b/lims_quality_control/configuration.xml
index 70e2797..a872486 100644
--- a/lims_quality_control/configuration.xml
+++ b/lims_quality_control/configuration.xml
@@ -2,6 +2,8 @@
 <tryton>
     <data>
 
+<!-- Quality Configuration -->
+
         <record model="ir.ui.view" id="quality_configuration_form_view">
             <field name="model">lims.quality.configuration</field>
             <field name="type">form</field>
@@ -19,6 +21,11 @@
             <field name="act_window" ref="act_quality_configuration"/>
         </record>
 
+        <menuitem action="act_quality_configuration"
+            id="menu_quality_configuration"
+            parent="menu_configuration" sequence="0"
+            icon="tryton-list"/>
+
         <record model="ir.model.access" id="access_quality_configuration">
             <field name="model"
                 search="[('model', '=', 'lims.quality.configuration')]"/>
@@ -38,9 +45,5 @@
             <field name="perm_delete" eval="True"/>
         </record>
 
-        <menuitem id="menu_quality_configuration"
-            action="act_quality_configuration"
-            parent="menu_configuration" sequence="0"
-            icon="tryton-list"/>
     </data>
 </tryton>
diff --git a/lims_quality_control/lims.xml b/lims_quality_control/lims.xml
index 0dc8e10..8790a81 100644
--- a/lims_quality_control/lims.xml
+++ b/lims_quality_control/lims.xml
@@ -2,12 +2,35 @@
 <tryton>
     <data>
 
+<!-- Configuration -->
+
         <record model="ir.ui.view" id="lims_configuration_view">
             <field name="model">lims.configuration</field>
             <field name="inherit" ref="lims.lims_configuration_view"/>
             <field name="name">configuration_form</field>
         </record>
 
+<!-- Work Year -->
+
+        <record model="ir.ui.view" id="lims_workyear_view_form">
+            <field name="model">lims.lab.workyear</field>
+            <field name="inherit" ref="lims.lims_workyear_view_form"/>
+            <field name="name">workyear_form</field>
+        </record>
+
+<!-- Analysis -->
+
+        <record model="ir.ui.view" id="lims_analysis_view_form">
+            <field name="model">lims.analysis</field>
+            <field name="inherit" ref="lims.lims_analysis_view_form"/>
+            <field name="name">analysis_form</field>
+        </record>
+        <record model="ir.ui.view" id="lims_analysis_view_list">
+            <field name="model">lims.analysis</field>
+            <field name="inherit" ref="lims.lims_analysis_view_list"/>
+            <field name="name">analysis_list</field>
+        </record>
+
         <record model="ir.action.act_window.domain" id="act_lims_analysis_list_domain_quantitative">
             <field name="name">Quantitative</field>
             <field name="sequence" eval="10"/>
@@ -31,6 +54,8 @@
             <field name="act_window" ref="lims.act_lims_analysis_list"/>
         </record>
 
+<!-- Typification -->
+
         <record model="ir.ui.view" id="quality_typification_view_form">
             <field name="model">lims.typification</field>
             <field name="type">form</field>
@@ -53,16 +78,7 @@
             <field name="name">typification_list</field>
         </record>
 
-        <record model="ir.ui.view" id="lims_analysis_view_form">
-            <field name="model">lims.analysis</field>
-            <field name="inherit" ref="lims.lims_analysis_view_form"/>
-            <field name="name">analysis_form</field>
-        </record>
-        <record model="ir.ui.view" id="lims_analysis_view_list">
-            <field name="model">lims.analysis</field>
-            <field name="inherit" ref="lims.lims_analysis_view_list"/>
-            <field name="name">analysis_list</field>
-        </record>
+<!-- Method -->
 
         <record model="ir.ui.view" id="lims_lab_method_view_form">
             <field name="model">lims.lab.method</field>
diff --git a/lims_quality_control/quality.xml b/lims_quality_control/quality.xml
index 2fc76b2..9a889b4 100644
--- a/lims_quality_control/quality.xml
+++ b/lims_quality_control/quality.xml
@@ -2,6 +2,8 @@
 <tryton>
     <data>
 
+<!-- Groups -->
+
         <record model="res.group" id="group_quality_control_admin">
             <field name="name">LIMS Quality Control Administration</field>
         </record>
@@ -9,6 +11,7 @@
             <field name="user" ref="res.user_admin"/>
             <field name="group" ref="group_quality_control_admin"/>
         </record>
+
         <record model="res.group" id="group_quality_control">
             <field name="name">LIMS Quality Control</field>
         </record>
@@ -17,36 +20,54 @@
             <field name="group" ref="group_quality_control"/>
         </record>
 
-        <record model="ir.rule.group" id="rule_group_quality_template">
-            <field name="name">User in company</field>
-            <field name="model" search="[('model', '=', 'lims.quality.template')]"/>
-            <field name="global_p" eval="True"/>
-        </record>
-        <record model="ir.rule" id="rule_quality_template">
-            <field name="domain"
-                eval="[('company', '=', Eval('user', {}).get('company', -1))]"
-                pyson="1"/>
-            <field name="rule_group" ref="rule_group_quality_template"/>
+<!-- Menu -->
+
+        <!-- Quality Control -->
+        <menuitem name="Quality Control" id="menu_quality_control" sequence="1" />
+
+        <record model="ir.ui.menu-res.group" id="menu_quality_group_quality">
+            <field name="menu" ref="menu_quality_control"/>
+            <field name="group" ref="group_quality_control"/>
         </record>
 
-        <record model="ir.rule.group" id="rule_group_quality_test">
-            <field name="name">User in company</field>
-            <field name="model" search="[('model', '=', 'lims.quality.test')]"/>
-            <field name="global_p" eval="True"/>
+        <!-- Quality Control / Configuration -->
+        <menuitem name="Configuration" id="menu_configuration"
+            parent="menu_quality_control" sequence="0"
+            icon="tryton-settings"/>
+
+        <record model="ir.ui.menu-res.group" id="menu_quality_configuration_group_quality_admin">
+            <field name="menu" ref="menu_configuration"/>
+            <field name="group" ref="group_quality_control_admin"/>
         </record>
-        <record model="ir.rule" id="rule_quality_test">
-            <field name="domain"
-                eval="[('company', '=', Eval('user', {}).get('company', -1))]"
-                pyson="1"/>
-            <field name="rule_group" ref="rule_group_quality_test"/>
+
+<!-- Sequences for Quality Control -->
+
+        <record model="ir.sequence.type" id="sequence_type_quality">
+            <field name="name">Quality Control</field>
+            <field name="code">lims.quality.test</field>
         </record>
+        <record model="ir.sequence.type-res.group"
+            id="sequence_type_quality_group_admin">
+            <field name="sequence_type" ref="sequence_type_quality"/>
+            <field name="group" ref="res.group_admin"/>
+        </record>
+        <record model="ir.sequence.type-res.group"
+            id="sequence_type_quality_group_quality_admin">
+            <field name="sequence_type" ref="sequence_type_quality"/>
+            <field name="group" ref="group_quality_control"/>
+        </record>
+        <record model="ir.sequence" id="sequence_quality">
+            <field name="name">Quality Control</field>
+            <field name="code">lims.quality.test</field>
+        </record>
+
+<!-- Quality Value -->
 
         <record model="ir.ui.view" id="quality_qualitative_value_form_view">
             <field name="model">lims.quality.qualitative.value</field>
             <field name="type">form</field>
             <field name="name">quality_qualitative_value_form</field>
         </record>
-
         <record model="ir.ui.view" id="quality_qualitative_value_tree_view">
             <field name="model">lims.quality.qualitative.value</field>
             <field name="type">tree</field>
@@ -58,7 +79,6 @@
             <field name="res_model">lims.quality.qualitative.value</field>
             <field name="search_value"></field>
         </record>
-
         <record model="ir.action.act_window.view" id="act_quality_qualitative_value_view1">
             <field name="sequence" eval="10"/>
             <field name="view" ref="quality_qualitative_value_tree_view"/>
@@ -86,46 +106,13 @@
             <field name="perm_delete" eval="True"/>
         </record>
 
-        <record model="ir.model.button" id="quality_template_draft_button">
-            <field name="name">draft</field>
-            <field name="string">Reset to Draft</field>
-            <field name="model" search="[('model', '=', 'lims.quality.template')]"/>
-        </record>
-        <record model="ir.model.button-res.group"
-            id="quality_template_draft_button_group_quality_admin">
-            <field name="button" ref="quality_template_draft_button"/>
-            <field name="group" ref="group_quality_control_admin"/>
-        </record>
-
-        <record model="ir.model.button" id="quality_template_active_button">
-            <field name="name">active</field>
-            <field name="string">Activate</field>
-            <field name="model" search="[('model', '=', 'lims.quality.template')]"/>
-        </record>
-        <record model="ir.model.button-res.group"
-            id="quality_template_active_button_group_quality_admin">
-            <field name="button" ref="quality_template_active_button"/>
-            <field name="group" ref="group_quality_control_admin"/>
-        </record>
-
-
-        <record model="ir.model.button" id="quality_template_not_active_button">
-            <field name="name">not_active</field>
-            <field name="string">Deactivate</field>
-            <field name="model" search="[('model', '=', 'lims.quality.template')]"/>
-        </record>
-        <record model="ir.model.button-res.group"
-            id="quality_template_not_active_button_group_quality_admin">
-            <field name="button" ref="quality_template_not_active_button"/>
-            <field name="group" ref="group_quality_control_admin"/>
-        </record>
+<!-- Quality Template -->
 
         <record model="ir.ui.view" id="quality_template_form_view">
             <field name="model">lims.quality.template</field>
             <field name="type">form</field>
             <field name="name">quality_template_form</field>
         </record>
-
         <record model="ir.ui.view" id="quality_template_tree_view">
             <field name="model">lims.quality.template</field>
             <field name="type">tree</field>
@@ -147,6 +134,7 @@
             <field name="view" ref="quality_template_form_view"/>
             <field name="act_window" ref="act_quality_template"/>
         </record>
+
         <record model="ir.action.act_window.domain" id="act_quality_template_domain_draft">
             <field name="name">Draft</field>
             <field name="sequence" eval="10"/>
@@ -178,6 +166,55 @@
             <field name="act_window" ref="act_quality_template"/>
         </record>
 
+        <record model="ir.model.button" id="quality_template_draft_button">
+            <field name="name">draft</field>
+            <field name="string">Reset to Draft</field>
+            <field name="model" search="[('model', '=', 'lims.quality.template')]"/>
+        </record>
+        <record model="ir.model.button-res.group"
+            id="quality_template_draft_button_group_quality_admin">
+            <field name="button" ref="quality_template_draft_button"/>
+            <field name="group" ref="group_quality_control_admin"/>
+        </record>
+
+        <menuitem name="Templates" action="act_quality_template"
+            id="menu_quality_template"
+            parent="menu_quality_control" sequence="10" />
+
+        <record model="ir.model.button" id="quality_template_active_button">
+            <field name="name">active</field>
+            <field name="string">Activate</field>
+            <field name="model" search="[('model', '=', 'lims.quality.template')]"/>
+        </record>
+        <record model="ir.model.button-res.group"
+            id="quality_template_active_button_group_quality_admin">
+            <field name="button" ref="quality_template_active_button"/>
+            <field name="group" ref="group_quality_control_admin"/>
+        </record>
+
+        <record model="ir.model.button" id="quality_template_not_active_button">
+            <field name="name">not_active</field>
+            <field name="string">Deactivate</field>
+            <field name="model" search="[('model', '=', 'lims.quality.template')]"/>
+        </record>
+        <record model="ir.model.button-res.group"
+            id="quality_template_not_active_button_group_quality_admin">
+            <field name="button" ref="quality_template_not_active_button"/>
+            <field name="group" ref="group_quality_control_admin"/>
+        </record>
+
+        <record model="ir.rule.group" id="rule_group_quality_template">
+            <field name="name">User in company</field>
+            <field name="model" search="[('model', '=', 'lims.quality.template')]"/>
+            <field name="global_p" eval="True"/>
+        </record>
+        <record model="ir.rule" id="rule_quality_template">
+            <field name="domain"
+                eval="[('company', '=', Eval('user', {}).get('company', -1))]"
+                pyson="1"/>
+            <field name="rule_group" ref="rule_group_quality_template"/>
+        </record>
+
         <record model="ir.model.access" id="access_quality_template">
             <field name="model" search="[('model', '=', 'lims.quality.template')]"/>
             <field name="perm_read" eval="True"/>
@@ -194,12 +231,13 @@
             <field name="perm_delete" eval="True"/>
         </record>
 
+<!-- Quality Test -->
+
         <record model="ir.ui.view" id="quality_test_form_view">
             <field name="model">lims.quality.test</field>
             <field name="type">form</field>
             <field name="name">quality_test_form</field>
         </record>
-
         <record model="ir.ui.view" id="quality_test_tree_view">
             <field name="model">lims.quality.test</field>
             <field name="type">tree</field>
@@ -221,6 +259,7 @@
             <field name="view" ref="quality_test_form_view"/>
             <field name="act_window" ref="act_quality_test"/>
         </record>
+
         <record model="ir.action.act_window.domain" id="act_quality_test_domain_draft">
             <field name="name">Draft</field>
             <field name="sequence" eval="10"/>
@@ -260,50 +299,9 @@
             <field name="act_window" ref="act_quality_test"/>
         </record>
 
-        <record model="ir.model.access" id="access_quality_test">
-            <field name="model" search="[('model', '=', 'lims.quality.test')]"/>
-            <field name="perm_read" eval="True"/>
-            <field name="perm_write" eval="False"/>
-            <field name="perm_create" eval="False"/>
-            <field name="perm_delete" eval="False"/>
-        </record>
-        <record model="ir.model.access" id="access_quality_test_quality">
-            <field name="model" search="[('model', '=', 'lims.quality.test')]"/>
-            <field name="group" ref="group_quality_control"/>
-            <field name="perm_read" eval="True"/>
-            <field name="perm_write" eval="True"/>
-            <field name="perm_create" eval="False"/>
-            <field name="perm_delete" eval="False"/>
-        </record>
-        <record model="ir.model.access" id="access_quality_test_admin">
-            <field name="model" search="[('model', '=', 'lims.quality.test')]"/>
-            <field name="group" ref="group_quality_control_admin"/>
-            <field name="perm_read" eval="True"/>
-            <field name="perm_write" eval="True"/>
-            <field name="perm_create" eval="True"/>
-            <field name="perm_delete" eval="True"/>
-        </record>
-
-        <record model="ir.sequence.type" id="sequence_type_quality">
-            <field name="name">Quality Control</field>
-            <field name="code">lims.quality.test</field>
-        </record>
-
-        <record model="ir.sequence.type-res.group"
-            id="sequence_type_quality_group_admin">
-            <field name="sequence_type" ref="sequence_type_quality"/>
-            <field name="group" ref="res.group_admin"/>
-        </record>
-        <record model="ir.sequence.type-res.group"
-            id="sequence_type_quality_group_quality_admin">
-            <field name="sequence_type" ref="sequence_type_quality"/>
-            <field name="group" ref="group_quality_control"/>
-        </record>
-
-        <record model="ir.sequence" id="sequence_quality">
-            <field name="name">Quality Control</field>
-            <field name="code">lims.quality.test</field>
-        </record>
+        <menuitem name="Tests" action="act_quality_test"
+            id="menu_quality_test"
+            parent="menu_quality_control" sequence="20"/>
 
         <record model="ir.model.button" id="quality_draft_button">
             <field name="name">draft</field>
@@ -360,26 +358,43 @@
             <field name="group" ref="group_quality_control_admin"/>
         </record>
 
-        <menuitem id="menu_quality_control" name="Quality Control"
-            sequence="1" />
-        <record model="ir.ui.menu-res.group" id="menu_quality_group_quality">
-            <field name="menu" ref="menu_quality_control"/>
+        <record model="ir.rule.group" id="rule_group_quality_test">
+            <field name="name">User in company</field>
+            <field name="model" search="[('model', '=', 'lims.quality.test')]"/>
+            <field name="global_p" eval="True"/>
+        </record>
+        <record model="ir.rule" id="rule_quality_test">
+            <field name="domain"
+                eval="[('company', '=', Eval('user', {}).get('company', -1))]"
+                pyson="1"/>
+            <field name="rule_group" ref="rule_group_quality_test"/>
+        </record>
+
+        <record model="ir.model.access" id="access_quality_test">
+            <field name="model" search="[('model', '=', 'lims.quality.test')]"/>
+            <field name="perm_read" eval="True"/>
+            <field name="perm_write" eval="False"/>
+            <field name="perm_create" eval="False"/>
+            <field name="perm_delete" eval="False"/>
+        </record>
+        <record model="ir.model.access" id="access_quality_test_quality">
+            <field name="model" search="[('model', '=', 'lims.quality.test')]"/>
             <field name="group" ref="group_quality_control"/>
+            <field name="perm_read" eval="True"/>
+            <field name="perm_write" eval="True"/>
+            <field name="perm_create" eval="False"/>
+            <field name="perm_delete" eval="False"/>
         </record>
-
-        <menuitem name="Configuration" parent="menu_quality_control"
-            id="menu_configuration"
-            sequence="0" icon="tryton-settings"/>
-        <record model="ir.ui.menu-res.group" id="menu_quality_configuration_group_quality_admin">
-            <field name="menu" ref="menu_configuration"/>
+        <record model="ir.model.access" id="access_quality_test_admin">
+            <field name="model" search="[('model', '=', 'lims.quality.test')]"/>
             <field name="group" ref="group_quality_control_admin"/>
+            <field name="perm_read" eval="True"/>
+            <field name="perm_write" eval="True"/>
+            <field name="perm_create" eval="True"/>
+            <field name="perm_delete" eval="True"/>
         </record>
 
-        <menuitem action="act_quality_template" id="menu_quality_template"
-            parent="menu_quality_control" sequence="10" name="Templates"/>
-
-        <menuitem action="act_quality_test" id="menu_quality_test"
-            parent="menu_quality_control" sequence="20" name="Tests"/>
+<!-- Create Quality Test -->
 
         <record model="ir.ui.view" id="lims_create_quality_test_start_view_form">
             <field name="model">lims.create.quality.test.start</field>
@@ -392,12 +407,15 @@
             <field name="wiz_name">lims.create.quality.test</field>
             <field name="model">lims.sample</field>
         </record>
+
         <record model="ir.action.keyword" id="lims_create_quality_test_keyword">
             <field name="keyword">form_action</field>
             <field name="model">lims.sample,-1</field>
             <field name="action" ref="wiz_lims_create_quality_test"/>
         </record>
 
+<!-- Add Service -->
+
         <record model="ir.ui.view" id="lims_template_add_service_start_view_form">
             <field name="model">lims.template.add.service.start</field>
             <field name="type">form</field>
@@ -409,31 +427,27 @@
             <field name="wiz_name">lims.template.add.service</field>
             <field name="model">lims.quality.template</field>
         </record>
+
         <record model="ir.action.keyword" id="lims_template_add_service_keyword">
             <field name="keyword">form_action</field>
             <field name="model">lims.quality.template,-1</field>
             <field name="action" ref="wiz_lims_template_add_service"/>
         </record>
 
+<!-- Test Results Reports -->
+
         <record model="ir.action.wizard" id="wiz_lims_test_results_report">
             <field name="name">Test Results Reports</field>
             <field name="wiz_name">lims.test.results_report</field>
         </record>
+
         <record model="ir.action.keyword" id="lims_test_results_report_keyword">
             <field name="keyword">form_relate</field>
             <field name="model">lims.quality.test,-1</field>
             <field name="action" ref="wiz_lims_test_results_report"/>
         </record>
 
-        <record model="ir.action.wizard" id="wiz_print_test">
-            <field name="name">Test Report</field>
-            <field name="wiz_name">lims.print_test</field>
-        </record>
-        <record model="ir.action.keyword" id="print_test_keyword">
-            <field name="keyword">form_print</field>
-            <field name="model">lims.quality.test,-1</field>
-            <field name="action" ref="wiz_print_test"/>
-        </record>
+<!-- Test Report -->
 
         <record model="ir.action.report" id="report_test">
             <field name="name">Test Report</field>
@@ -443,5 +457,16 @@
             <field name="extension">pdf</field>
         </record>
 
+        <record model="ir.action.wizard" id="wiz_print_test">
+            <field name="name">Test Report</field>
+            <field name="wiz_name">lims.print_test</field>
+        </record>
+
+        <record model="ir.action.keyword" id="print_test_keyword">
+            <field name="keyword">form_print</field>
+            <field name="model">lims.quality.test,-1</field>
+            <field name="action" ref="wiz_print_test"/>
+        </record>
+
     </data>
 </tryton>
diff --git a/lims_quality_control/sample.xml b/lims_quality_control/sample.xml
index 683b675..ab556e5 100644
--- a/lims_quality_control/sample.xml
+++ b/lims_quality_control/sample.xml
@@ -2,11 +2,7 @@
 <tryton>
     <data>
 
-        <record model="ir.ui.view" id="lims_workyear_view_form">
-            <field name="model">lims.lab.workyear</field>
-            <field name="inherit" ref="lims.lims_workyear_view_form"/>
-            <field name="name">workyear_form</field>
-        </record>
+<!-- Sample -->
 
         <record model="ir.ui.view" id="lims_sample_view_form">
             <field name="model">lims.sample</field>
@@ -19,6 +15,8 @@
             <field name="name">sample_list</field>
         </record>
 
+<!-- Quality Sample -->
+
         <record model="ir.ui.view" id="quality_sample_view_form">
             <field name="model">lims.sample</field>
             <field name="type">form</field>
@@ -45,6 +43,7 @@
             <field name="view" ref="quality_sample_view_form"/>
             <field name="act_window" ref="act_lims_sample_list"/>
         </record>
+
         <record model="ir.action.act_window.domain" id="act_lims_sample_list_domain_pending">
             <field name="name">Pending</field>
             <field name="sequence" eval="10"/>
@@ -70,8 +69,10 @@
             <field name="act_window" ref="act_lims_sample_list"/>
         </record>
 
-        <menuitem parent="menu_quality_control" action="act_lims_sample_list"
-            id="lims_sample_menu" sequence="30"/>
+        <menuitem action="act_lims_sample_list" id="lims_sample_menu"
+            parent="menu_quality_control" sequence="30"/>
+
+<!-- Take Sample -->
 
         <record model="ir.ui.view" id="lims_take_sample_start_view_form">
             <field name="model">lims.take.sample.start</field>
@@ -84,12 +85,15 @@
             <field name="wiz_name">lims.take.sample</field>
             <field name="model">stock.lot</field>
         </record>
+
         <record model="ir.action.keyword" id="lims_take_sample_keyword">
             <field name="keyword">form_action</field>
             <field name="model">stock.lot,-1</field>
             <field name="action" ref="wiz_lims_take_sample"/>
         </record>
 
+<!-- Countersample Create -->
+
         <record model="ir.ui.view" id="lims_countersample_create_start_view_form">
             <field name="model">lims.countersample.create.start</field>
             <field name="type">form</field>
@@ -101,12 +105,15 @@
             <field name="wiz_name">lims.countersample.create</field>
             <field name="model">lims.sample</field>
         </record>
+
         <record model="ir.action.keyword" id="lims_countersample_create_keyword">
             <field name="keyword">form_action</field>
             <field name="model">lims.sample,-1</field>
             <field name="action" ref="wiz_lims_countersample_create"/>
         </record>
 
+<!-- Sample Labels -->
+
         <record model="ir.action.report" id="report_sample_labels">
             <field name="name">Sample Labels</field>
             <field name="model">lims.sample</field>
@@ -114,6 +121,7 @@
             <field name="report">lims/report/entry_labels_report.fodt</field>
             <field name="extension">pdf</field>
         </record>
+
         <record model="ir.action.keyword" id="report_sample_labels_keyword">
             <field name="keyword">form_print</field>
             <field name="model">lims.sample,-1</field>
diff --git a/lims_quality_control/view/configuration_form.xml b/lims_quality_control/view/configuration_form.xml
index c241ffb..d7ae88d 100644
--- a/lims_quality_control/view/configuration_form.xml
+++ b/lims_quality_control/view/configuration_form.xml
@@ -1,6 +1,8 @@
 <?xml version="1.0"?>
 <data>
-    <xpath expr="/form/notebook/page[@id='fraction_type']/field[@name='itl_fraction_type']" position="after">
+    <xpath
+        expr="/form/notebook/page[@id='fraction_type']/field[@name='itl_fraction_type']"
+        position="after">
         <label name="qc_fraction_type"/>
         <field name="qc_fraction_type"/>
     </xpath>
diff --git a/lims_quality_control/view/template_form.xml b/lims_quality_control/view/template_form.xml
index 58d48b0..217f8d8 100644
--- a/lims_quality_control/view/template_form.xml
+++ b/lims_quality_control/view/template_form.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0"?>
 <data>
-    <xpath
-        expr="/form/notebook/page[@id='general']/group[@id='checkboxes']"
+    <xpath expr="/form/notebook/page[@id='general']/group[@id='checkboxes']"
         position="after">
         <label name="product_type"/>
         <field name="product_type"/>
diff --git a/lims_report_html/results_report.xml b/lims_report_html/results_report.xml
index 34b1d1f..d6c9676 100644
--- a/lims_report_html/results_report.xml
+++ b/lims_report_html/results_report.xml
@@ -46,7 +46,6 @@
         <record model="ir.action.report" id="lims.report_results_report">
             <field name="active" eval="False"/>
         </record>
-
         <record model="ir.action.report" id="report_results_report">
             <field name="name">Results Report</field>
             <field name="model">lims.results_report.version.detail</field>
@@ -55,6 +54,7 @@
             <field name="extension">pdf</field>
             <field name="template_extension">results</field>
         </record>
+
         <record model="ir.action.keyword" id="report_results_report_keyword">
             <field name="keyword">form_print</field>
             <field name="model">lims.results_report.version.detail,-1</field>
diff --git a/lims_report_html/view/results_report_version_detail_form.xml b/lims_report_html/view/results_report_version_detail_form.xml
index b4bfe1e..e69d6f2 100644
--- a/lims_report_html/view/results_report_version_detail_form.xml
+++ b/lims_report_html/view/results_report_version_detail_form.xml
@@ -1,26 +1,21 @@
 <?xml version="1.0"?>
 <data>
-    <xpath expr="/form/label[@name='report_type_forced']" position="replace">
-    </xpath>
-    <xpath expr="/form/field[@name='report_type_forced']" position="replace">
-    </xpath>
-    <xpath expr="/form/label[@name='report_result_type_forced']" position="replace">
-    </xpath>
-    <xpath expr="/form/field[@name='report_result_type_forced']" position="replace">
-    </xpath>
-    <xpath expr="/form/label[@name='report_type']" position="replace">
-    </xpath>
-    <xpath expr="/form/field[@name='report_type']" position="replace">
-    </xpath>
-    <xpath expr="/form/label[@name='report_result_type']" position="replace">
-    </xpath>
-    <xpath expr="/form/field[@name='report_result_type']" position="replace">
-    </xpath>
+    <xpath expr="/form/label[@name='report_type_forced']" position="replace"/>
+    <xpath expr="/form/field[@name='report_type_forced']" position="replace"/>
+    <xpath expr="/form/label[@name='report_result_type_forced']"
+        position="replace"/>
+    <xpath expr="/form/field[@name='report_result_type_forced']"
+        position="replace"/>
+    <xpath expr="/form/label[@name='report_type']" position="replace"/>
+    <xpath expr="/form/field[@name='report_type']" position="replace"/>
+    <xpath expr="/form/label[@name='report_result_type']" position="replace"/>
+    <xpath expr="/form/field[@name='report_result_type']" position="replace"/>
     <xpath expr="/form/label[@name='resultrange_origin']" position="before">
         <label name="template"/>
         <field name="template"/>
     </xpath>
-    <xpath expr="/form/notebook/page[@name='comments']/field[@name='comments']"
+    <xpath
+        expr="/form/notebook/page[@name='comments']/field[@name='comments']"
         position="replace">
         <field name="comments" colspan="4" widget="html"/>
     </xpath>
diff --git a/lims_report_html/view/results_report_version_detail_list.xml b/lims_report_html/view/results_report_version_detail_list.xml
index 53310cc..5672d79 100644
--- a/lims_report_html/view/results_report_version_detail_list.xml
+++ b/lims_report_html/view/results_report_version_detail_list.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0"?>
 <data>
-    <xpath expr="/tree/field[@name='report_type']" position="replace">
-    </xpath>
+    <xpath expr="/tree/field[@name='report_type']" position="replace"/>
     <xpath expr="/tree/field[@name='report_result_type']" position="replace">
         <field name="template"/>
     </xpath>
diff --git a/lims_sale/results_report.xml b/lims_sale/results_report.xml
index 48dbde8..33c00d6 100644
--- a/lims_sale/results_report.xml
+++ b/lims_sale/results_report.xml
@@ -8,6 +8,7 @@
             <field name="name">Sample Sale</field>
             <field name="wiz_name">lims.notebook.open_sale</field>
         </record>
+
         <record model="ir.action.keyword" id="wiz_notebook_open_sale_keyword">
             <field name="keyword">form_relate</field>
             <field name="model">lims.notebook,-2</field>
@@ -20,6 +21,7 @@
             <field name="name">Results Report Sales</field>
             <field name="wiz_name">lims.results_report.version.detail.open_sale</field>
         </record>
+
         <record model="ir.action.keyword" id="wiz_results_detail_open_sale_keyword">
             <field name="keyword">form_relate</field>
             <field name="model">lims.results_report.version.detail,-1</field>
diff --git a/lims_sale/sale.xml b/lims_sale/sale.xml
index dc93c78..05f50b1 100644
--- a/lims_sale/sale.xml
+++ b/lims_sale/sale.xml
@@ -10,6 +10,17 @@
             <field name="name">sale_form</field>
         </record>
 
+        <record model="ir.model.button" id="sale_load_services_button">
+            <field name="name">load_services</field>
+            <field name="string">Load Services from Entry</field>
+            <field name="model" search="[('model', '=', 'sale.sale')]"/>
+        </record>
+        <record model="ir.model.button" id="sale_load_set_group_button">
+            <field name="name">load_set_group</field>
+            <field name="string">Load Analysis from Set/Group</field>
+            <field name="model" search="[('model', '=', 'sale.sale')]"/>
+        </record>
+
 <!-- Sale Line -->
 
         <record model="ir.ui.view" id="sale_line_view_form">
@@ -42,12 +53,6 @@
             <field name="model">sale.sale</field>
         </record>
 
-        <record model="ir.model.button" id="sale_load_services_button">
-            <field name="name">load_services</field>
-            <field name="string">Load Services from Entry</field>
-            <field name="model" search="[('model', '=', 'sale.sale')]"/>
-        </record>
-
 <!-- Sale Load Analysis from Set/Group Wizard-->
 
         <record model="ir.ui.view" id="sale_load_set_group_start_view_form">
@@ -62,11 +67,5 @@
             <field name="model">sale.sale</field>
         </record>
 
-        <record model="ir.model.button" id="sale_load_set_group_button">
-            <field name="name">load_set_group</field>
-            <field name="string">Load Analysis from Set/Group</field>
-            <field name="model" search="[('model', '=', 'sale.sale')]"/>
-        </record>
-
     </data>
 </tryton>
diff --git a/lims_sale/view/configuration_form.xml b/lims_sale/view/configuration_form.xml
index 7c6634b..3d77520 100644
--- a/lims_sale/view/configuration_form.xml
+++ b/lims_sale/view/configuration_form.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0"?>
 <data>
-    <xpath expr="/form/field[@name='sale_process_after']"
-        position="after">
+    <xpath expr="/form/field[@name='sale_process_after']" position="after">
         <newline />
         <label name="email_quotation_subject"/>
         <field name="email_quotation_subject" colspan="3"/>
diff --git a/lims_sale/view/create_sample_start_form.xml b/lims_sale/view/create_sample_start_form.xml
index 7cb2ac5..f849852 100644
--- a/lims_sale/view/create_sample_start_form.xml
+++ b/lims_sale/view/create_sample_start_form.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0"?>
 <data>
-    <xpath
-        expr="/form/notebook/page[@id='general']/group[@id='trace_report']"
+    <xpath expr="/form/notebook/page[@id='general']/group[@id='trace_report']"
         position="after">
         <field name="sale_lines" colspan="4"/>
     </xpath>
diff --git a/lims_sale/view/party_form.xml b/lims_sale/view/party_form.xml
index 655d97e..a8d5bf0 100644
--- a/lims_sale/view/party_form.xml
+++ b/lims_sale/view/party_form.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0"?>
 <data>
-    <xpath expr="/form/notebook/page[@id='sale']"
-        position="inside">
+    <xpath expr="/form/notebook/page[@id='sale']" position="inside">
         <label name="internal_code"/>
         <field name="internal_code"/>
         <label name="purchase_order_required"/>
diff --git a/lims_sale/view/sale_form.xml b/lims_sale/view/sale_form.xml
index ce03cf5..23f2287 100644
--- a/lims_sale/view/sale_form.xml
+++ b/lims_sale/view/sale_form.xml
@@ -1,24 +1,19 @@
 <?xml version="1.0"?>
 <data>
-    <xpath expr="/form/field[@name='party']"
-        position="after">
+    <xpath expr="/form/field[@name='party']" position="after">
         <label name="invoice_party"/>
         <field name="invoice_party"/>
     </xpath>
-
-    <xpath expr="/form/field[@name='description']"
-        position="replace">
+    <xpath expr="/form/field[@name='description']" position="replace">
         <field name="description"/>
         <label name="purchase_order"/>
         <field name="purchase_order"/>
     </xpath>
-
     <xpath expr="/form/notebook/page[@id='sale']/field[@name='sale_date']"
         position="after">
         <label name="expiration_date"/>
         <field name="expiration_date"/>
     </xpath>
-
     <xpath expr="/form/notebook/page[@id='sale']/field[@name='lines']"
         position="before">
         <group col="3" colspan="4" id="lims_buttons">
@@ -26,16 +21,13 @@
             <button name="load_set_group"/>
         </group>
     </xpath>
-
     <xpath
         expr="/form/notebook/page[@id='other']/field[@name='shipment_method']"
         position="after">
         <label name="send_email"/>
         <field name="send_email"/>
     </xpath>
-
-    <xpath expr="/form/notebook/page[@id='other']"
-        position="after">
+    <xpath expr="/form/notebook/page[@id='other']" position="after">
         <page name="clauses">
             <field name="clauses" colspan="4" mode="tree"/>
         </page>
diff --git a/lims_sale/view/sale_line_form.xml b/lims_sale/view/sale_line_form.xml
index 0d551bd..38d8839 100644
--- a/lims_sale/view/sale_line_form.xml
+++ b/lims_sale/view/sale_line_form.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0"?>
 <data>
-    <xpath
-        expr="/form/notebook/page[@id='general']/label[@name='product']"
+    <xpath expr="/form/notebook/page[@id='general']/label[@name='product']"
         position="before">
         <label name="product_type"/>
         <field name="product_type"/>
diff --git a/lims_sale/view/sale_line_list.xml b/lims_sale/view/sale_line_list.xml
index acf49db..bc82b42 100644
--- a/lims_sale/view/sale_line_list.xml
+++ b/lims_sale/view/sale_line_list.xml
@@ -1,8 +1,6 @@
 <?xml version="1.0"?>
 <data>
-    <xpath
-        expr="/tree/field[@name='taxes']"
-        position="after">
+    <xpath expr="/tree/field[@name='taxes']" position="after">
         <field name="print_service_detail"/>
     </xpath>
 </data>
diff --git a/lims_sale/view/sale_line_list_sequence.xml b/lims_sale/view/sale_line_list_sequence.xml
index acf49db..bc82b42 100644
--- a/lims_sale/view/sale_line_list_sequence.xml
+++ b/lims_sale/view/sale_line_list_sequence.xml
@@ -1,8 +1,6 @@
 <?xml version="1.0"?>
 <data>
-    <xpath
-        expr="/tree/field[@name='taxes']"
-        position="after">
+    <xpath expr="/tree/field[@name='taxes']" position="after">
         <field name="print_service_detail"/>
     </xpath>
 </data>
diff --git a/lims_sale_industry/product.xml b/lims_sale_industry/product.xml
index 2183bbd..bb5db86 100644
--- a/lims_sale_industry/product.xml
+++ b/lims_sale_industry/product.xml
@@ -2,7 +2,7 @@
 <tryton>
     <data>
 
-<!-- Analysis/Set/Group -->
+<!-- Template -->
 
         <record model="ir.ui.view" id="template_view_form">
             <field name="model">product.template</field>
diff --git a/lims_sale_industry/sale.xml b/lims_sale_industry/sale.xml
index c4a0ec0..69898a5 100644
--- a/lims_sale_industry/sale.xml
+++ b/lims_sale_industry/sale.xml
@@ -25,6 +25,8 @@
             <field name="act_window" ref="act_sale"/>
         </record>
 
+<!-- Sale Report -->
+
         <record model="ir.action.report" id="sale.report_sale">
             <field name="report">lims_sale_industry/report/sale.fodt</field>
         </record>
@@ -59,6 +61,13 @@
 
 <!-- Print Labels Wizard -->
 
+        <record model="ir.action.report" id="report_sale_label">
+            <field name="name">Sale Labels</field>
+            <field name="model">sale.sale</field>
+            <field name="report_name">sale.label.report</field>
+            <field name="report">lims_sale_industry/report/sale_label.fodt</field>
+        </record>
+
         <record model="ir.ui.view" id="sale_print_label_start_view_form">
             <field name="model">sale.print_label.start</field>
             <field name="type">form</field>
@@ -71,13 +80,6 @@
             <field name="model">sale.sale</field>
         </record>
 
-        <record model="ir.action.report" id="report_sale_label">
-            <field name="name">Sale Labels</field>
-            <field name="model">sale.sale</field>
-            <field name="report_name">sale.label.report</field>
-            <field name="report">lims_sale_industry/report/sale_label.fodt</field>
-        </record>
-
         <record model="ir.action.keyword" id="wiz_sale_print_label_keyword">
             <field name="keyword">form_print</field>
             <field name="model">sale.sale,-1</field>
diff --git a/lims_sale_industry/view/analysis_form.xml b/lims_sale_industry/view/analysis_form.xml
index 4ebf990..069be36 100644
--- a/lims_sale_industry/view/analysis_form.xml
+++ b/lims_sale_industry/view/analysis_form.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0"?>
 <data>
-    <xpath expr="/form/group[@id='disable_as_individual']"
-        position="after">
+    <xpath expr="/form/group[@id='disable_as_individual']" position="after">
         <label name="product_kit"/>
         <field name="product_kit"/>
     </xpath>
diff --git a/lims_sale_industry/view/configuration_form.xml b/lims_sale_industry/view/configuration_form.xml
index 5b8ebe5..cf41d4c 100644
--- a/lims_sale_industry/view/configuration_form.xml
+++ b/lims_sale_industry/view/configuration_form.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0"?>
 <data>
-    <xpath expr="/form/field[@name='sale_process_after']"
-        position="after">
+    <xpath expr="/form/field[@name='sale_process_after']" position="after">
         <label name="sample_label_sequence"/>
         <field name="sample_label_sequence"/>
     </xpath>
diff --git a/lims_sale_industry/view/create_sample_start_form.xml b/lims_sale_industry/view/create_sample_start_form.xml
index 4ba6a7d..3d3c44e 100644
--- a/lims_sale_industry/view/create_sample_start_form.xml
+++ b/lims_sale_industry/view/create_sample_start_form.xml
@@ -1,10 +1,8 @@
 <?xml version="1.0"?>
 <data>
-    <xpath
-        expr="/form/notebook/page[@id='general']/field[@name='sale_lines']"
+    <xpath expr="/form/notebook/page[@id='general']/field[@name='sale_lines']"
         position="replace"/>
-    <xpath
-        expr="/form/notebook/page[@id='general']/field[@name='services']"
+    <xpath expr="/form/notebook/page[@id='general']/field[@name='services']"
         position="before">
         <field name="sale_lines" colspan="2"/>
     </xpath>
diff --git a/lims_sale_industry/view/sale_form.xml b/lims_sale_industry/view/sale_form.xml
index a87e90f..e9342b5 100644
--- a/lims_sale_industry/view/sale_form.xml
+++ b/lims_sale_industry/view/sale_form.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0"?>
 <data>
-    <xpath
-        expr="/form/notebook/page[@id='other']/field[@name='send_email']"
+    <xpath expr="/form/notebook/page[@id='other']/field[@name='send_email']"
         position="after">
         <label name="lubrication_plan"/>
         <field name="lubrication_plan"/>