diff --git a/l10n_it_pos_fatturapa/README.rst b/l10n_it_pos_fatturapa/README.rst
index e89fda895c24..25a7cbd24a66 100644
--- a/l10n_it_pos_fatturapa/README.rst
+++ b/l10n_it_pos_fatturapa/README.rst
@@ -23,7 +23,7 @@ ITA - POS - Fattura elettronica
     :target: https://runbot.odoo-community.org/runbot/122/12.0
     :alt: Try me on Runbot
 
-|badge1| |badge2| |badge3| |badge4| |badge5| 
+|badge1| |badge2| |badge3| |badge4| |badge5|
 
 **Italiano**
 
@@ -62,6 +62,8 @@ Contributors
 ~~~~~~~~~~~~
 
 * Roberto Fichera <roberto.fichera@levelprime.com>
+* berim <info@berim.it>
+* Ooops404 <info@ooops404.com>
 
 Maintainers
 ~~~~~~~~~~~
@@ -82,7 +84,7 @@ promote its widespread use.
 
 Current `maintainer <https://odoo-community.org/page/maintainer-role>`__:
 
-|maintainer-robyf70| 
+|maintainer-robyf70|
 
 This module is part of the `OCA/l10n-italy <https://github.com/OCA/l10n-italy/tree/12.0/l10n_it_pos_fatturapa>`_ project on GitHub.
 
diff --git a/l10n_it_pos_fatturapa/__manifest__.py b/l10n_it_pos_fatturapa/__manifest__.py
index e3735c716e3c..6964df6ea092 100644
--- a/l10n_it_pos_fatturapa/__manifest__.py
+++ b/l10n_it_pos_fatturapa/__manifest__.py
@@ -1,17 +1,14 @@
-# Copyright 2019 Roberto Fichera
 # License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl).
 
 {
     "name": "ITA - POS - Fattura elettronica",
-    "summary": "Gestione dati fattura elettronica del cliente all'interno "
-               "dell'interfaccia del POS",
-    "version": "12.0.1.0.2",
+    "summary": "Gestione dati fattura elettronica del cliente all'interno"
+    "dell'interfaccia del POS",
+    "version": "14.0.1.0.0",
     "development_status": "Beta",
     "category": "Point Of Sale",
-    "website": "https://github.com/OCA/l10n-italy"
-               "/tree/12.0/l10n_it_pos_fatturapa",
-    "author": "Roberto Fichera, Odoo Community Association (OCA)",
-    "maintainers": ["robyf70"],
+    "website": "https://github.com/OCA/l10n-italy",
+    "author": "Odoo Community Association (OCA)",
     "license": "AGPL-3",
     "application": False,
     "installable": True,
@@ -21,10 +18,8 @@
         "l10n_it_pos_fiscalcode",
         "l10n_it_fatturapa",
     ],
-    'qweb': [
-        'static/src/xml/pos.xml'
-    ],
-    'data': [
-        'views/assets.xml',
+    "qweb": ["static/src/xml/pos_dump.xml"],
+    "data": [
+        "views/assets.xml",
     ],
 }
diff --git a/l10n_it_pos_fatturapa/models/res_partner.py b/l10n_it_pos_fatturapa/models/res_partner.py
index 4efed824bd58..0628f9e15f56 100644
--- a/l10n_it_pos_fatturapa/models/res_partner.py
+++ b/l10n_it_pos_fatturapa/models/res_partner.py
@@ -1,19 +1,22 @@
-# Copyright 2019 Roberto Fichera
 # License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl).
 
 from odoo import api, models
 
 
 class ResPartner(models.Model):
-    _inherit = 'res.partner'
+    _inherit = "res.partner"
 
     @api.model
     def create_from_ui(self, partner):
-        if 'electronic_invoice_subjected' in partner:
-            electronic_invoice_subjected = \
-                partner['electronic_invoice_subjected'] == 'true'
-            partner['electronic_invoice_subjected'] = \
-                electronic_invoice_subjected
-            partner['electronic_invoice_obliged_subject'] = \
-                electronic_invoice_subjected
+        if "electronic_invoice_subjected" in partner:
+            electronic_invoice_subjected = bool(
+                partner.get("electronic_invoice_subjected")
+            )
+
+            partner.update(
+                {
+                    "electronic_invoice_subjected": electronic_invoice_subjected,
+                    "electronic_invoice_obliged_subject": electronic_invoice_subjected,
+                }
+            )
         return super(ResPartner, self).create_from_ui(partner)
diff --git a/l10n_it_pos_fatturapa/readme/CONTRIBUTORS.rst b/l10n_it_pos_fatturapa/readme/CONTRIBUTORS.rst
index 1577ff9176ae..17c1e999643e 100644
--- a/l10n_it_pos_fatturapa/readme/CONTRIBUTORS.rst
+++ b/l10n_it_pos_fatturapa/readme/CONTRIBUTORS.rst
@@ -1 +1,3 @@
 * Roberto Fichera <roberto.fichera@levelprime.com>
+* berim <info@berim.it>
+* Ooops404 <info@ooops404.com>
diff --git a/l10n_it_pos_fatturapa/static/src/js/ClientDetailsEdit.js b/l10n_it_pos_fatturapa/static/src/js/ClientDetailsEdit.js
new file mode 100644
index 000000000000..88a62dd6f11d
--- /dev/null
+++ b/l10n_it_pos_fatturapa/static/src/js/ClientDetailsEdit.js
@@ -0,0 +1,26 @@
+odoo.define("l10n_it_pos_fatturapa.ClientDetailsEdit", function (require) {
+    "use strict";
+
+    const ClientDetailsEdit = require("point_of_sale.ClientDetailsEdit");
+    const Registries = require("point_of_sale.Registries");
+
+    const PosClientDetailsEditCode = (ClientDetailsEdit) =>
+        class extends ClientDetailsEdit {
+            captureChange(event) {
+                super.captureChange(event);
+                if (event.target.name === "electronic_invoice_subjected") {
+                    const checked = event.currentTarget.checked;
+                    this.changes[event.target.name] = Boolean(checked);
+                    $(".electronic_invoice_subjected")
+                        .toArray()
+                        .forEach(function (el) {
+                            $(el).css("display", checked ? "block" : "none");
+                        });
+                }
+            }
+        };
+
+    Registries.Component.extend(ClientDetailsEdit, PosClientDetailsEditCode);
+
+    return ClientDetailsEdit;
+});
diff --git a/l10n_it_pos_fatturapa/static/src/js/models.js b/l10n_it_pos_fatturapa/static/src/js/models.js
index 71f201451da4..1229609cc496 100644
--- a/l10n_it_pos_fatturapa/static/src/js/models.js
+++ b/l10n_it_pos_fatturapa/static/src/js/models.js
@@ -1,11 +1,13 @@
-odoo.define('l10n_it_pos_fatturapa.models', function (require) {
+odoo.define("l10n_it_pos_fatturapa.models", function (require) {
     "use strict";
 
-  var pos_models = require('point_of_sale.models');
-
-  pos_models.load_fields("res.partner",
-    ["electronic_invoice_subjected", "eori_code",
-     "codice_destinatario", "pec_destinatario",
-     "pa_partner_code"]);
+    var pos_models = require("point_of_sale.models");
 
+    pos_models.load_fields("res.partner", [
+        "electronic_invoice_subjected",
+        "eori_code",
+        "codice_destinatario",
+        "pec_destinatario",
+        "ipa_code",
+    ]);
 });
diff --git a/l10n_it_pos_fatturapa/static/src/js/screens.js b/l10n_it_pos_fatturapa/static/src/js/screens.js
deleted file mode 100644
index 62302840ef49..000000000000
--- a/l10n_it_pos_fatturapa/static/src/js/screens.js
+++ /dev/null
@@ -1,19 +0,0 @@
-odoo.define('l10n_it_pos_fatturapa.screens', function (require) {
-    "use strict";
-
-    var Screens = require('point_of_sale.screens');
-
-    Screens.ClientListScreenWidget.include({
-
-        display_client_details: function(visibility,partner,clickpos){
-            var self = this;
-            this._super.apply(self, arguments);
-            if (visibility === 'edit') {
-                this.$('.electronic_invoice_subjected').off('change').on('change', function(event) {
-                    this.value = this.checked;
-                    $('#electronic_invoice_subjected').css('display', this.checked ? 'block' : 'none');
-                });
-            }
-        },
-     });
-});
diff --git a/l10n_it_pos_fatturapa/static/src/xml/pos.xml b/l10n_it_pos_fatturapa/static/src/xml/pos.xml
deleted file mode 100644
index bdd835de4df9..000000000000
--- a/l10n_it_pos_fatturapa/static/src/xml/pos.xml
+++ /dev/null
@@ -1,60 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<templates id="template" xml:space="preserve">
-
-    <t t-extend="ClientDetails">
-        <t t-jquery=".client-details-right" t-operation="append">
-            <div class='client-detail'>
-                <t t-if="partner.electronic_invoice_subjected">
-                    <span class='label'>e-Invoice</span>
-                    <input type="checkbox" class='detail o_checkbox electronic_invoice_subjected'
-                           t-att-checked="partner.electronic_invoice_subjected ? 'checked' : null" disabled="disabled"
-                           t-att-value="partner.electronic_invoice_subjected"/><br/>
-
-                    <div id="electronic_invoice_subjected" t-attf-style="display: #{partner.electronic_invoice_subjected ? 'block': 'none'};">
-                        <div class="client-detail">
-                            <span class='label'>Code</span>
-                            <span class='detail codice_destinatario'><t t-esc='partner.codice_destinatario or ""'/></span><br/>
-
-                            <span class='label'>PEC</span>
-                            <span class='detail pec_destinatario'><t t-esc='partner.pec_destinatario or ""'/></span><br/>
-
-                            <span class='label'>EORI</span>
-                            <span class='detail eori_code'><t t-esc='partner.eori_code or ""'/></span><br/>
-
-                            <span class='label'>iPA Code</span>
-                            <span class='detail pa_partner_code'><t t-esc='partner.pa_partner_code or ""'/></span>
-                        </div>
-                    </div>
-                </t>
-            </div>
-        </t>
-    </t>
-
-    <t t-extend="ClientDetailsEdit">
-        <t t-jquery=".client-details-right" t-operation="append">
-            <div class='client-detail'>
-                <span class='label'>e-Invoice</span>
-                <input type='checkbox' class='detail o_checkbox checkbox electronic_invoice_subjected'
-                       name='electronic_invoice_subjected' t-att-checked="partner.electronic_invoice_subjected ? 'checked' : null"
-                       t-att-value="partner.electronic_invoice_subjected"/>
-
-                <div id="electronic_invoice_subjected" t-attf-style="display: #{partner.electronic_invoice_subjected ? 'block': 'none'};">
-                    <div class='client-detail'>
-                        <span class='label'>Code</span>
-                        <input class='detail codice_destinatario' name='codice_destinatario' t-att-value="partner.codice_destinatario or '0000000'"/>
-
-                        <span class='label'>PEC</span>
-                        <input class='detail pec_destinatario' name='pec_destinatario' t-att-value="partner.pec_destinatario or ''"/>
-
-                        <span class='label'>EORI</span>
-                        <input class='detail eori_code' name='eori_code' t-att-value="partner.eori_code or ''"/>
-
-                        <span class='label'>iPA Code</span>
-                        <input class='detail pa_partner_code' name='pa_partner_code' t-att-value="partner.pa_partner_code or ''"/>
-                    </div>
-                </div>
-            </div>
-        </t>
-    </t>
-
-</templates>
diff --git a/l10n_it_pos_fatturapa/static/src/xml/pos_dump.xml b/l10n_it_pos_fatturapa/static/src/xml/pos_dump.xml
new file mode 100644
index 000000000000..651474d3c47c
--- /dev/null
+++ b/l10n_it_pos_fatturapa/static/src/xml/pos_dump.xml
@@ -0,0 +1,62 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<templates id="template" xml:space="preserve">
+
+    <t t-inherit="point_of_sale.ClientDetailsEdit" t-inherit-mode="extension">
+        <xpath expr="//div[@class='client-details-right']" position="inside">
+            <div class="client-detail">
+                <span class='label'>e-Invoice</span>
+                <input
+                    type='checkbox'
+                    class='detail o_checkbox'
+                    name='electronic_invoice_subjected'
+                    t-att-checked="props.partner.electronic_invoice_subjected ? 'checked' : null"
+                    t-on-change="captureChange"
+                    t-att-value="props.partner.electronic_invoice_subjected"
+                />
+            </div>
+            <div
+                class="electronic_invoice_subjected"
+                t-on-change="captureChange"
+                t-attf-style="display: {{props.partner.electronic_invoice_subjected ? 'block': 'none'}};"
+            >
+                <div class="client-detail">
+                    <span class='label'>Code</span>
+                    <input
+                        class='detail codice_destinatario'
+                        name='codice_destinatario'
+                        t-on-change="captureChange"
+                        t-att-value="props.partner.codice_destinatario || ''"
+                    />
+                </div>
+                <div class="client-detail">
+                    <span class='label'>PEC</span>
+                    <input
+                        class='detail pec_destinatario'
+                        name='pec_destinatario'
+                        t-on-change="captureChange"
+                        t-att-value="props.partner.pec_destinatario || ''"
+                    />
+                </div>
+                <div class="client-detail">
+                    <span class='label'>EORI</span>
+                    <input
+                        class='detail eori_code'
+                        name='eori_code'
+                        t-on-change="captureChange"
+                        t-att-value="props.partner.eori_code || ''"
+                    />
+                </div>
+                <div class="client-detail">
+                    <span class='label'>iPA Code</span>
+                     <input
+                        class='detail pa_partner_code'
+                        name='ipa_code'
+                        t-on-change="captureChange"
+                        t-att-value="props.partner.ipa_code || ''"
+                    />
+                </div>
+            </div>
+        </xpath>
+    </t>
+
+</templates>
diff --git a/l10n_it_pos_fatturapa/views/assets.xml b/l10n_it_pos_fatturapa/views/assets.xml
index 81bec3bcb296..1e6c233396ee 100644
--- a/l10n_it_pos_fatturapa/views/assets.xml
+++ b/l10n_it_pos_fatturapa/views/assets.xml
@@ -1,10 +1,16 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8" ?>
 <odoo>
 
     <template id="assets" inherit_id="point_of_sale.assets">
         <xpath expr="." position="inside">
-            <script type="text/javascript" src="/l10n_it_pos_fatturapa/static/src/js/models.js"/>
-            <script type="text/javascript" src="/l10n_it_pos_fatturapa/static/src/js/screens.js"/>
+            <script
+                type="text/javascript"
+                src="/l10n_it_pos_fatturapa/static/src/js/models.js"
+            />
+            <script
+                type="text/javascript"
+                src="/l10n_it_pos_fatturapa/static/src/js/ClientDetailsEdit.js"
+            />
         </xpath>
     </template>
 
diff --git a/setup/l10n_it_pos_fatturapa/odoo/addons/l10n_it_pos_fatturapa b/setup/l10n_it_pos_fatturapa/odoo/addons/l10n_it_pos_fatturapa
new file mode 120000
index 000000000000..419cf615d228
--- /dev/null
+++ b/setup/l10n_it_pos_fatturapa/odoo/addons/l10n_it_pos_fatturapa
@@ -0,0 +1 @@
+../../../../l10n_it_pos_fatturapa
\ No newline at end of file
diff --git a/setup/l10n_it_pos_fatturapa/setup.py b/setup/l10n_it_pos_fatturapa/setup.py
new file mode 100644
index 000000000000..28c57bb64031
--- /dev/null
+++ b/setup/l10n_it_pos_fatturapa/setup.py
@@ -0,0 +1,6 @@
+import setuptools
+
+setuptools.setup(
+    setup_requires=['setuptools-odoo'],
+    odoo_addon=True,
+)