diff --git a/delivery_tnt_oca/report/report_manifest.xml b/delivery_tnt_oca/report/report_manifest.xml
index f34a65162d..5cde5a0841 100644
--- a/delivery_tnt_oca/report/report_manifest.xml
+++ b/delivery_tnt_oca/report/report_manifest.xml
@@ -1,35 +1,49 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" ?>
 <odoo>
     <template id="report_tnt_manifest_document">
         <div class="header">
-            <t t-set="pick" t-value="docs[0]"></t>
+            <t t-set="pick" t-value="docs[0]" />
             <div class="row">
                 <div class="col-6">
                     <p class="mb-0"><strong>COLLECTION MANIFEST (SUMMARY)</strong></p>
-                    <p class="mb-0"><span>Sender Account:</span> <span t-field="pick.carrier_id.tnt_oca_ws_account" /></p>
-                    <p class="mb-0"><span>Sender Name:</span> <span t-field="pick.company_id.name"></span></p>
-                    <p class="mb-0"><span>Address:</span> <span t-field="pick.company_id.street"></span></p>
+                    <p class="mb-0"><span>Sender Account:</span> <span
+                            t-field="pick.carrier_id.tnt_oca_ws_account"
+                        /></p>
+                    <p class="mb-0"><span>Sender Name:</span> <span
+                            t-field="pick.company_id.name"
+                        /></p>
+                    <p class="mb-0"><span>Address:</span> <span
+                            t-field="pick.company_id.street"
+                        /></p>
                 </div>
                 <div class="col-3 pt-1">
-                    <img src="/delivery_tnt_oca/static/src/img/black_logo.jpg" style="width: 90%;object-fit: contain;"/>
+                    <img
+                        src="/delivery_tnt_oca/static/src/img/black_logo.jpg"
+                        style="width: 90%;object-fit: contain;"
+                    />
                 </div>
                 <div class="col-3">
-                    <p class="mb-0"><span t-esc="context_timestamp(datetime.datetime.now()).strftime('%d/%m/%Y %H:%M')"/></p>
+                    <p class="mb-0"><span
+                            t-esc="context_timestamp(datetime.datetime.now()).strftime('%d/%m/%Y %H:%M')"
+                        /></p>
                     <p class="mb-0">
                         <span>Page</span>
                         <span class="page"></span>
                         <span>of</span>
-                        <span class="topage"></span>
+                        <span class="topage" />
                     </p>
                 </div>
             </div>
         </div>
         <div class="article">
-            <div class="page" style="font-family:'Gilroy Light', sans-serif;font-weight: lighter;font-size: 10pt">
+            <div
+                class="page"
+                style="font-family:'Gilroy Light', sans-serif;font-weight: lighter;font-size: 10pt"
+            >
                 <div class="row" style="padding:0">
                     <table class="table">
                         <thead>
-                            <tr >
+                            <tr>
                                 <th>Con Nr</th>
                                 <th>No of Pieces</th>
                                 <th>Weight(kg)</th>
@@ -43,8 +57,8 @@
                             </tr>
                         </thead>
                         <tbody>
-                            <t t-set="total_w" t-value="0.0"></t>
-                            <t t-set="total_p" t-value="0"></t>
+                            <t t-set="total_w" t-value="0.0" />
+                            <t t-set="total_p" t-value="0" />
                             <t t-foreach="docs" t-as="doc">
                                 <tr>
                                     <td>
@@ -73,13 +87,20 @@
                                         <span t-field="doc.partner_id.city" />
                                     </td>
                                     <td>
-                                        <span t-field="doc.partner_id.country_id.name" />
+                                        <span
+                                            t-field="doc.partner_id.country_id.name"
+                                        />
                                     </td>
                                     <td>
-                                        <span t-field="doc.carrier_id.tnt_product_code_n" />
+                                        <span
+                                            t-field="doc.carrier_id.tnt_product_code_n"
+                                        />
                                     </td>
                                     <t t-set="total_w" t-value="total_w + doc.weight" />
-                                    <t t-set="total_p" t-value="total_p + doc.number_of_packages" />
+                                    <t
+                                        t-set="total_p"
+                                        t-value="total_p + doc.number_of_packages"
+                                    />
                                 </tr>
                             </t>
                         </tbody>
@@ -87,12 +108,16 @@
                 </div>
                 <div class="row mt-3" style="border-bottom:1px solid black">
                     <div class="col-12">
-                        <strong>Account</strong> <strong t-field="pick.carrier_id.tnt_oca_ws_account"></strong> <strong>Totals</strong>
+                        <strong>Account</strong> <strong
+                            t-field="pick.carrier_id.tnt_oca_ws_account"
+                        /> <strong>Totals</strong>
                     </div>
                 </div>
                 <div class="row">
                     <div class="col-12">
-                        <span t-esc="len(docs)"></span> <![CDATA[]]>        <span t-esc="total_p"></span>       <span t-esc="total_w"></span>
+                        <span t-esc="len(docs)" /> <![CDATA[]]>        <span
+                            t-esc="total_p"
+                        />       <span t-esc="total_w" />
                     </div>
                 </div>
                 <div class="row" style="border-bottom:1px solid black">
@@ -102,7 +127,9 @@
                 </div>
                 <div class="row">
                     <div class="col-12">
-                        <span t-esc="len(docs)"></span> <span t-esc="total_p"></span> <span t-esc="total_w"></span>
+                        <span t-esc="len(docs)" /> <span t-esc="total_p" /> <span
+                            t-esc="total_w"
+                        />
                     </div>
                 </div>
                 <div class="row" style="border-bottom:1px solid black">
@@ -112,24 +139,34 @@
                 </div>
                 <div class="row">
                     <div class="col-12">
-                        <span t-esc="len(docs)"></span> <span t-esc="total_p"></span> <span t-esc="total_w"></span>
+                        <span t-esc="len(docs)" /> <span t-esc="total_p" /> <span
+                            t-esc="total_w"
+                        />
                     </div>
                 </div>
                 <div class="row mt-5">
                     <div class="col-6">
-                        <p class="mb-0"><strong>Sender's Signature______________________</strong></p>
-                        <p class="mb-0 mt-5"><strong>Received by TNT_________________________</strong></p>
+                        <p class="mb-0"><strong
+                            >Sender's Signature______________________</strong></p>
+                        <p class="mb-0 mt-5"><strong
+                            >Received by TNT_________________________</strong></p>
                     </div>
                     <div class="col-6">
-                        <p class="mb-0"><strong>Date</strong> <strong t-esc="datetime.date.today()" t-options="{'widget':'date','format':'dd/MM/yyyy'}"></strong></p>
-                        <p class="mb-0 mt-5"><strong>Date: ____/____/____ Time: ____:____</strong></p>
+                        <p class="mb-0"><strong>Date</strong> <strong
+                                t-esc="datetime.date.today()"
+                                t-options="{'widget':'date','format':'dd/MM/yyyy'}"
+                            /></p>
+                        <p class="mb-0 mt-5"><strong
+                            >Date: ____/____/____ Time: ____:____</strong></p>
                     </div>
                 </div>
                 <div class="row mt-5 pt-5" style="border-bottom:1px solid black">
-                    <span>The consignment(s) has been loaded by TNT or a designated agent of TNT and a check of the number and condition of the consignment(s) has been undertaken by TNT.</span>
+                    <span
+                    >The consignment(s) has been loaded by TNT or a designated agent of TNT and a check of the number and condition of the consignment(s) has been undertaken by TNT.</span>
                 </div>
                 <div class="row" style="border-bottom:1px solid black">
-                    <span>TNT'S LIABILITY FOR LOSS, DAMAGE AND DELAY IS LIMITED BY THE CMR CONVENTION OR THE WARSAW CONVENTION WHICHEVER IS APPLICABLE. THE SENDER AGREES THAT
+                    <span
+                    >TNT'S LIABILITY FOR LOSS, DAMAGE AND DELAY IS LIMITED BY THE CMR CONVENTION OR THE WARSAW CONVENTION WHICHEVER IS APPLICABLE. THE SENDER AGREES THAT
                         THE GENERAL CONDITIONS, WHICH CAN BE VIEWED AT https://www.tnt.com/terms , ARE ACCEPTABLE AND GOVERN THIS CONTRACT. IF NO SERVICES OR BILLING OPTIONS ARE
                         SELECTED THE FASTEST AVAILABLE SERVICE WILL BE CHARGED TO THE SENDER.</span>
                 </div>
@@ -139,7 +176,7 @@
     </template>
     <template id="report_tnt_manifest">
         <t t-call="web.html_container">
-            <t t-call="delivery_tnt_oca.report_tnt_manifest_document"/>
+            <t t-call="delivery_tnt_oca.report_tnt_manifest_document" />
         </t>
     </template>
-</odoo>
\ No newline at end of file
+</odoo>
diff --git a/delivery_tnt_oca/report/report_manifest_inter.xml b/delivery_tnt_oca/report/report_manifest_inter.xml
index 36a5fd8561..91712baba3 100644
--- a/delivery_tnt_oca/report/report_manifest_inter.xml
+++ b/delivery_tnt_oca/report/report_manifest_inter.xml
@@ -1,26 +1,44 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" ?>
 <odoo>
     <template id="report_tnt_manifest_inter_document">
         <t t-call="web_custom_report.external_layout_custom_document">
-            <t t-set="doc" t-value="docs"></t>
+            <t t-set="doc" t-value="docs" />
             <div class="header" />
-            <div class="page" style="font-family:'Gilroy Light', sans-serif;font-weight: lighter;font-size: 10pt">
+            <div
+                class="page"
+                style="font-family:'Gilroy Light', sans-serif;font-weight: lighter;font-size: 10pt"
+            >
                 <div class="row" style="border:solid 1px black">
-                    <div class="col-6 overflow-hidden ps-3" style="border-right:1px solid black">
+                    <div
+                        class="col-6 overflow-hidden ps-3"
+                        style="border-right:1px solid black"
+                    >
                         <p class="mb-0"><strong>DETAILED MANIFEST</strong></p>
                         <p class="mb-0"><strong>SENDER PAYS</strong></p>
                         <p class="mb-0"><strong>Pickup id:</strong></p>
-                        <p class="mb-0"><strong>Printed on:</strong> <span t-esc="datetime.datetime.now()"/></p>
-                        <p class="mb-0"><strong>Shipment Date:</strong> <span t-field="doc.tnt_consignment_date" /></p>
-                        <p class="mb-0"><strong>Service</strong> <span t-field="doc.carrier_id.tnt_product_code"/></p>
+                        <p class="mb-0"><strong>Printed on:</strong> <span
+                                t-esc="datetime.datetime.now()"
+                            /></p>
+                        <p class="mb-0"><strong>Shipment Date:</strong> <span
+                                t-field="doc.tnt_consignment_date"
+                            /></p>
+                        <p class="mb-0"><strong>Service</strong> <span
+                                t-field="doc.carrier_id.tnt_product_code"
+                            /></p>
                         <p class="mb-0"><strong>Options</strong></p>
                     </div>
                     <div class="col-6 pt-1 ps-3 overflow-hidden">
                         <div class="text-center overflow-hidden">
-                            <img src="/delivery_tnt_oca/static/src/img/black_logo.jpg" style="width: 30%;object-fit: contain;" />
+                            <img
+                                src="/delivery_tnt_oca/static/src/img/black_logo.jpg"
+                                style="width: 30%;object-fit: contain;"
+                            />
                         </div>
                         <div class="p-2" style="text-align:center">
-                            <img t-att-src="'/report/barcode/?barcode_type=%s&amp;value=%s&amp;width=%s&amp;height=%s&amp;humanreadable=1' % ('Code128',doc.carrier_tracking_ref,800,200)" style="width:100%;height:6rem"/>
+                            <img
+                                t-att-src="'/report/barcode/?barcode_type=%s&amp;value=%s&amp;width=%s&amp;height=%s&amp;humanreadable=1' % ('Code128',doc.carrier_tracking_ref,800,200)"
+                                style="width:100%;height:6rem"
+                            />
                         </div>
                         <strong>NON DANGEROUS GOODS</strong>
                     </div>
@@ -31,33 +49,41 @@
                     </div>
                     <div class="col-6 ps-3">
                         <p class="mb-0"><strong>Shipment reference</strong></p>
-                        <span t-field="doc.name"/>
+                        <span t-field="doc.name" />
                     </div>
                 </div>
                 <div class="row" style="border:solid 1px black">
                     <div class="col-6 ps-3" style="border-right:1px solid black">
                         <strong>Sender</strong>
                         <strong>Account:</strong>
-                        <p class="mb-0" t-field="doc.carrier_id.tnt_oca_ws_account"/>
-                        <p class="mb-0" t-field="doc.company_id.name"/>
-                        <p class="mb-0" t-field="doc.company_id.street"/>
-                        <p class="mb-0" t-field="doc.company_id.city"/>
-                        <p class="mb-0" t-field="doc.company_id.zip"/>
-                        <p class="mb-0" t-field="doc.company_id.country_id.name"/>
-                        <p class="mb-0"><strong>Contact:</strong> <span t-field="doc.user_id.name"/></p>
-                        <strong>Tel No:</strong> <span t-field="doc.user_id.partner_id.phone"/>
+                        <p class="mb-0" t-field="doc.carrier_id.tnt_oca_ws_account" />
+                        <p class="mb-0" t-field="doc.company_id.name" />
+                        <p class="mb-0" t-field="doc.company_id.street" />
+                        <p class="mb-0" t-field="doc.company_id.city" />
+                        <p class="mb-0" t-field="doc.company_id.zip" />
+                        <p class="mb-0" t-field="doc.company_id.country_id.name" />
+                        <p class="mb-0"><strong>Contact:</strong> <span
+                                t-field="doc.user_id.name"
+                            /></p>
+                        <strong>Tel No:</strong> <span
+                            t-field="doc.user_id.partner_id.phone"
+                        />
                     </div>
                     <div class="col-6 ps-3">
                         <p class="mb-0"><strong>Receiver</strong></p>
-                        <p class="mb-0" t-field="doc.partner_id.name"/>
-                        <p class="mb-0" t-field="doc.partner_id.street"/>
-                        <p class="mb-0" t-field="doc.partner_id.street2"/>
-                        <p class="mb-0" t-field="doc.partner_id.city"/>
-                        <p class="mb-0" t-field="doc.partner_id.zip"/>
-                        <p class="mb-0" t-field="doc.partner_id.country_id.name"/>
-                        <p class="mb-0"><strong>Contact:</strong> <span t-field="doc.partner_id.name"/></p>
-                        <p class="mb-0"><strong>Tel No:</strong> <span t-field="doc.partner_id.phone"/></p>
-                        <strong>VAT Nr:</strong> <span t-field="doc.partner_id.vat"/>
+                        <p class="mb-0" t-field="doc.partner_id.name" />
+                        <p class="mb-0" t-field="doc.partner_id.street" />
+                        <p class="mb-0" t-field="doc.partner_id.street2" />
+                        <p class="mb-0" t-field="doc.partner_id.city" />
+                        <p class="mb-0" t-field="doc.partner_id.zip" />
+                        <p class="mb-0" t-field="doc.partner_id.country_id.name" />
+                        <p class="mb-0"><strong>Contact:</strong> <span
+                                t-field="doc.partner_id.name"
+                            /></p>
+                        <p class="mb-0"><strong>Tel No:</strong> <span
+                                t-field="doc.partner_id.phone"
+                            /></p>
+                        <strong>VAT Nr:</strong> <span t-field="doc.partner_id.vat" />
                     </div>
                 </div>
                 <div class="row" style="border:solid 1px black">
@@ -69,13 +95,17 @@
                         <p class="mb-0"><strong>Goods Description</strong></p>
                     </div>
                     <div class="col-8 ps-3">
-                        <p class="mb-0" t-field="doc.company_id.name"/>
-                        <p class="mb-0" t-field="doc.company_id.street"/>
-                        <p class="mb-0" t-field="doc.company_id.city"/> <span t-field="doc.company_id.zip"/> <span t-field="doc.company_id.country_id.name"/>
-                        <p class="mb-0" t-field="doc.partner_id.name"/>
-                        <p class="mb-0" t-field="doc.partner_id.street"/>
-                        <p class="mb-0" t-field="doc.partner_id.street2"/>
-                        <p class="mb-0" t-field="doc.partner_id.city"/> <span t-field="doc.partner_id.zip"/> <span t-field="doc.partner_id.country_id.name"/>
+                        <p class="mb-0" t-field="doc.company_id.name" />
+                        <p class="mb-0" t-field="doc.company_id.street" />
+                        <p class="mb-0" t-field="doc.company_id.city" /> <span
+                            t-field="doc.company_id.zip"
+                        /> <span t-field="doc.company_id.country_id.name" />
+                        <p class="mb-0" t-field="doc.partner_id.name" />
+                        <p class="mb-0" t-field="doc.partner_id.street" />
+                        <p class="mb-0" t-field="doc.partner_id.street2" />
+                        <p class="mb-0" t-field="doc.partner_id.city" /> <span
+                            t-field="doc.partner_id.zip"
+                        /> <span t-field="doc.partner_id.country_id.name" />
                         <p class="mb-0"><span>Lamparas</span></p>
                     </div>
                 </div>
@@ -91,7 +121,7 @@
                     </p>
                     <p class="mb-0">
                         <strong>Volume:</strong>
-                        <span t-field="doc.volume"/>
+                        <span t-field="doc.volume" />
                         <span t-field="doc.volume_uom_name" />
                     </p>
                     <p class="mb-0">
@@ -99,7 +129,7 @@
                     </p>
                     <p class="mb-0">
                         <strong>Invoice Value:</strong>
-                        <span t-field="doc.sale_id.amount_total"/>
+                        <span t-field="doc.sale_id.amount_total" />
                     </p>
                 </div>
                 <div class="mt-3">
@@ -108,33 +138,44 @@
                         <div class="col-6 ps-3">
                             <p class="mb-0"><strong>Package Description</strong></p>
                             <t t-foreach="packages" t-as="pack">
-                                <p class="mb-0" t-field="pack.name"/>
+                                <p class="mb-0" t-field="pack.name" />
                             </t>
                         </div>
                         <div class="col-6 ps-3">
                             <p class="mb-0"><strong>Dimensions (L x W x H)</strong></p>
                             <t t-foreach="packages" t-as="pack">
                                 <p class="mb-0">
-                                    <span t-field="pack.pack_length" /> <span t-field="pack.length_uom_name" /> x
-                                    <span t-field="pack.width" /> <span t-field="pack.length_uom_name"/> x
-                                    <span t-field="pack.height" /> <span t-field="pack.length_uom_name"/>
+                                    <span t-field="pack.pack_length" /> <span
+                                        t-field="pack.length_uom_name"
+                                    /> x
+                                    <span t-field="pack.width" /> <span
+                                        t-field="pack.length_uom_name"
+                                    /> x
+                                    <span t-field="pack.height" /> <span
+                                        t-field="pack.length_uom_name"
+                                    />
                                 </p>
                             </t>
                         </div>
                     </div>
                 </div>
-                <div class="row mt-5" >
+                <div class="row mt-5">
                     <div class="col-6">
-                        <p class="mb-0"><strong>Sender's Signature______________________</strong></p>
+                        <p class="mb-0"><strong
+                            >Sender's Signature______________________</strong></p>
                         <p class="mb-0 mt-5"><strong>Date: ____/____/____</strong></p>
                     </div>
                     <div class="col-6">
-                        <p class="mb-0"><strong>Received by TNT (Name): ___________________________</strong></p>
-                        <p class="mb-0 mt-5"><strong>Date: ____/____/____ Time: ____:____</strong></p>
+                        <p class="mb-0"><strong
+                            >Received by TNT (Name): ___________________________</strong></p>
+                        <p class="mb-0 mt-5"><strong
+                            >Date: ____/____/____ Time: ____:____</strong></p>
                     </div>
                 </div>
                 <div class="row mt-5">
-                    <span style="font-size:6pt">TNT'S LIABILITY FOR LOSS, DAMAGE AND DELAY IS LIMITED BY THE CMR CONVENTION OR THE WARSAW CONVENTION WHICHEVER IS APPLICABLE. THE SENDER AGREES THAT THE GENERAL CONDITIONS, WHICH
+                    <span
+                        style="font-size:6pt"
+                    >TNT'S LIABILITY FOR LOSS, DAMAGE AND DELAY IS LIMITED BY THE CMR CONVENTION OR THE WARSAW CONVENTION WHICHEVER IS APPLICABLE. THE SENDER AGREES THAT THE GENERAL CONDITIONS, WHICH
                     CAN BE VIEWED AT HTTPS://WWW.TNT.COM/TERMS , ARE ACCEPTABLE AND GOVERN THIS CONTRACT. IF NO SERVICES OR BILLING OPTIONS ARE SELECTED THE FASTEST AVAILABLE SERVICE WILL BE CHARGED TO
                     THE SENDER.</span>
                 </div>
@@ -144,7 +185,7 @@
     </template>
     <template id="report_tnt_manifest_inter">
         <t t-call="web.html_container">
-            <t t-call="delivery_tnt_oca.report_tnt_manifest_inter_document"/>
+            <t t-call="delivery_tnt_oca.report_tnt_manifest_inter_document" />
         </t>
     </template>
-</odoo>
\ No newline at end of file
+</odoo>
diff --git a/delivery_tnt_oca/report/stock_report_views.xml b/delivery_tnt_oca/report/stock_report_views.xml
index ba791cac0f..ef6f991dc5 100644
--- a/delivery_tnt_oca/report/stock_report_views.xml
+++ b/delivery_tnt_oca/report/stock_report_views.xml
@@ -2,7 +2,7 @@
 <odoo>
     <record id="tnt_manifest_label_paperformat" model="report.paperformat">
         <field name="name">TNT Label Manifest</field>
-        <field name="default" eval="True"/>
+        <field name="default" eval="True" />
         <field name="format">A4</field>
         <field name="page_height">0</field>
         <field name="page_width">0</field>
@@ -11,13 +11,13 @@
         <field name="margin_bottom">5</field>
         <field name="margin_left">5</field>
         <field name="margin_right">5</field>
-        <field name="header_line" eval="True"/>
+        <field name="header_line" eval="True" />
         <field name="header_spacing">25</field>
         <field name="dpi">96</field>
     </record>
     <record id="tnt_manifest_inter_label_paperformat" model="report.paperformat">
         <field name="name">TNT International Label Manifest</field>
-        <field name="default" eval="True"/>
+        <field name="default" eval="True" />
         <field name="format">A4</field>
         <field name="page_height">0</field>
         <field name="page_width">0</field>
@@ -26,7 +26,7 @@
         <field name="margin_bottom">5</field>
         <field name="margin_left">5</field>
         <field name="margin_right">5</field>
-        <field name="header_line" eval="True"/>
+        <field name="header_line" eval="True" />
         <field name="header_spacing">0</field>
         <field name="dpi">96</field>
     </record>
@@ -76,12 +76,8 @@
         <field name="name">TNT Manifest</field>
         <field name="model">stock.picking</field>
         <field name="report_type">qweb-pdf</field>
-        <field
-            name="report_name"
-        >delivery_tnt_oca.report_tnt_manifest</field>
-        <field
-            name="report_file"
-        >delivery_tnt_oca.report_tnt_manifest</field>
+        <field name="report_name">delivery_tnt_oca.report_tnt_manifest</field>
+        <field name="report_file">delivery_tnt_oca.report_tnt_manifest</field>
         <field
             name="print_report_name"
         >'TNT Manifest-%s.pdf' % (object.carrier_tracking_ref,)</field>
@@ -92,12 +88,8 @@
         <field name="name">TNT International manifest</field>
         <field name="model">stock.picking</field>
         <field name="report_type">qweb-pdf</field>
-        <field
-            name="report_name"
-        >delivery_tnt_oca.report_tnt_manifest_inter</field>
-        <field
-            name="report_file"
-        >delivery_tnt_oca.report_tnt_manifest_inter</field>
+        <field name="report_name">delivery_tnt_oca.report_tnt_manifest_inter</field>
+        <field name="report_file">delivery_tnt_oca.report_tnt_manifest_inter</field>
         <field
             name="print_report_name"
         >'TNT Inter. Manifest-%s.pdf' % (object.carrier_tracking_ref,)</field>