diff --git a/contract/README.rst b/contract/README.rst
index d5ece243b..7abcdde55 100644
--- a/contract/README.rst
+++ b/contract/README.rst
@@ -149,6 +149,10 @@ Contributors
 
 -  Iván Antón <ozono@ozonomultimedia.com>
 
+-  `APSL <https://www.apsl.tech>`__:
+
+      -  Antoni Marroig <amarroig@apsl.net>
+
 Maintainers
 -----------
 
diff --git a/contract/readme/CONTRIBUTORS.md b/contract/readme/CONTRIBUTORS.md
index ebd34b4fb..10c934c1c 100644
--- a/contract/readme/CONTRIBUTORS.md
+++ b/contract/readme/CONTRIBUTORS.md
@@ -21,3 +21,7 @@
   > - Víctor Martínez
 
 - Iván Antón \<<ozono@ozonomultimedia.com>\>
+
+- [APSL](https://www.apsl.tech):
+
+  > - Antoni Marroig \<<amarroig@apsl.net>\>
diff --git a/contract/report/contract_views.xml b/contract/report/contract_views.xml
index 0cfef5eac..fa4e07ec1 100644
--- a/contract/report/contract_views.xml
+++ b/contract/report/contract_views.xml
@@ -5,7 +5,7 @@
         <field name="name">Contract</field>
         <field name="model">contract.contract</field>
         <field name="report_type">qweb-pdf</field>
-        <field name="report_name">contract.report_contract_document</field>
+        <field name="report_name">contract.report_contract_template</field>
         <field name="report_file">contract.report_contract</field>
         <field name="binding_model_id" ref="model_contract_contract" />
         <field name="binding_type">report</field>
diff --git a/contract/report/report_contract.xml b/contract/report/report_contract.xml
index 2954ce5c8..4eed574b8 100644
--- a/contract/report/report_contract.xml
+++ b/contract/report/report_contract.xml
@@ -1,209 +1,192 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <odoo>
     <template id="report_contract_document">
-        <t t-call="web.html_container">
-            <t t-foreach="docs" t-as="o">
-                <t t-call="web.external_layout">
-                    <t t-set="o" t-value="o.with_context(lang=o.partner_id.lang)" />
-                    <t t-set="address">
-                        <p id="partner_info">
-                            <strong>Partner:</strong>
+        <t t-call="web.external_layout">
+            <t t-set="o" t-value="o.with_context(lang=lang)" />
+            <t t-set="address">
+                <p id="partner_info">
+                    <strong>Partner:</strong>
+                </p>
+                <div
+                    t-field="o.partner_id"
+                    t-options='{"widget": "contact", "fields": ["address", "name", "phone", "mobile", "fax", "email"], "no_marker": true, "phone_icons": true}'
+                />
+                <p t-if="o.partner_id.vat">VAT: <span t-field="o.partner_id.vat" /></p>
+            </t>
+            <div class="page">
+                <div class="oe_structure" />
+                <div class="row" id="header_info">
+                    <div class="col-3">
+                        <strong>Responsible: </strong>
+                        <p t-field="o.user_id" />
+                        <strong>Contract: </strong>
+                        <p t-field="o.code" />
+                    </div>
+                </div>
+                <div class="row" id="invoice_info">
+                    <t t-set="total" t-value="0" />
+                    <div class="col-12">
+                        <p id="services_info">
+                            <strong>Recurring Items</strong>
                         </p>
-                        <div
-                            t-field="o.partner_id"
-                            t-options='{"widget": "contact", "fields": ["address", "name", "phone", "mobile", "fax", "email"], "no_marker": true, "phone_icons": true}'
-                        />
-                        <p t-if="o.partner_id.vat">VAT: <span
-                                t-field="o.partner_id.vat"
-                            /></p>
-                    </t>
-                    <div class="page">
-                        <div class="oe_structure" />
-                        <div class="row" id="header_info">
-                            <div class="col-3">
-                                <strong>Responsible: </strong>
-                                <p t-field="o.user_id" />
-                                <strong>Contract: </strong>
-                                <p t-field="o.code" />
-                            </div>
-                        </div>
-                        <div class="row" id="invoice_info">
-                            <t t-set="total" t-value="0" />
-                            <div class="col-12">
-                                <p id="services_info">
-                                    <strong>Recurring Items</strong>
-                                </p>
-                                <table class="table table-sm">
-                                    <thead>
-                                        <tr>
-                                            <th>
-                                                <strong>Description</strong>
-                                            </th>
-                                            <th class="text-right">
-                                                <strong>Quantity</strong>
-                                            </th>
-                                            <th class="text-right">
-                                                <strong>Unit Price</strong>
-                                            </th>
-                                            <th class="text-right">
-                                                <strong>Price</strong>
-                                            </th>
-                                            <th class="text-right">
-                                                <strong>Date Start</strong>
-                                            </th>
-                                        </tr>
-                                    </thead>
-                                    <tbody>
-                                        <t t-set="current_subtotal" t-value="0" />
-                                        <t t-foreach="o.contract_line_ids" t-as="l">
+                        <table class="table table-sm">
+                            <thead>
+                                <tr>
+                                    <th>
+                                        <strong>Description</strong>
+                                    </th>
+                                    <th class="text-right">
+                                        <strong>Quantity</strong>
+                                    </th>
+                                    <th class="text-right">
+                                        <strong>Unit Price</strong>
+                                    </th>
+                                    <th class="text-right">
+                                        <strong>Price</strong>
+                                    </th>
+                                    <th class="text-right">
+                                        <strong>Date Start</strong>
+                                    </th>
+                                </tr>
+                            </thead>
+                            <tbody>
+                                <t t-set="current_subtotal" t-value="0" />
+                                <t t-foreach="o.contract_line_ids" t-as="l">
+                                    <t
+                                        t-set="current_subtotal"
+                                        t-value="current_subtotal + l.price_subtotal"
+                                    />
+                                    <tr
+                                        t-att-class="'bg-200 font-weight-bold o_line_section' if l.display_type == 'line_section' else 'font-italic o_line_note' if l.display_type == 'line_note' else ''"
+                                    >
+                                        <t t-if="not l.display_type">
+                                            <td>
+                                                <span t-field="l.name" />
+                                            </td>
+                                            <td class="text-right">
+                                                <span t-field="l.quantity" />
+                                            </td>
+                                            <td class="text-right">
+                                                <span
+                                                    t-field="l.price_unit"
+                                                    t-options='{"widget": "monetary", "display_currency": o.currency_id}'
+                                                />
+                                            </td>
+                                            <td class="text-right">
+                                                <span
+                                                    t-field="l.price_subtotal"
+                                                    t-options='{"widget": "monetary", "display_currency": o.currency_id}'
+                                                />
+                                            </td>
+                                            <td class="text-right">
+                                                <span t-field="l.date_start" />
+                                            </td>
                                             <t
-                                                t-set="current_subtotal"
-                                                t-value="current_subtotal + l.price_subtotal"
+                                                t-set="total"
+                                                t-value="total + l.price_subtotal"
                                             />
-                                            <tr
-                                                t-att-class="'bg-200 font-weight-bold o_line_section' if l.display_type == 'line_section' else 'font-italic o_line_note' if l.display_type == 'line_note' else ''"
-                                            >
-                                                <t t-if="not l.display_type">
-                                                    <td>
-                                                        <span t-field="l.name" />
-                                                    </td>
-                                                    <td class="text-right">
-                                                        <span t-field="l.quantity" />
-                                                    </td>
-                                                    <td class="text-right">
-                                                        <span
-                                                            t-field="l.price_unit"
-                                                            t-options='{"widget": "monetary", "display_currency": o.currency_id}'
-                                                        />
-                                                    </td>
-                                                    <td class="text-right">
-                                                        <span
-                                                            t-field="l.price_subtotal"
-                                                            t-options='{"widget": "monetary", "display_currency": o.currency_id}'
-                                                        />
-                                                    </td>
-                                                    <td class="text-right">
-                                                        <span t-field="l.date_start" />
-                                                    </td>
-                                                    <t
-                                                        t-set="total"
-                                                        t-value="total + l.price_subtotal"
-                                                    />
-                                                </t>
-                                                <t
-                                                    t-if="l.display_type == 'line_section'"
-                                                >
-                                                    <td colspan="99">
-                                                        <span t-field="l.name" />
-                                                    </td>
-                                                    <t
-                                                        t-set="current_section"
-                                                        t-value="l"
-                                                    />
-                                                    <t
-                                                        t-set="current_subtotal"
-                                                        t-value="0"
-                                                    />
-                                                </t>
-                                                <t t-if="l.display_type == 'line_note'">
-                                                    <td colspan="99">
-                                                        <span t-field="l.name" />
-                                                    </td>
-                                                </t>
-                                            </tr>
-                                            <t
-                                                t-if="current_section and (l_last or o.contract_line_ids[l_index+1].display_type == 'line_section')"
-                                            >
-                                                <tr class="is-subtotal text-right">
-                                                    <td colspan="99">
-                                                        <strong
-                                                            class="mr16"
-                                                        >Subtotal</strong>
-                                                        <span
-                                                            t-esc="current_subtotal"
-                                                            t-options='{"widget": "monetary", "display_currency": o.currency_id}'
-                                                        />
-                                                    </td>
-                                                </tr>
-                                            </t>
                                         </t>
-                                    </tbody>
-                                </table>
-                            </div>
-                        </div>
-                        <div
-                            class="row"
-                            id="modification_info"
-                            t-if="o.modification_ids"
-                        >
-                            <div class="col-12">
-                                <p id="modification_info_p">
-                                    <strong>Modifications</strong>
-                                </p>
-                                <table class="table table-sm">
-                                    <thead>
-                                        <tr>
-                                            <th name="th_date">Date</th>
-                                            <th
-                                                name="th_description"
-                                                class="text-right"
-                                            >Description</th>
+                                        <t t-if="l.display_type == 'line_section'">
+                                            <td colspan="99">
+                                                <span t-field="l.name" />
+                                            </td>
+                                            <t t-set="current_section" t-value="l" />
+                                            <t t-set="current_subtotal" t-value="0" />
+                                        </t>
+                                        <t t-if="l.display_type == 'line_note'">
+                                            <td colspan="99">
+                                                <span t-field="l.name" />
+                                            </td>
+                                        </t>
+                                    </tr>
+                                    <t
+                                        t-if="current_section and (l_last or o.contract_line_ids[l_index+1].display_type == 'line_section')"
+                                    >
+                                        <tr class="is-subtotal text-right">
+                                            <td colspan="99">
+                                                <strong class="mr16">Subtotal</strong>
+                                                <span
+                                                    t-esc="current_subtotal"
+                                                    t-options='{"widget": "monetary", "display_currency": o.currency_id}'
+                                                />
+                                            </td>
                                         </tr>
-                                    </thead>
-                                    <tbody>
-                                        <t
-                                            t-foreach="o.modification_ids"
-                                            t-as="notification_id"
-                                        >
-                                            <tr>
-                                                <td name="td_date">
-                                                    <span
-                                                        t-field="notification_id.date"
-                                                    />
-                                                </td>
-                                                <td
-                                                    name="td_description"
-                                                    class="text-right"
-                                                >
-                                                    <div
-                                                        t-field="notification_id.description"
-                                                    />
-                                                </td>
-                                            </tr>
-                                        </t>
-                                    </tbody>
-                                </table>
-                            </div>
-                        </div>
-                        <div id="total" class="row" name="total">
-                            <div class="col-4 ml-auto">
-                                <table class="table table-sm">
-                                    <tr class="border-black o_subtotal" style="">
-                                        <td>
-                                            <strong>Total</strong>
+                                    </t>
+                                </t>
+                            </tbody>
+                        </table>
+                    </div>
+                </div>
+                <div class="row" id="modification_info" t-if="o.modification_ids">
+                    <div class="col-12">
+                        <p id="modification_info_p">
+                            <strong>Modifications</strong>
+                        </p>
+                        <table class="table table-sm">
+                            <thead>
+                                <tr>
+                                    <th name="th_date">Date</th>
+                                    <th
+                                        name="th_description"
+                                        class="text-right"
+                                    >Description</th>
+                                </tr>
+                            </thead>
+                            <tbody>
+                                <t
+                                    t-foreach="o.modification_ids"
+                                    t-as="notification_id"
+                                >
+                                    <tr>
+                                        <td name="td_date">
+                                            <span t-field="notification_id.date" />
                                         </td>
-                                        <td class="text-right">
-                                            <span
-                                                t-esc="total"
-                                                t-options='{"widget": "monetary", "display_currency": o.currency_id}'
+                                        <td name="td_description" class="text-right">
+                                            <div
+                                                t-field="notification_id.description"
                                             />
                                         </td>
                                     </tr>
-                                </table>
-                            </div>
-                        </div>
+                                </t>
+                            </tbody>
+                        </table>
+                    </div>
+                </div>
+                <div id="total" class="row" name="total">
+                    <div class="col-4 ml-auto">
+                        <table class="table table-sm">
+                            <tr class="border-black o_subtotal" style="">
+                                <td>
+                                    <strong>Total</strong>
+                                </td>
+                                <td class="text-right">
+                                    <span
+                                        t-esc="total"
+                                        t-options='{"widget": "monetary", "display_currency": o.currency_id}'
+                                    />
+                                </td>
+                            </tr>
+                        </table>
+                    </div>
+                </div>
+                <div>
+                    <div class="row mt-4" id="note">
                         <div>
-                            <div class="row mt-4" id="note">
-                                <div>
-                                    <strong>Notes: </strong>
-                                </div>
-                            </div>
-                            <div class="row">
-                                <p t-field="o.note" />
-                            </div>
+                            <strong>Notes: </strong>
                         </div>
                     </div>
-                </t>
+                    <div class="row">
+                        <p t-field="o.note" />
+                    </div>
+                </div>
+            </div>
+        </t>
+    </template>
+    <template id="report_contract_template">
+        <t t-call="web.html_container">
+            <t t-foreach="docs" t-as="o">
+                <t t-set="lang" t-value="o.partner_id.lang" />
+                <t t-call="contract.report_contract_document" t-lang="lang" />
             </t>
         </t>
     </template>
diff --git a/contract/static/description/index.html b/contract/static/description/index.html
index cd5b5102e..9945267d7 100644
--- a/contract/static/description/index.html
+++ b/contract/static/description/index.html
@@ -492,6 +492,13 @@ If you spotted it first, help us to smash it by providing a detailed and welcome
 </li>
 <li><p class="first">Iván Antón &lt;<a class="reference external" href="mailto:ozono&#64;ozonomultimedia.com">ozono&#64;ozonomultimedia.com</a>&gt;</p>
 </li>
+<li><p class="first"><a class="reference external" href="https://www.apsl.tech">APSL</a>:</p>
+<blockquote>
+<ul class="simple">
+<li>Antoni Marroig &lt;<a class="reference external" href="mailto:amarroig&#64;apsl.net">amarroig&#64;apsl.net</a>&gt;</li>
+</ul>
+</blockquote>
+</li>
 </ul>
 </div>
 <div class="section" id="maintainers">