From 749d6824e0e784d827e2a76c9fe9c657d80ed1de Mon Sep 17 00:00:00 2001
From: Alex Comba <alex.comba@agilebg.com>
Date: Mon, 8 Jul 2013 12:53:57 +0200
Subject: [PATCH 01/20] [ADD] initial draft of l10n_it_bill_of_entry module

[FIX] mail author

[ADD] advance_customs_vat and wizard/select_template

[FIX] Add __init__.py

[ADD] button 'Make Bill of Entry'

[FIX] Remove pdb

[REF] override load_template

[ADD] check if invoice.customs_doc_type == 'forwarder_invoice'
---
 l10n_it_bill_of_entry/AUTHORS.txt             |  3 ++
 l10n_it_bill_of_entry/__init__.py             | 27 ++++++++++
 l10n_it_bill_of_entry/__openerp__.py          | 37 ++++++++++++++
 l10n_it_bill_of_entry/account_invoice.py      | 49 +++++++++++++++++++
 .../account_invoice_view.xml                  | 31 ++++++++++++
 l10n_it_bill_of_entry/wizard/__init__.py      | 26 ++++++++++
 .../wizard/select_template.py                 | 41 ++++++++++++++++
 7 files changed, 214 insertions(+)
 create mode 100644 l10n_it_bill_of_entry/AUTHORS.txt
 create mode 100644 l10n_it_bill_of_entry/__init__.py
 create mode 100644 l10n_it_bill_of_entry/__openerp__.py
 create mode 100644 l10n_it_bill_of_entry/account_invoice.py
 create mode 100644 l10n_it_bill_of_entry/account_invoice_view.xml
 create mode 100644 l10n_it_bill_of_entry/wizard/__init__.py
 create mode 100644 l10n_it_bill_of_entry/wizard/select_template.py

diff --git a/l10n_it_bill_of_entry/AUTHORS.txt b/l10n_it_bill_of_entry/AUTHORS.txt
new file mode 100644
index 000000000000..1a7b14ff567e
--- /dev/null
+++ b/l10n_it_bill_of_entry/AUTHORS.txt
@@ -0,0 +1,3 @@
+Alex Comba <alex.comba@agilebg.com>
+Lorenzo Battistini <lorenzo.battistini@agilebg.com>
+
diff --git a/l10n_it_bill_of_entry/__init__.py b/l10n_it_bill_of_entry/__init__.py
new file mode 100644
index 000000000000..4fcb1cc4aea5
--- /dev/null
+++ b/l10n_it_bill_of_entry/__init__.py
@@ -0,0 +1,27 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+#    Copyright (C) 2013 Agile Business Group sagl
+#    (<http://www.agilebg.com>)
+#    Copyright (C) 2013 OpenERP Italian Community
+#    (<http://www.openerp-italia.org>)
+#    All Rights Reserved
+#    $Id$
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as published by
+#    the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+import account_invoice
+import wizard
diff --git a/l10n_it_bill_of_entry/__openerp__.py b/l10n_it_bill_of_entry/__openerp__.py
new file mode 100644
index 000000000000..89636fd2266c
--- /dev/null
+++ b/l10n_it_bill_of_entry/__openerp__.py
@@ -0,0 +1,37 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    Copyright (C) 2013 Agile Business Group sagl (<http://www.agilebg.com>)
+#    Copyright (C) 2013 OpenERP Italia (<http://www.openerp-italia.org>)
+#    All Rights Reserved
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as published
+#    by the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+{
+    'name': 'Italian Localisation - Bill of Entry',
+    'version': '0.1',
+    'category': 'Localisation/Italy',
+    'description': """
+""",
+    'author': ['Agile Business Group sagl', 'OpenERP Italian Community'],
+    'website': ['http://www.agilebg.com', 'http://www.openerp-italia.org'],
+    'license': 'AGPL-3',
+    "depends": ['base', 'account_invoice_template'],
+    "data": [
+        'account_invoice_view.xml',
+    ],
+    "demo": [],
+    "installable": True
+}
diff --git a/l10n_it_bill_of_entry/account_invoice.py b/l10n_it_bill_of_entry/account_invoice.py
new file mode 100644
index 000000000000..18a70eee18c8
--- /dev/null
+++ b/l10n_it_bill_of_entry/account_invoice.py
@@ -0,0 +1,49 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    Copyright (C) 2013 Agile Business Group sagl (<http://www.agilebg.com>)
+#    Copyright (C) 2013 OpenERP Italia (<http://www.openerp-italia.org>)
+#    All Rights Reserved
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as published
+#    by the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+from openerp.osv import fields, osv
+from openerp.tools.translate import _
+
+
+class account_invoice(osv.osv):
+    _inherit = "account.invoice"
+
+    _columns = {
+        'customs_doc_type': fields.selection([
+            ('bill_of_entry', 'Bill of Entry'),
+            ('supplier_invoice', 'Supplier Invoice'),
+            ('forwarder_invoice', 'Forwarder Invoice'),
+        ], 'Customs Doc Type', readonly=True, states={'draft': [('readonly', False)]}),
+        'supplier_bill_of_entry_ids': fields.many2many('account.invoice', 'sboe_invoice_rel', 'sboe_id', 'invoice_id', 'Supplier Bill of Entries'),
+        'supplier_invoice_ids': fields.many2many('account.invoice', 'invoice_sbe_rel', 'invoice_id', 'sboe_id', 'Supplier Invoices', readonly=True),
+        'forwarder_invoice_id': fields.many2one('account.invoice', 'Forwarder Invoice', readonly=True),
+        'forwarder_bill_of_entry_ids': fields.one2many('account.invoice', 'forwarder_invoice_id', 'Forward Bill of Entries', readonly=True),
+        'bill_of_entry_cancellation_id': fields.many2one('account.move', 'Bill od Entry Cancellation', readonly=True),
+    }
+
+
+class account_invoice_line(osv.osv):
+    _inherit = "account.invoice.line"
+
+    _columns = {
+        'advance_customs_vat': fields.boolean("Adavance Customs Vat"),
+    }
diff --git a/l10n_it_bill_of_entry/account_invoice_view.xml b/l10n_it_bill_of_entry/account_invoice_view.xml
new file mode 100644
index 000000000000..3b7eb738a167
--- /dev/null
+++ b/l10n_it_bill_of_entry/account_invoice_view.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+
+    	 <record model="ir.ui.view" id="invoice_supplier_form">
+    	     <field name="name">account.invoice.supplier.form</field>
+    	     <field name="model">account.invoice</field>
+    	     <field name="inherit_id" ref="account.invoice_supplier_form"/>
+    	     <field name="arch" type="xml">
+    	     	<xpath expr="//field[@name='journal_id']" position="after">
+    	     		<field name="customs_doc_type" />
+	     		</xpath>
+    	     	<xpath expr="//notebook/page[@string='Payments']" position="after">
+    	     		<page string="Bill of Entries" attrs="{'invisible': [('customs_doc_type','=', False)]}">
+    	     			<field name="supplier_bill_of_entry_ids" attrs="{'invisible': [('customs_doc_type','!=', 'supplier_invoice')]}"/>
+    	     			<field name="supplier_invoice_ids" attrs="{'invisible': [('customs_doc_type','!=', 'bill_of_entry')]}"/>
+    	     			<field name="forwarder_invoice_id" attrs="{'invisible': [('customs_doc_type','!=', 'bill_of_entry')]}"/>
+    	     			<field name="forwarder_bill_of_entry_ids" attrs="{'invisible': [('customs_doc_type','!=', 'forwarder_invoice')]}"/>
+    	     			<field name="bill_of_entry_cancellation_id" attrs="{'invisible': [('customs_doc_type','!=', 'forwarder_invoice')]}"/>
+                        <button string="Make Bill of Entry" name="%(account_invoice_template.action_wizard_select_template)d" type="action" class="oe_highlight" states="draft" attrs="{'invisible': [('customs_doc_type','!=', 'forwarder_invoice')]}"/>
+    	             </page>
+    	         </xpath>
+                <xpath expr="//notebook/page[@string='Invoice']/field[@name='invoice_line']/tree/field[@name='price_subtotal']" position="after">
+                    <!--It seems attrs doesn't work -->
+                    <field name="advance_customs_vat"/>
+                </xpath>
+    	     </field>
+    	</record>
+
+	</data>
+</openerp>
\ No newline at end of file
diff --git a/l10n_it_bill_of_entry/wizard/__init__.py b/l10n_it_bill_of_entry/wizard/__init__.py
new file mode 100644
index 000000000000..fc49a29d264a
--- /dev/null
+++ b/l10n_it_bill_of_entry/wizard/__init__.py
@@ -0,0 +1,26 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+#    Copyright (C) 2013 Agile Business Group sagl
+#    (<http://www.agilebg.com>)
+#    Copyright (C) 2013 OpenERP Italian Community
+#    (<http://www.openerp-italia.org>)
+#    All Rights Reserved
+#    $Id$
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as published by
+#    the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+import select_template
diff --git a/l10n_it_bill_of_entry/wizard/select_template.py b/l10n_it_bill_of_entry/wizard/select_template.py
new file mode 100644
index 000000000000..e5354fcb63f0
--- /dev/null
+++ b/l10n_it_bill_of_entry/wizard/select_template.py
@@ -0,0 +1,41 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    Copyright (C) 2013 Agile Business Group sagl (<http://www.agilebg.com>)
+#    Copyright (C) 2013 OpenERP Italia (<http://www.openerp-italia.org>)
+#    All Rights Reserved
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as published
+#    by the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+from openerp.osv import fields, osv, orm
+from openerp.tools.translate import _
+
+
+class wizard_select_invoice_template(orm.TransientModel):
+    _inherit = "wizard.select.invoice.template"
+
+    def load_template(self, cr, uid, ids, context=None):
+        res = super(wizard_select_invoice_template, self).load_template(cr, uid, ids, context=context)
+        if context.get('active_model') == 'account.invoice':
+            invoice = self.pool.get('account.invoice').browse(cr, uid, context.get('active_id'), context=context)
+            if invoice and invoice.customs_doc_type == 'forwarder_invoice':
+                invoice_id = res['res_id']
+                invoice_obj = self.pool.get('account.invoice')
+                invoice_obj.write(cr, uid, invoice_id, {
+                    'customs_doc_type': 'bill_of_entry',
+                    'forwarder_invoice_id': context.get('active_id')
+                }, context=context)
+        return res

From c0168ce71466b516d8751892a1d80e08144e5c56 Mon Sep 17 00:00:00 2001
From: Lorenzo Battistini <lorenzo.battistini@agilebg.com>
Date: Thu, 11 Jul 2013 08:27:19 +0200
Subject: [PATCH 02/20] [fix] copyright

[fix] osv -> orm

[add] action_move_create

[add] company

[add] storno move

[add] reconciliation

[add] action_cancel

[imp] descr

[imp] company view

[fix] view

[fix] view

[fix] view

[fix] errore msg

[fix] m2m

[fix] missing partner

[imp] tax code

[imp] description

[add] allow to link BOE to forwarder inv

[imp] interface

[imp] interface

[add] trans

[imp] interface

[REF] Set all the modules of the master branches to "installable": False
moves all modules into a __unported__ directory
---
 l10n_it_bill_of_entry/AUTHORS.txt             |  3 --
 l10n_it_bill_of_entry/__init__.py             | 27 ----------
 l10n_it_bill_of_entry/__openerp__.py          | 37 --------------
 l10n_it_bill_of_entry/account_invoice.py      | 49 -------------------
 .../account_invoice_view.xml                  | 31 ------------
 l10n_it_bill_of_entry/wizard/__init__.py      | 26 ----------
 .../wizard/select_template.py                 | 41 ----------------
 7 files changed, 214 deletions(-)
 delete mode 100644 l10n_it_bill_of_entry/AUTHORS.txt
 delete mode 100644 l10n_it_bill_of_entry/__init__.py
 delete mode 100644 l10n_it_bill_of_entry/__openerp__.py
 delete mode 100644 l10n_it_bill_of_entry/account_invoice.py
 delete mode 100644 l10n_it_bill_of_entry/account_invoice_view.xml
 delete mode 100644 l10n_it_bill_of_entry/wizard/__init__.py
 delete mode 100644 l10n_it_bill_of_entry/wizard/select_template.py

diff --git a/l10n_it_bill_of_entry/AUTHORS.txt b/l10n_it_bill_of_entry/AUTHORS.txt
deleted file mode 100644
index 1a7b14ff567e..000000000000
--- a/l10n_it_bill_of_entry/AUTHORS.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-Alex Comba <alex.comba@agilebg.com>
-Lorenzo Battistini <lorenzo.battistini@agilebg.com>
-
diff --git a/l10n_it_bill_of_entry/__init__.py b/l10n_it_bill_of_entry/__init__.py
deleted file mode 100644
index 4fcb1cc4aea5..000000000000
--- a/l10n_it_bill_of_entry/__init__.py
+++ /dev/null
@@ -1,27 +0,0 @@
-# -*- encoding: utf-8 -*-
-##############################################################################
-#
-#    Copyright (C) 2013 Agile Business Group sagl
-#    (<http://www.agilebg.com>)
-#    Copyright (C) 2013 OpenERP Italian Community
-#    (<http://www.openerp-italia.org>)
-#    All Rights Reserved
-#    $Id$
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as published by
-#    the Free Software Foundation, either version 3 of the License, or
-#    (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU General Public License for more details.
-#
-#    You should have received a copy of the GNU General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-##############################################################################
-
-import account_invoice
-import wizard
diff --git a/l10n_it_bill_of_entry/__openerp__.py b/l10n_it_bill_of_entry/__openerp__.py
deleted file mode 100644
index 89636fd2266c..000000000000
--- a/l10n_it_bill_of_entry/__openerp__.py
+++ /dev/null
@@ -1,37 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#
-#    Copyright (C) 2013 Agile Business Group sagl (<http://www.agilebg.com>)
-#    Copyright (C) 2013 OpenERP Italia (<http://www.openerp-italia.org>)
-#    All Rights Reserved
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as published
-#    by the Free Software Foundation, either version 3 of the License, or
-#    (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-##############################################################################
-{
-    'name': 'Italian Localisation - Bill of Entry',
-    'version': '0.1',
-    'category': 'Localisation/Italy',
-    'description': """
-""",
-    'author': ['Agile Business Group sagl', 'OpenERP Italian Community'],
-    'website': ['http://www.agilebg.com', 'http://www.openerp-italia.org'],
-    'license': 'AGPL-3',
-    "depends": ['base', 'account_invoice_template'],
-    "data": [
-        'account_invoice_view.xml',
-    ],
-    "demo": [],
-    "installable": True
-}
diff --git a/l10n_it_bill_of_entry/account_invoice.py b/l10n_it_bill_of_entry/account_invoice.py
deleted file mode 100644
index 18a70eee18c8..000000000000
--- a/l10n_it_bill_of_entry/account_invoice.py
+++ /dev/null
@@ -1,49 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#
-#    Copyright (C) 2013 Agile Business Group sagl (<http://www.agilebg.com>)
-#    Copyright (C) 2013 OpenERP Italia (<http://www.openerp-italia.org>)
-#    All Rights Reserved
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as published
-#    by the Free Software Foundation, either version 3 of the License, or
-#    (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-##############################################################################
-
-from openerp.osv import fields, osv
-from openerp.tools.translate import _
-
-
-class account_invoice(osv.osv):
-    _inherit = "account.invoice"
-
-    _columns = {
-        'customs_doc_type': fields.selection([
-            ('bill_of_entry', 'Bill of Entry'),
-            ('supplier_invoice', 'Supplier Invoice'),
-            ('forwarder_invoice', 'Forwarder Invoice'),
-        ], 'Customs Doc Type', readonly=True, states={'draft': [('readonly', False)]}),
-        'supplier_bill_of_entry_ids': fields.many2many('account.invoice', 'sboe_invoice_rel', 'sboe_id', 'invoice_id', 'Supplier Bill of Entries'),
-        'supplier_invoice_ids': fields.many2many('account.invoice', 'invoice_sbe_rel', 'invoice_id', 'sboe_id', 'Supplier Invoices', readonly=True),
-        'forwarder_invoice_id': fields.many2one('account.invoice', 'Forwarder Invoice', readonly=True),
-        'forwarder_bill_of_entry_ids': fields.one2many('account.invoice', 'forwarder_invoice_id', 'Forward Bill of Entries', readonly=True),
-        'bill_of_entry_cancellation_id': fields.many2one('account.move', 'Bill od Entry Cancellation', readonly=True),
-    }
-
-
-class account_invoice_line(osv.osv):
-    _inherit = "account.invoice.line"
-
-    _columns = {
-        'advance_customs_vat': fields.boolean("Adavance Customs Vat"),
-    }
diff --git a/l10n_it_bill_of_entry/account_invoice_view.xml b/l10n_it_bill_of_entry/account_invoice_view.xml
deleted file mode 100644
index 3b7eb738a167..000000000000
--- a/l10n_it_bill_of_entry/account_invoice_view.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<openerp>
-    <data>
-
-    	 <record model="ir.ui.view" id="invoice_supplier_form">
-    	     <field name="name">account.invoice.supplier.form</field>
-    	     <field name="model">account.invoice</field>
-    	     <field name="inherit_id" ref="account.invoice_supplier_form"/>
-    	     <field name="arch" type="xml">
-    	     	<xpath expr="//field[@name='journal_id']" position="after">
-    	     		<field name="customs_doc_type" />
-	     		</xpath>
-    	     	<xpath expr="//notebook/page[@string='Payments']" position="after">
-    	     		<page string="Bill of Entries" attrs="{'invisible': [('customs_doc_type','=', False)]}">
-    	     			<field name="supplier_bill_of_entry_ids" attrs="{'invisible': [('customs_doc_type','!=', 'supplier_invoice')]}"/>
-    	     			<field name="supplier_invoice_ids" attrs="{'invisible': [('customs_doc_type','!=', 'bill_of_entry')]}"/>
-    	     			<field name="forwarder_invoice_id" attrs="{'invisible': [('customs_doc_type','!=', 'bill_of_entry')]}"/>
-    	     			<field name="forwarder_bill_of_entry_ids" attrs="{'invisible': [('customs_doc_type','!=', 'forwarder_invoice')]}"/>
-    	     			<field name="bill_of_entry_cancellation_id" attrs="{'invisible': [('customs_doc_type','!=', 'forwarder_invoice')]}"/>
-                        <button string="Make Bill of Entry" name="%(account_invoice_template.action_wizard_select_template)d" type="action" class="oe_highlight" states="draft" attrs="{'invisible': [('customs_doc_type','!=', 'forwarder_invoice')]}"/>
-    	             </page>
-    	         </xpath>
-                <xpath expr="//notebook/page[@string='Invoice']/field[@name='invoice_line']/tree/field[@name='price_subtotal']" position="after">
-                    <!--It seems attrs doesn't work -->
-                    <field name="advance_customs_vat"/>
-                </xpath>
-    	     </field>
-    	</record>
-
-	</data>
-</openerp>
\ No newline at end of file
diff --git a/l10n_it_bill_of_entry/wizard/__init__.py b/l10n_it_bill_of_entry/wizard/__init__.py
deleted file mode 100644
index fc49a29d264a..000000000000
--- a/l10n_it_bill_of_entry/wizard/__init__.py
+++ /dev/null
@@ -1,26 +0,0 @@
-# -*- encoding: utf-8 -*-
-##############################################################################
-#
-#    Copyright (C) 2013 Agile Business Group sagl
-#    (<http://www.agilebg.com>)
-#    Copyright (C) 2013 OpenERP Italian Community
-#    (<http://www.openerp-italia.org>)
-#    All Rights Reserved
-#    $Id$
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as published by
-#    the Free Software Foundation, either version 3 of the License, or
-#    (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU General Public License for more details.
-#
-#    You should have received a copy of the GNU General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-##############################################################################
-
-import select_template
diff --git a/l10n_it_bill_of_entry/wizard/select_template.py b/l10n_it_bill_of_entry/wizard/select_template.py
deleted file mode 100644
index e5354fcb63f0..000000000000
--- a/l10n_it_bill_of_entry/wizard/select_template.py
+++ /dev/null
@@ -1,41 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#
-#    Copyright (C) 2013 Agile Business Group sagl (<http://www.agilebg.com>)
-#    Copyright (C) 2013 OpenERP Italia (<http://www.openerp-italia.org>)
-#    All Rights Reserved
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as published
-#    by the Free Software Foundation, either version 3 of the License, or
-#    (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-##############################################################################
-
-from openerp.osv import fields, osv, orm
-from openerp.tools.translate import _
-
-
-class wizard_select_invoice_template(orm.TransientModel):
-    _inherit = "wizard.select.invoice.template"
-
-    def load_template(self, cr, uid, ids, context=None):
-        res = super(wizard_select_invoice_template, self).load_template(cr, uid, ids, context=context)
-        if context.get('active_model') == 'account.invoice':
-            invoice = self.pool.get('account.invoice').browse(cr, uid, context.get('active_id'), context=context)
-            if invoice and invoice.customs_doc_type == 'forwarder_invoice':
-                invoice_id = res['res_id']
-                invoice_obj = self.pool.get('account.invoice')
-                invoice_obj.write(cr, uid, invoice_id, {
-                    'customs_doc_type': 'bill_of_entry',
-                    'forwarder_invoice_id': context.get('active_id')
-                }, context=context)
-        return res

From b8b586f09b8934daead291497216b8d409fc1f81 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Bidoul?= <stephane.bidoul@acsone.eu>
Date: Tue, 13 Oct 2015 16:58:13 +0200
Subject: [PATCH 03/20] [MOV] move addons out of __unported__ (they remain not
 installable)

---
 l10n_it_bill_of_entry/AUTHORS.txt             |   3 +
 l10n_it_bill_of_entry/__init__.py             |  26 +++
 l10n_it_bill_of_entry/__openerp__.py          |  78 ++++++++
 l10n_it_bill_of_entry/account_invoice.py      | 139 ++++++++++++++
 .../account_invoice_view.xml                  |  50 +++++
 l10n_it_bill_of_entry/company.py              |  41 ++++
 l10n_it_bill_of_entry/company_view.xml        |  25 +++
 l10n_it_bill_of_entry/i18n/it.po              | 181 ++++++++++++++++++
 l10n_it_bill_of_entry/wizard/__init__.py      |  24 +++
 .../wizard/select_template.py                 |  42 ++++
 10 files changed, 609 insertions(+)
 create mode 100644 l10n_it_bill_of_entry/AUTHORS.txt
 create mode 100644 l10n_it_bill_of_entry/__init__.py
 create mode 100644 l10n_it_bill_of_entry/__openerp__.py
 create mode 100644 l10n_it_bill_of_entry/account_invoice.py
 create mode 100644 l10n_it_bill_of_entry/account_invoice_view.xml
 create mode 100644 l10n_it_bill_of_entry/company.py
 create mode 100644 l10n_it_bill_of_entry/company_view.xml
 create mode 100644 l10n_it_bill_of_entry/i18n/it.po
 create mode 100644 l10n_it_bill_of_entry/wizard/__init__.py
 create mode 100644 l10n_it_bill_of_entry/wizard/select_template.py

diff --git a/l10n_it_bill_of_entry/AUTHORS.txt b/l10n_it_bill_of_entry/AUTHORS.txt
new file mode 100644
index 000000000000..1a7b14ff567e
--- /dev/null
+++ b/l10n_it_bill_of_entry/AUTHORS.txt
@@ -0,0 +1,3 @@
+Alex Comba <alex.comba@agilebg.com>
+Lorenzo Battistini <lorenzo.battistini@agilebg.com>
+
diff --git a/l10n_it_bill_of_entry/__init__.py b/l10n_it_bill_of_entry/__init__.py
new file mode 100644
index 000000000000..c639c059375f
--- /dev/null
+++ b/l10n_it_bill_of_entry/__init__.py
@@ -0,0 +1,26 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+#    Copyright (C) 2013 Agile Business Group sagl
+#    (<http://www.agilebg.com>)
+#    Copyright (C) 2013
+#    Associazione OpenERP Italia (<http://www.openerp-italia.org>)
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as published by
+#    the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+import account_invoice
+import wizard
+import company
diff --git a/l10n_it_bill_of_entry/__openerp__.py b/l10n_it_bill_of_entry/__openerp__.py
new file mode 100644
index 000000000000..be987e88e4b7
--- /dev/null
+++ b/l10n_it_bill_of_entry/__openerp__.py
@@ -0,0 +1,78 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    Copyright (C) 2013 Agile Business Group sagl (<http://www.agilebg.com>)
+#    Copyright (C) 2013
+#    Associazione OpenERP Italia (<http://www.openerp-italia.org>)
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as published
+#    by the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+{
+    'name': 'Italian Localisation - Bill of Entry',
+    'version': '0.1',
+    'category': 'Localisation/Italy',
+    'description': """
+Bolle doganali
+===============
+
+Specifiche
+----------
+
+http://wiki.openerp-italia.org/doku.php/area_utente/requisiti/extraue
+
+Ci sono 3 documenti coinvolti:
+
+ - Fattura fornitore
+ - Fattura spedizioniere
+ - Bolla doganale
+ 
+Le relazioni:
+
+N bolle doganali -> N fatture fornitore
+1 fattura spedizioniere -> N bolle doganali
+
+Configurazione
+--------------
+
+E' necessario configurare in contabilità il sezionale da utilizzare per il
+giroconto di chiusura.
+
+Utilizzo
+--------
+
+Dalla bolla doganale è possibile collegare manualmente la (o le) fattura(e)
+fornitore corrispondente.
+
+Dalla fattura spedizioniere è possibile generare la (o le) bolla(e) doganale(i)
+tramite il bottone 'genera bolla'. Per questa operazione bisogna prima configurare
+un template di fattura (usato per la bolla doganale).
+
+Nella fattura spedizioniere bisogna indicare quale (o quali) riga (righe)
+rappresenti(no) l'IVA anticipata alla dogana.
+
+Alla conferma della fattura spedizioniere, verrà generata la scrittura contabile di giroconto per chiudere la bolla doganale.
+
+""",
+    'author': "Agile Business Group,Odoo Community Association (OCA)",
+    'website': 'http://www.agilebg.com',
+    'license': 'AGPL-3',
+    "depends": ['base', 'account_invoice_template'],
+    "data": [
+        'account_invoice_view.xml',
+        'company_view.xml',
+    ],
+    "demo": [],
+    'installable': False
+}
diff --git a/l10n_it_bill_of_entry/account_invoice.py b/l10n_it_bill_of_entry/account_invoice.py
new file mode 100644
index 000000000000..877a7424b21b
--- /dev/null
+++ b/l10n_it_bill_of_entry/account_invoice.py
@@ -0,0 +1,139 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    Copyright (C) 2013 Agile Business Group sagl (<http://www.agilebg.com>)
+#    Copyright (C) 2013
+#    Associazione OpenERP Italia (<http://www.openerp-italia.org>)
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as published
+#    by the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+from openerp.osv import fields, orm
+from openerp.tools.translate import _
+
+
+class account_invoice(orm.Model):
+    _inherit = "account.invoice"
+
+    _columns = {
+        'customs_doc_type': fields.selection([
+            ('bill_of_entry', 'Bill of Entry'),
+            ('supplier_invoice', 'Supplier Invoice'),
+            ('forwarder_invoice', 'Forwarder Invoice'),
+        ], 'Customs Doc Type', readonly=True),
+        'supplier_bill_of_entry_ids': fields.many2many('account.invoice', 'sboe_invoice_rel', 'sboe_id', 'invoice_id', 'Supplier Bill of Entries', readonly=True),
+        'supplier_invoice_ids': fields.many2many('account.invoice', 'sboe_invoice_rel', 'invoice_id', 'sboe_id', 'Supplier Invoices'),
+        'forwarder_invoice_id': fields.many2one('account.invoice', 'Forwarder Invoice'),
+        'forwarder_bill_of_entry_ids': fields.one2many('account.invoice', 'forwarder_invoice_id', 'Forward Bill of Entries', readonly=True),
+        'bill_of_entry_storno_id': fields.many2one('account.move', 'Bill of Entry Storno', readonly=True),
+    }
+
+    def action_move_create(self, cr, uid, ids, context=None):
+        res = super(account_invoice,self).action_move_create(cr, uid, ids, context=context)
+        move_obj = self.pool.get('account.move')
+        move_line_obj = self.pool.get('account.move.line')
+        period_obj = self.pool.get('account.period')
+        for invoice in self.browse(cr, uid, ids, context):
+            if invoice.customs_doc_type == 'forwarder_invoice':
+                for bill_of_entry in invoice.forwarder_bill_of_entry_ids:
+                    if bill_of_entry.state not in ('open', 'paid'):
+                        raise orm.except_orm(_('Error'), _('Bill of entry %s is in state %s')
+                            % (bill_of_entry.partner_id.name, bill_of_entry.state))
+                advance_customs_vat_line = False
+                if invoice.forwarder_bill_of_entry_ids:
+                    for line in invoice.invoice_line:
+                        if line.advance_customs_vat:
+                            advance_customs_vat_line = True
+                            break
+                if not advance_customs_vat_line:
+                    raise orm.except_orm(_('Error'),
+                        _("Forwarder invoice %s does not have lines with 'Adavance Customs Vat'")
+                        % invoice.number)
+                if not invoice.company_id.bill_of_entry_journal_id:
+                    raise orm.except_orm(_('Error'), _('No Bill of entry Storno journal configured'))
+                period_ids = period_obj.find(cr, uid, dt=invoice.date_invoice, context=context)
+                move_vals = {
+                    'period_id': period_ids and period_ids[0] or False,
+                    'journal_id': invoice.company_id.bill_of_entry_journal_id.id,
+                    'date': invoice.date_invoice,
+                    }
+                move_lines = []
+                for inv_line in invoice.invoice_line:
+                    if inv_line.advance_customs_vat:
+                        move_lines.append((0, 0, {
+                            'name': _("Customs expenses"),
+                            'account_id': inv_line.account_id.id,
+                            'debit': 0.0,
+                            'credit': inv_line.price_subtotal,
+                            }))
+                for bill_of_entry in invoice.forwarder_bill_of_entry_ids:
+                    move_lines.append((0, 0, {
+                        'name': _("Customs supplier"),
+                        'account_id': bill_of_entry.account_id.id,
+                        'debit': bill_of_entry.amount_total,
+                        'credit': 0.0,
+                        'partner_id': bill_of_entry.partner_id.id,
+                        }))
+                    for boe_line in bill_of_entry.invoice_line:
+                        tax_code_id = False
+                        if boe_line.invoice_line_tax_id:
+                            if len(boe_line.invoice_line_tax_id) > 1:
+                                raise osv.except_osv(_('Error'),
+                                    _("Can't handle more than 1 tax for line %s") % boe_line.name)
+                            tax_code_id = (boe_line.invoice_line_tax_id[0].base_code_id
+                                and boe_line.invoice_line_tax_id[0].base_code_id.id or False)
+                        line_vals = {
+                            'name': _("Extra CEE expenses"),
+                            'account_id': boe_line.account_id.id,
+                            'debit': 0.0,
+                            'credit': boe_line.price_subtotal,
+                            }
+                        if tax_code_id:
+                            line_vals['tax_code_id'] = tax_code_id
+                            line_vals['tax_amount'] = boe_line.price_subtotal
+                        move_lines.append((0, 0, line_vals))
+                move_vals['line_id'] = move_lines
+                move_id = move_obj.create(cr, uid, move_vals, context=context)
+                invoice.write({'bill_of_entry_storno_id': move_id}, context=context)
+                
+                reconcile_ids = []
+                for move_line in move_obj.browse(cr, uid, move_id, context).line_id:
+                    for bill_of_entry in invoice.forwarder_bill_of_entry_ids:
+                        if move_line.account_id.id == bill_of_entry.account_id.id:
+                            reconcile_ids.append(move_line.id)
+                            for boe_move_line in bill_of_entry.move_id.line_id:
+                                if boe_move_line.account_id.id == bill_of_entry.account_id.id:
+                                    reconcile_ids.append(boe_move_line.id)
+                move_line_obj.reconcile_partial(cr, uid, reconcile_ids, type='auto',
+                    context=context)
+        return res
+        
+    def action_cancel(self, cr, uid, ids, context=None):
+        account_move_obj = self.pool.get('account.move')
+        res = super(account_invoice,self).action_cancel(cr, uid, ids, context=context)
+        for invoice in self.browse(cr, uid, ids, context):
+            if invoice.bill_of_entry_storno_id:
+                account_move_obj.button_cancel(cr, uid, [invoice.bill_of_entry_storno_id.id],
+                    context=context)
+                account_move_obj.unlink(cr, uid, [invoice.bill_of_entry_storno_id.id],
+                    context=context)
+        return res
+
+class account_invoice_line(orm.Model):
+    _inherit = "account.invoice.line"
+
+    _columns = {
+        'advance_customs_vat': fields.boolean("Advance Customs Vat"),
+    }
diff --git a/l10n_it_bill_of_entry/account_invoice_view.xml b/l10n_it_bill_of_entry/account_invoice_view.xml
new file mode 100644
index 000000000000..be6d06b451d9
--- /dev/null
+++ b/l10n_it_bill_of_entry/account_invoice_view.xml
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+
+    	 <record model="ir.ui.view" id="invoice_supplier_form">
+    	     <field name="name">account.invoice.supplier.form</field>
+    	     <field name="model">account.invoice</field>
+    	     <field name="inherit_id" ref="account.invoice_supplier_form"/>
+    	     <field name="arch" type="xml">
+    	     	<xpath expr="//field[@name='journal_id']" position="after">
+    	     		<field name="customs_doc_type" attrs="{'readonly': ['|',('state', '!=', 'draft'), ('forwarder_bill_of_entry_ids', '!=', [])]}"/>
+	     		</xpath>
+    	     	<xpath expr="//notebook/page[@string='Payments']" position="after">
+    	     		<page string="Customs" attrs="{'invisible': [('customs_doc_type','=', False)]}">
+    	     			<separator string="Bill of entries" colspan="4" attrs="{'invisible': [('customs_doc_type','!=', 'supplier_invoice')]}"></separator>
+                        <field name="supplier_bill_of_entry_ids" attrs="{'invisible': [('customs_doc_type','!=', 'supplier_invoice')]}" />
+    	     			<separator string="Supplier invoices" colspan="4" attrs="{'invisible': [('customs_doc_type','!=', 'bill_of_entry')]}"></separator>
+    	     			<field name="supplier_invoice_ids" attrs="{'invisible': [('customs_doc_type','!=', 'bill_of_entry')]}" domain="[('customs_doc_type', '=', 'supplier_invoice')]" context="{'default_customs_doc_type': 'supplier_invoice'}"/>
+                        <group>
+                            <field name="forwarder_invoice_id" attrs="{'invisible': [('customs_doc_type','!=', 'bill_of_entry')]}" domain="[('customs_doc_type','=', 'forwarder_invoice')]" context="{'default_customs_doc_type': 'forwarder_invoice'}"/>
+                        </group>
+    	     			<separator string="Bill of entries" colspan="4" attrs="{'invisible': [('customs_doc_type','!=', 'forwarder_invoice')]}"></separator>
+    	     			<field name="forwarder_bill_of_entry_ids" attrs="{'invisible': [('customs_doc_type','!=', 'forwarder_invoice')]}"/>
+    	     			<group>
+                            <field name="bill_of_entry_storno_id" attrs="{'invisible': [('customs_doc_type','!=', 'forwarder_invoice')]}"/>
+                        </group>
+                        <button string="Make Bill of Entry" name="%(account_invoice_template.action_wizard_select_template)d" type="action" class="oe_highlight" attrs="{'invisible': ['|',('customs_doc_type','!=', 'forwarder_invoice'),('state','!=','draft')]}"/>
+    	             </page>
+    	         </xpath>
+                <xpath expr="//notebook/page[@string='Invoice']/field[@name='invoice_line']/tree/field[@name='price_subtotal']" position="after">
+                    <!--It seems attrs doesn't work -->
+                    <field name="advance_customs_vat"/>
+                </xpath>
+    	     </field>
+    	</record>
+    <record model="ir.ui.view" id="invoice_form_boe">
+      <field name="name">account.invoice.form.boe</field>
+      <field name="model">account.invoice.line</field>
+      <field name="inherit_id" ref="account.view_invoice_line_form"/>
+      <field name="arch" type="xml">
+        <field name="name" position="after">
+          <group>
+          <field name="advance_customs_vat"/>
+          </group>
+        </field>
+      </field>
+    </record>
+
+	</data>
+</openerp>
diff --git a/l10n_it_bill_of_entry/company.py b/l10n_it_bill_of_entry/company.py
new file mode 100644
index 000000000000..88c9eaf5781e
--- /dev/null
+++ b/l10n_it_bill_of_entry/company.py
@@ -0,0 +1,41 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    Copyright (C) 2013 Agile Business Group sagl (<http://www.agilebg.com>)
+#    Copyright (C) 2013
+#    Associazione OpenERP Italia (<http://www.openerp-italia.org>)
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as published
+#    by the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+from openerp.osv import fields, orm
+
+class res_company(orm.Model):
+    _inherit = 'res.company'
+    _columns = {
+        'bill_of_entry_journal_id': fields.many2one('account.journal','Bill of entry Storno journal',
+            help="Journal used for reconciliation of customs supplier"),
+        }
+    
+class account_config_settings(orm.TransientModel):
+    _inherit = 'account.config.settings'
+    _columns = {
+        'bill_of_entry_journal_id': fields.related(
+            'company_id', 'bill_of_entry_journal_id',
+            type='many2one',
+            relation="account.journal",
+            string="Bill of entry Storno journal",
+            help='Journal used for reconciliation of customs supplier'),
+    }
diff --git a/l10n_it_bill_of_entry/company_view.xml b/l10n_it_bill_of_entry/company_view.xml
new file mode 100644
index 000000000000..2b23b251937e
--- /dev/null
+++ b/l10n_it_bill_of_entry/company_view.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+
+        <record id="view_account_config_settings" model="ir.ui.view">
+            <field name="name">view_account_config_settings</field>
+            <field name="model">account.config.settings</field>
+            <field name="inherit_id" ref="account.view_account_config_settings"/>
+            <field name="arch" type="xml">
+                <xpath expr="/form/group[6]" position="after">
+                    <separator string="Bill of entry"/>
+                    <group name="Bill of entry">
+                        <label for="id" string="Configuration"/>
+                        <div>
+                            <div>
+                                <label for="bill_of_entry_journal_id"/>
+                                <field name="bill_of_entry_journal_id" class="oe_inline"/>
+                            </div>
+                        </div>
+                    </group>
+                </xpath>
+            </field>
+        </record>
+	</data>
+</openerp>
diff --git a/l10n_it_bill_of_entry/i18n/it.po b/l10n_it_bill_of_entry/i18n/it.po
new file mode 100644
index 000000000000..56d483ec51ab
--- /dev/null
+++ b/l10n_it_bill_of_entry/i18n/it.po
@@ -0,0 +1,181 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+# 	* l10n_it_bill_of_entry
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: OpenERP Server 7.0\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2013-07-18 18:13+0000\n"
+"PO-Revision-Date: 2013-07-18 20:17+0100\n"
+"Last-Translator: Lorenzo Battistini <lorenzo.battistini@agilebg.com>\n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: \n"
+"X-Generator: Poedit 1.5.4\n"
+
+#. module: l10n_it_bill_of_entry
+#: view:account.invoice:0
+msgid "Supplier invoices"
+msgstr "Fatture fornitore"
+
+#. module: l10n_it_bill_of_entry
+#: field:account.invoice,customs_doc_type:0
+msgid "Customs Doc Type"
+msgstr "Tipo documento doganale"
+
+#. module: l10n_it_bill_of_entry
+#: model:ir.model,name:l10n_it_bill_of_entry.model_account_config_settings
+msgid "account.config.settings"
+msgstr "account.config.settings"
+
+#. module: l10n_it_bill_of_entry
+#: selection:account.invoice,customs_doc_type:0
+msgid "Supplier Invoice"
+msgstr "Fattura fornitore"
+
+#. module: l10n_it_bill_of_entry
+#: code:addons/l10n_it_bill_of_entry/account_invoice.py:62
+#, python-format
+msgid "Forwarder invoice %s does not have lines with 'Adavance Customs Vat'"
+msgstr "La fattura fornitore %s non ha riga con 'IVA anticipata'"
+
+#. module: l10n_it_bill_of_entry
+#: field:account.invoice,bill_of_entry_storno_id:0
+msgid "Bill of Entry Storno"
+msgstr "Storno bolla doganale"
+
+#. module: l10n_it_bill_of_entry
+#: selection:account.invoice,customs_doc_type:0
+msgid "Bill of Entry"
+msgstr "Bolla doganale"
+
+#. module: l10n_it_bill_of_entry
+#: field:account.invoice,supplier_invoice_ids:0
+msgid "Supplier Invoices"
+msgstr "Fatture fornitore"
+
+#. module: l10n_it_bill_of_entry
+#: view:account.invoice:0
+msgid "Make Bill of Entry"
+msgstr "Genera bolla doganale"
+
+#. module: l10n_it_bill_of_entry
+#: field:account.invoice,supplier_bill_of_entry_ids:0
+msgid "Supplier Bill of Entries"
+msgstr "Bolle doganali fornitore"
+
+#. module: l10n_it_bill_of_entry
+#: view:account.invoice:0
+msgid "Customs"
+msgstr "Dogana"
+
+#. module: l10n_it_bill_of_entry
+#: code:addons/l10n_it_bill_of_entry/account_invoice.py:98
+#, python-format
+msgid "Extra CEE expenses"
+msgstr "Uscite extra CEE"
+
+#. module: l10n_it_bill_of_entry
+#: view:account.invoice:0
+msgid "Bill of entries"
+msgstr "Bolle doganali"
+
+#. module: l10n_it_bill_of_entry
+#: view:account.config.settings:0
+msgid "Configuration"
+msgstr "Configurazione"
+
+#. module: l10n_it_bill_of_entry
+#: view:account.config.settings:0
+msgid "Bill of entry"
+msgstr "Bolla doganale"
+
+#. module: l10n_it_bill_of_entry
+#: field:account.config.settings,bill_of_entry_journal_id:0
+#: field:res.company,bill_of_entry_journal_id:0
+msgid "Bill of entry Storno journal"
+msgstr "Sezionale di storno bolla doganale"
+
+#. module: l10n_it_bill_of_entry
+#: model:ir.model,name:l10n_it_bill_of_entry.model_res_company
+msgid "Companies"
+msgstr "Aziende"
+
+#. module: l10n_it_bill_of_entry
+#: help:account.config.settings,bill_of_entry_journal_id:0
+#: help:res.company,bill_of_entry_journal_id:0
+msgid "Journal used for reconciliation of customs supplier"
+msgstr "Sezionale usato per la riconciliazione del fotnirore dogana"
+
+#. module: l10n_it_bill_of_entry
+#: field:account.invoice,forwarder_bill_of_entry_ids:0
+msgid "Forward Bill of Entries"
+msgstr "Bolla doganale spedizioniere"
+
+#. module: l10n_it_bill_of_entry
+#: code:addons/l10n_it_bill_of_entry/account_invoice.py:52
+#: code:addons/l10n_it_bill_of_entry/account_invoice.py:61
+#: code:addons/l10n_it_bill_of_entry/account_invoice.py:65
+#: code:addons/l10n_it_bill_of_entry/account_invoice.py:93
+#, python-format
+msgid "Error"
+msgstr "Errore"
+
+#. module: l10n_it_bill_of_entry
+#: code:addons/l10n_it_bill_of_entry/account_invoice.py:83
+#, python-format
+msgid "Customs supplier"
+msgstr "Fornitore dogana"
+
+#. module: l10n_it_bill_of_entry
+#: selection:account.invoice,customs_doc_type:0
+#: field:account.invoice,forwarder_invoice_id:0
+msgid "Forwarder Invoice"
+msgstr "Fatture spedizioniere"
+
+#. module: l10n_it_bill_of_entry
+#: code:addons/l10n_it_bill_of_entry/account_invoice.py:52
+#, python-format
+msgid "Bill of entry %s is in state %s"
+msgstr "La bolla doganale %s è in stato %s"
+
+#. module: l10n_it_bill_of_entry
+#: model:ir.model,name:l10n_it_bill_of_entry.model_account_invoice_line
+msgid "Invoice Line"
+msgstr "Righe Fattura"
+
+#. module: l10n_it_bill_of_entry
+#: code:addons/l10n_it_bill_of_entry/account_invoice.py:76
+#, python-format
+msgid "Customs expenses"
+msgstr "Spese doganali"
+
+#. module: l10n_it_bill_of_entry
+#: model:ir.model,name:l10n_it_bill_of_entry.model_wizard_select_invoice_template
+msgid "wizard.select.invoice.template"
+msgstr "wizard.select.invoice.template"
+
+#. module: l10n_it_bill_of_entry
+#: code:addons/l10n_it_bill_of_entry/account_invoice.py:94
+#, python-format
+msgid "Can't handle more than 1 tax for line %s"
+msgstr "Impossibile gestire più di un'imposta per la riga %s"
+
+#. module: l10n_it_bill_of_entry
+#: model:ir.model,name:l10n_it_bill_of_entry.model_account_invoice
+msgid "Invoice"
+msgstr "Fattura"
+
+#. module: l10n_it_bill_of_entry
+#: field:account.invoice.line,advance_customs_vat:0
+msgid "Advance Customs Vat"
+msgstr "IVA doganale anticipata"
+
+#. module: l10n_it_bill_of_entry
+#: code:addons/l10n_it_bill_of_entry/account_invoice.py:65
+#, python-format
+msgid "No Bill of entry Storno journal configured"
+msgstr "Nessun sezionale di storno bolla doganale configurato"
diff --git a/l10n_it_bill_of_entry/wizard/__init__.py b/l10n_it_bill_of_entry/wizard/__init__.py
new file mode 100644
index 000000000000..a22b7fbd1570
--- /dev/null
+++ b/l10n_it_bill_of_entry/wizard/__init__.py
@@ -0,0 +1,24 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+#    Copyright (C) 2013 Agile Business Group sagl
+#    (<http://www.agilebg.com>)
+#    Copyright (C) 2013
+#    Associazione OpenERP Italia (<http://www.openerp-italia.org>)
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as published by
+#    the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+import select_template
diff --git a/l10n_it_bill_of_entry/wizard/select_template.py b/l10n_it_bill_of_entry/wizard/select_template.py
new file mode 100644
index 000000000000..ad72e8186518
--- /dev/null
+++ b/l10n_it_bill_of_entry/wizard/select_template.py
@@ -0,0 +1,42 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    Copyright (C) 2013 Agile Business Group sagl (<http://www.agilebg.com>)
+#    Copyright (C) 2013
+#    Associazione OpenERP Italia (<http://www.openerp-italia.org>)
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as published
+#    by the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+from openerp.osv import fields, osv, orm
+from openerp.tools.translate import _
+
+
+class wizard_select_invoice_template(orm.TransientModel):
+    _inherit = "wizard.select.invoice.template"
+
+    def load_template(self, cr, uid, ids, context=None):
+        res = super(wizard_select_invoice_template, self).load_template(cr, uid, ids, context=context)
+        if context.get('active_model') == 'account.invoice':
+            invoice = self.pool.get('account.invoice').browse(cr, uid,
+                context.get('active_id'), context=context)
+            if invoice and invoice.customs_doc_type == 'forwarder_invoice':
+                invoice_id = res['res_id']
+                invoice_obj = self.pool.get('account.invoice')
+                invoice_obj.write(cr, uid, invoice_id, {
+                    'customs_doc_type': 'bill_of_entry',
+                    'forwarder_invoice_id': context.get('active_id')
+                }, context=context)
+        return res

From 43e0c2cba3a2689a5b3f1a4811273d961d499b30 Mon Sep 17 00:00:00 2001
From: "Pedro M. Baeza" <pedro.baeza@gmail.com>
Date: Thu, 6 Oct 2016 14:55:16 +0200
Subject: [PATCH 04/20] [MIG] Rename manifest files

---
 l10n_it_bill_of_entry/{__openerp__.py => __manifest__.py} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename l10n_it_bill_of_entry/{__openerp__.py => __manifest__.py} (100%)

diff --git a/l10n_it_bill_of_entry/__openerp__.py b/l10n_it_bill_of_entry/__manifest__.py
similarity index 100%
rename from l10n_it_bill_of_entry/__openerp__.py
rename to l10n_it_bill_of_entry/__manifest__.py

From dd8bb4db7807acea710654467e239ca5db841e23 Mon Sep 17 00:00:00 2001
From: dbrus <d.bruselli@creativiquadrati.it>
Date: Thu, 21 Sep 2017 16:10:05 +0200
Subject: [PATCH 05/20] [10.0][MIG]l10n_it_bill_of_entry: migration to rel. 10

 * essential features migration from rel. 7
 * adding demo data and unit tests
---
 l10n_it_bill_of_entry/AUTHORS.txt             |   3 -
 l10n_it_bill_of_entry/README.rst              | 129 +++++++++
 l10n_it_bill_of_entry/__init__.py             |  28 +-
 l10n_it_bill_of_entry/__manifest__.py         |  94 ++-----
 l10n_it_bill_of_entry/account_invoice.py      | 139 ----------
 .../account_invoice_view.xml                  |  50 ----
 l10n_it_bill_of_entry/company.py              |  41 ---
 l10n_it_bill_of_entry/company_view.xml        |  25 --
 .../demo/bill_of_entry_demo.xml               | 159 +++++++++++
 l10n_it_bill_of_entry/i18n/it.po              |  96 +++----
 l10n_it_bill_of_entry/models/__init__.py      |  14 +
 .../models/account_invoice.py                 | 152 +++++++++++
 l10n_it_bill_of_entry/models/company.py       |  34 +++
 .../static/description/icon.png               | Bin 0 -> 9455 bytes
 .../static/src/css/l10n_it_bill_of_entry.css  |  32 +++
 l10n_it_bill_of_entry/tests/__init__.py       |  11 +
 .../tests/test_bill_of_entry.py               | 250 ++++++++++++++++++
 .../views/account_invoice_view.xml            |  61 +++++
 l10n_it_bill_of_entry/views/company_view.xml  |  24 ++
 l10n_it_bill_of_entry/wizard/__init__.py      |  24 --
 .../wizard/select_template.py                 |  42 ---
 21 files changed, 942 insertions(+), 466 deletions(-)
 delete mode 100644 l10n_it_bill_of_entry/AUTHORS.txt
 create mode 100644 l10n_it_bill_of_entry/README.rst
 delete mode 100644 l10n_it_bill_of_entry/account_invoice.py
 delete mode 100644 l10n_it_bill_of_entry/account_invoice_view.xml
 delete mode 100644 l10n_it_bill_of_entry/company.py
 delete mode 100644 l10n_it_bill_of_entry/company_view.xml
 create mode 100644 l10n_it_bill_of_entry/demo/bill_of_entry_demo.xml
 create mode 100644 l10n_it_bill_of_entry/models/__init__.py
 create mode 100644 l10n_it_bill_of_entry/models/account_invoice.py
 create mode 100644 l10n_it_bill_of_entry/models/company.py
 create mode 100644 l10n_it_bill_of_entry/static/description/icon.png
 create mode 100644 l10n_it_bill_of_entry/static/src/css/l10n_it_bill_of_entry.css
 create mode 100644 l10n_it_bill_of_entry/tests/__init__.py
 create mode 100644 l10n_it_bill_of_entry/tests/test_bill_of_entry.py
 create mode 100644 l10n_it_bill_of_entry/views/account_invoice_view.xml
 create mode 100644 l10n_it_bill_of_entry/views/company_view.xml
 delete mode 100644 l10n_it_bill_of_entry/wizard/__init__.py
 delete mode 100644 l10n_it_bill_of_entry/wizard/select_template.py

diff --git a/l10n_it_bill_of_entry/AUTHORS.txt b/l10n_it_bill_of_entry/AUTHORS.txt
deleted file mode 100644
index 1a7b14ff567e..000000000000
--- a/l10n_it_bill_of_entry/AUTHORS.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-Alex Comba <alex.comba@agilebg.com>
-Lorenzo Battistini <lorenzo.battistini@agilebg.com>
-
diff --git a/l10n_it_bill_of_entry/README.rst b/l10n_it_bill_of_entry/README.rst
new file mode 100644
index 000000000000..c8b55be1d202
--- /dev/null
+++ b/l10n_it_bill_of_entry/README.rst
@@ -0,0 +1,129 @@
+.. image:: https://img.shields.io/badge/licence-AGPL--3-blue.svg
+   :target: http://www.gnu.org/licenses/agpl-3.0-standalone.html
+   :alt: License: AGPL-3
+
+====================================================
+Italian Localization - Bill of Entry: Bolle Doganali
+====================================================
+
+This module enables to manage extraUE import purchases, generating a bill of entry
+according to the supplier invoice.
+It involves three documents:
+
+* Supplier Invoice
+* Forwarder Invoice
+* Bill of Entry
+
+Here how documents are linked each other:
+
+* N bill of entries --> N supplier invoices
+* N bill of entries --> 1 forwarder invoice
+
+Configuration
+=============
+
+Mandatory settings:
+
+* An account journal required by the closing transfer account move (e.g. "Bolle Doganali").
+* An account journal for extraCEE supplier invoices, apart from 
+  ordinary supplier invoices. In this way, extraCEE supplier invoices don't appear in VAT registries;
+  in this way, VAT registries have no missing numbers.
+* Add a tax mapping on Extra EU fiscal position: purchase taxes (e.g. 22%) should be mapped to
+  to no one tax. In this way, every purchase invoice for extra UE fiscal position
+  don't show taxes in lines, according to law.
+* A virtual supplier (e.g. "Customs" or "Dogana") for the bill of entry.
+* The forwarder as a real supplier.
+* An expense account where recording the bill of entry net amount (e.g. "ACQUISTO MERCI ExtraCEE").
+* An expense account where recording the bill of entry VAT amount,
+  paid in advance by the forwarder and declared in the forwarder invoice (e.g. "SPESE DOGANALI ANTICIPATE").
+
+Optional settings:
+
+* An account tax, with the same VAT rate as the ordinary one (i.e. 22% for Italy),
+  applied on the bill of entry net amount (e.g. "22% debito ExtraCEE"). In this way,
+  bill of entries are highlighted in VAT registries due to this tax code.
+* An account for delivery expenses, recorded in the forwarderd invoice (e.g. "SPESE DI TRASPORTO").
+* An account for customs duties, recorded in the forwarderd invoice (e.g. "DIRITTI DOGANALI").
+* An account for stamp duties, recorded in the forwarderd invoice (e.g. "IMPOSTE DI BOLLO").
+
+Usage
+=====
+
+English
+-------
+
+Each bill of entry can be manually linked to its corresponding supplier invoice.
+
+The forwarder invoice requires one (or more) line(s) marked as the
+advance customs vat.
+
+At the forwarder invoice confirmation, it would be linked to the closing
+transfer account move, which closes and reconciles the bill of entry.
+
+Italiano
+--------
+
+Dalla bolla doganale è possibile collegare manualmente la (o le) fattura(e)
+fornitore corrispondente.
+
+Nella fattura spedizioniere bisogna indicare quale (o quali) riga (righe)
+rappresenti(no) l'IVA anticipata alla dogana.
+
+Alla conferma della fattura spedizioniere, verrà generata la scrittura
+contabile di giroconto per chiudere la bolla doganale.
+
+
+.. image:: https://odoo-community.org/website/image/ir.attachment/5784_f2813bd/datas
+   :alt: Try me on Runbot
+   :target: https://runbot.odoo-community.org/runbot/122/10.0
+
+Workplan and future improvements
+================================
+
+Previous releases of this module were able to create bill of entries
+through a wizard button, according to a predefined bill of entry invoice template.
+
+This feature requires account_invoice_template module, which is not yet fully available.
+
+
+Bug Tracker
+===========
+
+Bugs are tracked on `GitHub Issues
+<https://github.com/OCA/l10n-italy/issues>`_. In case of trouble, please
+check there if your issue has already been reported. If you spotted it first,
+help us smash it by providing detailed and welcomed feedback.
+
+Credits
+=======
+
+Contributors
+------------
+
+* Alex Comba <alex.comba@agilebg.com>
+* Lorenzo Battistini <lorenzo.battistini@agilebg.com>
+* Diego Bruselli <d.bruselli@creativiquadrati.it>
+
+Do not contact contributors directly about support or help with technical issues.
+
+Funders
+-------
+
+The development of this module has been financially supported by:
+
+* Odoo Italia Network
+
+Maintainer
+----------
+
+.. image:: http://odoo-community.org/logo.png
+   :alt: Odoo Community Association
+   :target: http://odoo-community.org
+
+This module is maintained by the OCA.
+
+OCA, or the Odoo Community Association, is a nonprofit organization whose
+mission is to support the collaborative development of Odoo features and
+promote its widespread use.
+
+To contribute to this module, please visit http://odoo-community.org.
diff --git a/l10n_it_bill_of_entry/__init__.py b/l10n_it_bill_of_entry/__init__.py
index c639c059375f..dc2b7d742df5 100644
--- a/l10n_it_bill_of_entry/__init__.py
+++ b/l10n_it_bill_of_entry/__init__.py
@@ -1,26 +1,16 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
 ##############################################################################
 #
-#    Copyright (C) 2013 Agile Business Group sagl
-#    (<http://www.agilebg.com>)
+#    Copyright (C) 2013-2017 Agile Business Group sagl (http://www.agilebg.com)
+#    @author Alex Comba <alex.comba@agilebg.com>
+#    @author Lorenzo Battistini <lorenzo.battistini@agilebg.com>
+#    Copyright (C) 2017 CQ Creativi Quadrati (http://www.creativiquadrati.it)
+#    @author Diego Bruselli <d.bruselli@creativiquadrati.it>
 #    Copyright (C) 2013
-#    Associazione OpenERP Italia (<http://www.openerp-italia.org>)
 #
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as published by
-#    the Free Software Foundation, either version 3 of the License, or
-#    (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU General Public License for more details.
-#
-#    You should have received a copy of the GNU General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#    License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
 #
 ##############################################################################
 
-import account_invoice
-import wizard
-import company
+from . import models
+from . import tests
diff --git a/l10n_it_bill_of_entry/__manifest__.py b/l10n_it_bill_of_entry/__manifest__.py
index be987e88e4b7..a8a3c9590d6a 100644
--- a/l10n_it_bill_of_entry/__manifest__.py
+++ b/l10n_it_bill_of_entry/__manifest__.py
@@ -1,78 +1,40 @@
 # -*- coding: utf-8 -*-
 ##############################################################################
 #
-#    Copyright (C) 2013 Agile Business Group sagl (<http://www.agilebg.com>)
+#    Copyright (C) 2013-2017 Agile Business Group sagl (http://www.agilebg.com)
+#    @author Alex Comba <alex.comba@agilebg.com>
+#    @author Lorenzo Battistini <lorenzo.battistini@agilebg.com>
+#    Copyright (C) 2017 CQ Creativi Quadrati (http://www.creativiquadrati.it)
+#    @author Diego Bruselli <d.bruselli@creativiquadrati.it>
 #    Copyright (C) 2013
-#    Associazione OpenERP Italia (<http://www.openerp-italia.org>)
 #
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as published
-#    by the Free Software Foundation, either version 3 of the License, or
-#    (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#    License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
 #
 ##############################################################################
+
 {
     'name': 'Italian Localisation - Bill of Entry',
-    'version': '0.1',
-    'category': 'Localisation/Italy',
-    'description': """
-Bolle doganali
-===============
-
-Specifiche
-----------
-
-http://wiki.openerp-italia.org/doku.php/area_utente/requisiti/extraue
-
-Ci sono 3 documenti coinvolti:
-
- - Fattura fornitore
- - Fattura spedizioniere
- - Bolla doganale
- 
-Le relazioni:
-
-N bolle doganali -> N fatture fornitore
-1 fattura spedizioniere -> N bolle doganali
-
-Configurazione
---------------
-
-E' necessario configurare in contabilità il sezionale da utilizzare per il
-giroconto di chiusura.
-
-Utilizzo
---------
-
-Dalla bolla doganale è possibile collegare manualmente la (o le) fattura(e)
-fornitore corrispondente.
-
-Dalla fattura spedizioniere è possibile generare la (o le) bolla(e) doganale(i)
-tramite il bottone 'genera bolla'. Per questa operazione bisogna prima configurare
-un template di fattura (usato per la bolla doganale).
-
-Nella fattura spedizioniere bisogna indicare quale (o quali) riga (righe)
-rappresenti(no) l'IVA anticipata alla dogana.
-
-Alla conferma della fattura spedizioniere, verrà generata la scrittura contabile di giroconto per chiudere la bolla doganale.
-
-""",
-    'author': "Agile Business Group,Odoo Community Association (OCA)",
-    'website': 'http://www.agilebg.com',
+    'version': '10.0.1.0.0',
+    'category': 'Localization/Italy',
+    'summary': 'Bolle Doganali',
+    'author': "Odoo Community Association (OCA), "
+              "Agile Business Group, CQ Creativi Quadrati",
+    'website': "https://odoo-community.org/",
     'license': 'AGPL-3',
-    "depends": ['base', 'account_invoice_template'],
-    "data": [
-        'account_invoice_view.xml',
-        'company_view.xml',
+    # account dependency should be replaced with account_invoice_template
+    # when this PR will be merged:
+    # https://github.com/OCA/account-invoicing/pull/250
+    'depends': [
+        'base',
+        'account',
+        # 'account_invoice_template',
+    ],
+    'data': [
+        'views/company_view.xml',
+        'views/account_invoice_view.xml',
+    ],
+    'demo': [
+        'demo/bill_of_entry_demo.xml',
     ],
-    "demo": [],
-    'installable': False
+    'installable': True,
 }
diff --git a/l10n_it_bill_of_entry/account_invoice.py b/l10n_it_bill_of_entry/account_invoice.py
deleted file mode 100644
index 877a7424b21b..000000000000
--- a/l10n_it_bill_of_entry/account_invoice.py
+++ /dev/null
@@ -1,139 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#
-#    Copyright (C) 2013 Agile Business Group sagl (<http://www.agilebg.com>)
-#    Copyright (C) 2013
-#    Associazione OpenERP Italia (<http://www.openerp-italia.org>)
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as published
-#    by the Free Software Foundation, either version 3 of the License, or
-#    (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-##############################################################################
-
-from openerp.osv import fields, orm
-from openerp.tools.translate import _
-
-
-class account_invoice(orm.Model):
-    _inherit = "account.invoice"
-
-    _columns = {
-        'customs_doc_type': fields.selection([
-            ('bill_of_entry', 'Bill of Entry'),
-            ('supplier_invoice', 'Supplier Invoice'),
-            ('forwarder_invoice', 'Forwarder Invoice'),
-        ], 'Customs Doc Type', readonly=True),
-        'supplier_bill_of_entry_ids': fields.many2many('account.invoice', 'sboe_invoice_rel', 'sboe_id', 'invoice_id', 'Supplier Bill of Entries', readonly=True),
-        'supplier_invoice_ids': fields.many2many('account.invoice', 'sboe_invoice_rel', 'invoice_id', 'sboe_id', 'Supplier Invoices'),
-        'forwarder_invoice_id': fields.many2one('account.invoice', 'Forwarder Invoice'),
-        'forwarder_bill_of_entry_ids': fields.one2many('account.invoice', 'forwarder_invoice_id', 'Forward Bill of Entries', readonly=True),
-        'bill_of_entry_storno_id': fields.many2one('account.move', 'Bill of Entry Storno', readonly=True),
-    }
-
-    def action_move_create(self, cr, uid, ids, context=None):
-        res = super(account_invoice,self).action_move_create(cr, uid, ids, context=context)
-        move_obj = self.pool.get('account.move')
-        move_line_obj = self.pool.get('account.move.line')
-        period_obj = self.pool.get('account.period')
-        for invoice in self.browse(cr, uid, ids, context):
-            if invoice.customs_doc_type == 'forwarder_invoice':
-                for bill_of_entry in invoice.forwarder_bill_of_entry_ids:
-                    if bill_of_entry.state not in ('open', 'paid'):
-                        raise orm.except_orm(_('Error'), _('Bill of entry %s is in state %s')
-                            % (bill_of_entry.partner_id.name, bill_of_entry.state))
-                advance_customs_vat_line = False
-                if invoice.forwarder_bill_of_entry_ids:
-                    for line in invoice.invoice_line:
-                        if line.advance_customs_vat:
-                            advance_customs_vat_line = True
-                            break
-                if not advance_customs_vat_line:
-                    raise orm.except_orm(_('Error'),
-                        _("Forwarder invoice %s does not have lines with 'Adavance Customs Vat'")
-                        % invoice.number)
-                if not invoice.company_id.bill_of_entry_journal_id:
-                    raise orm.except_orm(_('Error'), _('No Bill of entry Storno journal configured'))
-                period_ids = period_obj.find(cr, uid, dt=invoice.date_invoice, context=context)
-                move_vals = {
-                    'period_id': period_ids and period_ids[0] or False,
-                    'journal_id': invoice.company_id.bill_of_entry_journal_id.id,
-                    'date': invoice.date_invoice,
-                    }
-                move_lines = []
-                for inv_line in invoice.invoice_line:
-                    if inv_line.advance_customs_vat:
-                        move_lines.append((0, 0, {
-                            'name': _("Customs expenses"),
-                            'account_id': inv_line.account_id.id,
-                            'debit': 0.0,
-                            'credit': inv_line.price_subtotal,
-                            }))
-                for bill_of_entry in invoice.forwarder_bill_of_entry_ids:
-                    move_lines.append((0, 0, {
-                        'name': _("Customs supplier"),
-                        'account_id': bill_of_entry.account_id.id,
-                        'debit': bill_of_entry.amount_total,
-                        'credit': 0.0,
-                        'partner_id': bill_of_entry.partner_id.id,
-                        }))
-                    for boe_line in bill_of_entry.invoice_line:
-                        tax_code_id = False
-                        if boe_line.invoice_line_tax_id:
-                            if len(boe_line.invoice_line_tax_id) > 1:
-                                raise osv.except_osv(_('Error'),
-                                    _("Can't handle more than 1 tax for line %s") % boe_line.name)
-                            tax_code_id = (boe_line.invoice_line_tax_id[0].base_code_id
-                                and boe_line.invoice_line_tax_id[0].base_code_id.id or False)
-                        line_vals = {
-                            'name': _("Extra CEE expenses"),
-                            'account_id': boe_line.account_id.id,
-                            'debit': 0.0,
-                            'credit': boe_line.price_subtotal,
-                            }
-                        if tax_code_id:
-                            line_vals['tax_code_id'] = tax_code_id
-                            line_vals['tax_amount'] = boe_line.price_subtotal
-                        move_lines.append((0, 0, line_vals))
-                move_vals['line_id'] = move_lines
-                move_id = move_obj.create(cr, uid, move_vals, context=context)
-                invoice.write({'bill_of_entry_storno_id': move_id}, context=context)
-                
-                reconcile_ids = []
-                for move_line in move_obj.browse(cr, uid, move_id, context).line_id:
-                    for bill_of_entry in invoice.forwarder_bill_of_entry_ids:
-                        if move_line.account_id.id == bill_of_entry.account_id.id:
-                            reconcile_ids.append(move_line.id)
-                            for boe_move_line in bill_of_entry.move_id.line_id:
-                                if boe_move_line.account_id.id == bill_of_entry.account_id.id:
-                                    reconcile_ids.append(boe_move_line.id)
-                move_line_obj.reconcile_partial(cr, uid, reconcile_ids, type='auto',
-                    context=context)
-        return res
-        
-    def action_cancel(self, cr, uid, ids, context=None):
-        account_move_obj = self.pool.get('account.move')
-        res = super(account_invoice,self).action_cancel(cr, uid, ids, context=context)
-        for invoice in self.browse(cr, uid, ids, context):
-            if invoice.bill_of_entry_storno_id:
-                account_move_obj.button_cancel(cr, uid, [invoice.bill_of_entry_storno_id.id],
-                    context=context)
-                account_move_obj.unlink(cr, uid, [invoice.bill_of_entry_storno_id.id],
-                    context=context)
-        return res
-
-class account_invoice_line(orm.Model):
-    _inherit = "account.invoice.line"
-
-    _columns = {
-        'advance_customs_vat': fields.boolean("Advance Customs Vat"),
-    }
diff --git a/l10n_it_bill_of_entry/account_invoice_view.xml b/l10n_it_bill_of_entry/account_invoice_view.xml
deleted file mode 100644
index be6d06b451d9..000000000000
--- a/l10n_it_bill_of_entry/account_invoice_view.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<openerp>
-    <data>
-
-    	 <record model="ir.ui.view" id="invoice_supplier_form">
-    	     <field name="name">account.invoice.supplier.form</field>
-    	     <field name="model">account.invoice</field>
-    	     <field name="inherit_id" ref="account.invoice_supplier_form"/>
-    	     <field name="arch" type="xml">
-    	     	<xpath expr="//field[@name='journal_id']" position="after">
-    	     		<field name="customs_doc_type" attrs="{'readonly': ['|',('state', '!=', 'draft'), ('forwarder_bill_of_entry_ids', '!=', [])]}"/>
-	     		</xpath>
-    	     	<xpath expr="//notebook/page[@string='Payments']" position="after">
-    	     		<page string="Customs" attrs="{'invisible': [('customs_doc_type','=', False)]}">
-    	     			<separator string="Bill of entries" colspan="4" attrs="{'invisible': [('customs_doc_type','!=', 'supplier_invoice')]}"></separator>
-                        <field name="supplier_bill_of_entry_ids" attrs="{'invisible': [('customs_doc_type','!=', 'supplier_invoice')]}" />
-    	     			<separator string="Supplier invoices" colspan="4" attrs="{'invisible': [('customs_doc_type','!=', 'bill_of_entry')]}"></separator>
-    	     			<field name="supplier_invoice_ids" attrs="{'invisible': [('customs_doc_type','!=', 'bill_of_entry')]}" domain="[('customs_doc_type', '=', 'supplier_invoice')]" context="{'default_customs_doc_type': 'supplier_invoice'}"/>
-                        <group>
-                            <field name="forwarder_invoice_id" attrs="{'invisible': [('customs_doc_type','!=', 'bill_of_entry')]}" domain="[('customs_doc_type','=', 'forwarder_invoice')]" context="{'default_customs_doc_type': 'forwarder_invoice'}"/>
-                        </group>
-    	     			<separator string="Bill of entries" colspan="4" attrs="{'invisible': [('customs_doc_type','!=', 'forwarder_invoice')]}"></separator>
-    	     			<field name="forwarder_bill_of_entry_ids" attrs="{'invisible': [('customs_doc_type','!=', 'forwarder_invoice')]}"/>
-    	     			<group>
-                            <field name="bill_of_entry_storno_id" attrs="{'invisible': [('customs_doc_type','!=', 'forwarder_invoice')]}"/>
-                        </group>
-                        <button string="Make Bill of Entry" name="%(account_invoice_template.action_wizard_select_template)d" type="action" class="oe_highlight" attrs="{'invisible': ['|',('customs_doc_type','!=', 'forwarder_invoice'),('state','!=','draft')]}"/>
-    	             </page>
-    	         </xpath>
-                <xpath expr="//notebook/page[@string='Invoice']/field[@name='invoice_line']/tree/field[@name='price_subtotal']" position="after">
-                    <!--It seems attrs doesn't work -->
-                    <field name="advance_customs_vat"/>
-                </xpath>
-    	     </field>
-    	</record>
-    <record model="ir.ui.view" id="invoice_form_boe">
-      <field name="name">account.invoice.form.boe</field>
-      <field name="model">account.invoice.line</field>
-      <field name="inherit_id" ref="account.view_invoice_line_form"/>
-      <field name="arch" type="xml">
-        <field name="name" position="after">
-          <group>
-          <field name="advance_customs_vat"/>
-          </group>
-        </field>
-      </field>
-    </record>
-
-	</data>
-</openerp>
diff --git a/l10n_it_bill_of_entry/company.py b/l10n_it_bill_of_entry/company.py
deleted file mode 100644
index 88c9eaf5781e..000000000000
--- a/l10n_it_bill_of_entry/company.py
+++ /dev/null
@@ -1,41 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#
-#    Copyright (C) 2013 Agile Business Group sagl (<http://www.agilebg.com>)
-#    Copyright (C) 2013
-#    Associazione OpenERP Italia (<http://www.openerp-italia.org>)
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as published
-#    by the Free Software Foundation, either version 3 of the License, or
-#    (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-##############################################################################
-
-from openerp.osv import fields, orm
-
-class res_company(orm.Model):
-    _inherit = 'res.company'
-    _columns = {
-        'bill_of_entry_journal_id': fields.many2one('account.journal','Bill of entry Storno journal',
-            help="Journal used for reconciliation of customs supplier"),
-        }
-    
-class account_config_settings(orm.TransientModel):
-    _inherit = 'account.config.settings'
-    _columns = {
-        'bill_of_entry_journal_id': fields.related(
-            'company_id', 'bill_of_entry_journal_id',
-            type='many2one',
-            relation="account.journal",
-            string="Bill of entry Storno journal",
-            help='Journal used for reconciliation of customs supplier'),
-    }
diff --git a/l10n_it_bill_of_entry/company_view.xml b/l10n_it_bill_of_entry/company_view.xml
deleted file mode 100644
index 2b23b251937e..000000000000
--- a/l10n_it_bill_of_entry/company_view.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<openerp>
-    <data>
-
-        <record id="view_account_config_settings" model="ir.ui.view">
-            <field name="name">view_account_config_settings</field>
-            <field name="model">account.config.settings</field>
-            <field name="inherit_id" ref="account.view_account_config_settings"/>
-            <field name="arch" type="xml">
-                <xpath expr="/form/group[6]" position="after">
-                    <separator string="Bill of entry"/>
-                    <group name="Bill of entry">
-                        <label for="id" string="Configuration"/>
-                        <div>
-                            <div>
-                                <label for="bill_of_entry_journal_id"/>
-                                <field name="bill_of_entry_journal_id" class="oe_inline"/>
-                            </div>
-                        </div>
-                    </group>
-                </xpath>
-            </field>
-        </record>
-	</data>
-</openerp>
diff --git a/l10n_it_bill_of_entry/demo/bill_of_entry_demo.xml b/l10n_it_bill_of_entry/demo/bill_of_entry_demo.xml
new file mode 100644
index 000000000000..baf065f2020e
--- /dev/null
+++ b/l10n_it_bill_of_entry/demo/bill_of_entry_demo.xml
@@ -0,0 +1,159 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+    <data>
+
+
+        <!-- Account account -->
+        <record id="account_account_extraEU_purchase" model="account.account">
+            <field name="code">280310</field>
+            <field name="name">ExtraEU Goods Purchase</field>
+            <field name="user_type_id"
+                ref="account.data_account_type_current_liabilities"/>
+            <field name="reconcile">True</field>
+        </record>
+        <record id="account_account_adv_customs_expense" model="account.account">
+            <field name="code">280320</field>
+            <field name="name">Advanced Customs Expenses</field>
+            <field name="user_type_id"
+                ref="account.data_account_type_current_liabilities"/>
+            <field name="reconcile">True</field>
+        </record>
+        <record id="account_account_customs_expense" model="account.account">
+            <field name="code">421500</field>
+            <field name="name">Customs Expenses</field>
+            <field name="user_type_id"
+                ref="account.data_account_type_expenses"/>
+            <field name="reconcile">True</field>
+        </record>
+        <record id="account_account_stamp_duties" model="account.account">
+            <field name="code">421400</field>
+            <field name="name">Stamp Duties</field>
+            <field name="user_type_id"
+                ref="account.data_account_type_expenses"/>
+            <field name="reconcile">True</field>
+        </record>
+
+<!--
+            When l10n_it is installed, it creates the l10n_it.1_4201 account
+            (420100 costi di trasporto)
+-->
+        <record id="account_account_delivery_expense" model="account.account">
+            <field name="code">420101</field>
+            <field name="name">Delivery Expenses</field>
+            <field name="user_type_id"
+                ref="account.data_account_type_expenses"/>
+            <field name="reconcile">True</field>
+        </record>
+
+        <!-- Account Tax -->
+        <record id="tax_tag_22extraUE" model="account.account.tag">
+            <field name="name">22aExtraCEE</field>
+            <field name="applicability">taxes</field>
+        </record>
+        <record id="tax_22extraUE" model="account.tax">
+            <field name="name">Iva al 22% ExtraCEE (credito)</field>
+            <field name="type_tax_use">purchase</field>
+            <field name="amount_type">percent</field>
+            <field name="amount">22</field>
+            <field name="description">22aExtraCEE</field>
+            <field name="tax_group_id" ref="account.tax_group_taxes"/>
+        </record>
+
+
+
+        <!-- Partner -->
+        <record id="partner_customs" model="res.partner">
+            <field name="name">Customs</field>
+            <field name="supplier">True</field>
+            <field name="is_company">True</field>
+        </record>
+
+        <!-- Account Fiscal Position -->
+        <record id="fiscal_position_extraEU" model="account.fiscal.position">
+            <field name="name">Extra EU</field>
+         </record>
+
+        <!-- Account Fiscal Position Tax -->
+<!--
+        tax correspondence is gonna create in *.py
+        <record id="fiscal_position_tax_purchase_extraEU" model="account.fiscal.position.tax">
+            <field name="position_id" ref="fiscal_position_extraEU"/>
+
+         </record>
+-->
+
+        <!-- Account Journal -->
+        <record id="account_journal_purchase_extraEU" model="account.journal">
+            <field name="name">Supplier Invoices ExtraCEE</field>
+            <field name="type">purchase</field>
+            <field name="code">NOCEE</field>
+            <field name="update_posted">True</field>
+         </record>
+
+
+        <!-- Product product -->
+        <record id="product_product_extraEU_purchase" model="product.product">
+            <field name="name">ExtraEU Goods Purchase</field>
+            <field name="categ_id" ref="product.product_category_1"/>
+            <field name="purchase_ok">True</field>
+            <field name="standard_price">1.0</field>
+            <field name="list_price">1.0</field>
+            <field name="type">service</field>
+            <field name="uom_id" ref="product.product_uom_unit"/>
+            <field name="uom_po_id" ref="product.product_uom_unit"/>
+            <field name="property_account_expense_id"
+                eval="[(6, 0, [ref('account_account_extraEU_purchase')])]"/>
+            <field name="supplier_taxes_id"
+                eval="[(6, 0, [ref('tax_22extraUE')])]"/>
+        </record>
+        <record id="product_product_adv_customs_expense" model="product.product">
+            <field name="name">Advance Customs Expense</field>
+            <field name="categ_id" ref="product.product_category_1"/>
+            <field name="purchase_ok">True</field>
+            <field name="standard_price">1.0</field>
+            <field name="list_price">1.0</field>
+            <field name="type">service</field>
+            <field name="uom_id" ref="product.product_uom_unit"/>
+            <field name="uom_po_id" ref="product.product_uom_unit"/>
+            <field name="property_account_expense_id"
+                eval="[(6, 0, [ref('account_account_adv_customs_expense')])]"/>
+        </record>
+        <record id="product_product_customs_expense" model="product.product">
+            <field name="name">Customs Expense</field>
+            <field name="categ_id" ref="product.product_category_1"/>
+            <field name="purchase_ok">True</field>
+            <field name="standard_price">1.0</field>
+            <field name="list_price">1.0</field>
+            <field name="type">service</field>
+            <field name="uom_id" ref="product.product_uom_unit"/>
+            <field name="uom_po_id" ref="product.product_uom_unit"/>
+            <field name="property_account_expense_id"
+                eval="[(6, 0, [ref('account_account_customs_expense')])]"/>
+        </record>
+        <record id="product_product_delivery" model="product.product">
+            <field name="name">Delivery Expense</field>
+            <field name="categ_id" ref="product.product_category_1"/>
+            <field name="purchase_ok">True</field>
+            <field name="standard_price">1.0</field>
+            <field name="list_price">1.0</field>
+            <field name="type">service</field>
+            <field name="uom_id" ref="product.product_uom_unit"/>
+            <field name="uom_po_id" ref="product.product_uom_unit"/>
+            <field name="property_account_expense_id"
+                eval="[(6, 0, [ref('account_account_delivery_expense')])]"/>
+        </record>
+        <record id="product_product_stamp_duties" model="product.product">
+            <field name="name">Stamp Duties</field>
+            <field name="categ_id" ref="product.product_category_1"/>
+            <field name="purchase_ok">True</field>
+            <field name="standard_price">1.0</field>
+            <field name="list_price">1.0</field>
+            <field name="type">service</field>
+            <field name="uom_id" ref="product.product_uom_unit"/>
+            <field name="uom_po_id" ref="product.product_uom_unit"/>
+            <field name="property_account_expense_id"
+                eval="[(6, 0, [ref('account_account_stamp_duties')])]"/>
+        </record>
+
+    </data>
+</odoo>
diff --git a/l10n_it_bill_of_entry/i18n/it.po b/l10n_it_bill_of_entry/i18n/it.po
index 56d483ec51ab..8c8f5d57c2e8 100644
--- a/l10n_it_bill_of_entry/i18n/it.po
+++ b/l10n_it_bill_of_entry/i18n/it.po
@@ -1,28 +1,29 @@
-# Translation of OpenERP Server.
+# Translation of Odoo Server.
 # This file contains the translation of the following modules:
-# 	* l10n_it_bill_of_entry
-#
+# * l10n_it_bill_of_entry
+# 
+# Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: OpenERP Server 7.0\n"
+"Project-Id-Version: Odoo Server 10.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-07-18 18:13+0000\n"
-"PO-Revision-Date: 2013-07-18 20:17+0100\n"
-"Last-Translator: Lorenzo Battistini <lorenzo.battistini@agilebg.com>\n"
-"Language-Team: \n"
+"POT-Creation-Date: 2017-09-25 08:32+0000\n"
+"PO-Revision-Date: 2017-09-25 08:32+0000\n"
+"Last-Translator: Diego Bruselli <d.bruselli@gmail.com>\n"
+"Language-Team: Italian (http://www.transifex.com/oca/OCA-l10n-italy-10-0/language/it/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: \n"
-"X-Generator: Poedit 1.5.4\n"
+"Content-Transfer-Encoding: \n"
+"Language: it\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. module: l10n_it_bill_of_entry
-#: view:account.invoice:0
+#: model:ir.ui.view,arch_db:l10n_it_bill_of_entry.invoice_supplier_boe_form
 msgid "Supplier invoices"
 msgstr "Fatture fornitore"
 
 #. module: l10n_it_bill_of_entry
-#: field:account.invoice,customs_doc_type:0
+#: model:ir.model.fields,field_description:l10n_it_bill_of_entry.field_account_invoice_customs_doc_type
 msgid "Customs Doc Type"
 msgstr "Tipo documento doganale"
 
@@ -37,13 +38,13 @@ msgid "Supplier Invoice"
 msgstr "Fattura fornitore"
 
 #. module: l10n_it_bill_of_entry
-#: code:addons/l10n_it_bill_of_entry/account_invoice.py:62
+#: code:addons/l10n_it_bill_of_entry/account_invoice.py:70
 #, python-format
-msgid "Forwarder invoice %s does not have lines with 'Adavance Customs Vat'"
+msgid "Forwarder invoice %s does not have lines with 'Advance Customs Vat'"
 msgstr "La fattura fornitore %s non ha riga con 'IVA anticipata'"
 
 #. module: l10n_it_bill_of_entry
-#: field:account.invoice,bill_of_entry_storno_id:0
+#: model:ir.model.fields,field_description:l10n_it_bill_of_entry.field_account_invoice_bill_of_entry_storno_id
 msgid "Bill of Entry Storno"
 msgstr "Storno bolla doganale"
 
@@ -53,91 +54,77 @@ msgid "Bill of Entry"
 msgstr "Bolla doganale"
 
 #. module: l10n_it_bill_of_entry
-#: field:account.invoice,supplier_invoice_ids:0
+#: model:ir.model.fields,field_description:l10n_it_bill_of_entry.field_account_invoice_supplier_invoice_ids
 msgid "Supplier Invoices"
 msgstr "Fatture fornitore"
 
 #. module: l10n_it_bill_of_entry
-#: view:account.invoice:0
+#: model:ir.ui.view,arch_db:l10n_it_bill_of_entry.invoice_supplier_form
 msgid "Make Bill of Entry"
 msgstr "Genera bolla doganale"
 
 #. module: l10n_it_bill_of_entry
-#: field:account.invoice,supplier_bill_of_entry_ids:0
+#: model:ir.model.fields,field_description:l10n_it_bill_of_entry.field_account_invoice_supplier_bill_of_entry_ids
 msgid "Supplier Bill of Entries"
 msgstr "Bolle doganali fornitore"
 
 #. module: l10n_it_bill_of_entry
-#: view:account.invoice:0
+#: model:ir.ui.view,arch_db:l10n_it_bill_of_entry.invoice_supplier_boe_form
 msgid "Customs"
 msgstr "Dogana"
 
 #. module: l10n_it_bill_of_entry
-#: code:addons/l10n_it_bill_of_entry/account_invoice.py:98
+#: code:addons/l10n_it_bill_of_entry/account_invoice.py:123
 #, python-format
 msgid "Extra CEE expenses"
 msgstr "Uscite extra CEE"
 
 #. module: l10n_it_bill_of_entry
-#: view:account.invoice:0
+#: model:ir.ui.view,arch_db:l10n_it_bill_of_entry.invoice_supplier_boe_form
 msgid "Bill of entries"
 msgstr "Bolle doganali"
 
 #. module: l10n_it_bill_of_entry
-#: view:account.config.settings:0
+#: model:ir.ui.view,arch_db:l10n_it_bill_of_entry.view_boe_config_settings
 msgid "Configuration"
 msgstr "Configurazione"
 
 #. module: l10n_it_bill_of_entry
-#: view:account.config.settings:0
+#: model:ir.ui.view,arch_db:l10n_it_bill_of_entry.view_boe_config_settings
 msgid "Bill of entry"
 msgstr "Bolla doganale"
 
 #. module: l10n_it_bill_of_entry
-#: field:account.config.settings,bill_of_entry_journal_id:0
-#: field:res.company,bill_of_entry_journal_id:0
+#: model:ir.model.fields,field_description:l10n_it_bill_of_entry.field_res_company_bill_of_entry_journal_id
+#: model:ir.model.fields,field_description:l10n_it_bill_of_entry.field_account_config_settings_bill_of_entry_journal_id
 msgid "Bill of entry Storno journal"
 msgstr "Sezionale di storno bolla doganale"
 
 #. module: l10n_it_bill_of_entry
-#: model:ir.model,name:l10n_it_bill_of_entry.model_res_company
-msgid "Companies"
-msgstr "Aziende"
-
-#. module: l10n_it_bill_of_entry
-#: help:account.config.settings,bill_of_entry_journal_id:0
-#: help:res.company,bill_of_entry_journal_id:0
+#: model:ir.model.fields,help:l10n_it_bill_of_entry.field_res_company_bill_of_entry_journal_id
+#: model:ir.model.fields,help:l10n_it_bill_of_entry.field_account_config_settings_bill_of_entry_journal_id
 msgid "Journal used for reconciliation of customs supplier"
-msgstr "Sezionale usato per la riconciliazione del fotnirore dogana"
+msgstr "Sezionale usato per la riconciliazione del fornitore dogana"
 
 #. module: l10n_it_bill_of_entry
-#: field:account.invoice,forwarder_bill_of_entry_ids:0
+#: model:ir.model.fields,field_description:l10n_it_bill_of_entry.field_account_invoice_forwarder_bill_of_entry_ids
 msgid "Forward Bill of Entries"
 msgstr "Bolla doganale spedizioniere"
 
 #. module: l10n_it_bill_of_entry
-#: code:addons/l10n_it_bill_of_entry/account_invoice.py:52
-#: code:addons/l10n_it_bill_of_entry/account_invoice.py:61
-#: code:addons/l10n_it_bill_of_entry/account_invoice.py:65
-#: code:addons/l10n_it_bill_of_entry/account_invoice.py:93
-#, python-format
-msgid "Error"
-msgstr "Errore"
-
-#. module: l10n_it_bill_of_entry
-#: code:addons/l10n_it_bill_of_entry/account_invoice.py:83
+#: code:addons/l10n_it_bill_of_entry/account_invoice.py:99
 #, python-format
 msgid "Customs supplier"
 msgstr "Fornitore dogana"
 
 #. module: l10n_it_bill_of_entry
 #: selection:account.invoice,customs_doc_type:0
-#: field:account.invoice,forwarder_invoice_id:0
+#: model:ir.model.fields,field_description:l10n_it_bill_of_entry.field_account_invoice_forwarder_invoice_id
 msgid "Forwarder Invoice"
-msgstr "Fatture spedizioniere"
+msgstr "Fattura spedizioniere"
 
 #. module: l10n_it_bill_of_entry
-#: code:addons/l10n_it_bill_of_entry/account_invoice.py:52
+#: code:addons/l10n_it_bill_of_entry/account_invoice.py:57
 #, python-format
 msgid "Bill of entry %s is in state %s"
 msgstr "La bolla doganale %s è in stato %s"
@@ -148,7 +135,7 @@ msgid "Invoice Line"
 msgstr "Righe Fattura"
 
 #. module: l10n_it_bill_of_entry
-#: code:addons/l10n_it_bill_of_entry/account_invoice.py:76
+#: code:addons/l10n_it_bill_of_entry/account_invoice.py:88
 #, python-format
 msgid "Customs expenses"
 msgstr "Spese doganali"
@@ -159,23 +146,18 @@ msgid "wizard.select.invoice.template"
 msgstr "wizard.select.invoice.template"
 
 #. module: l10n_it_bill_of_entry
-#: code:addons/l10n_it_bill_of_entry/account_invoice.py:94
+#: code:addons/l10n_it_bill_of_entry/account_invoice.py:113
 #, python-format
 msgid "Can't handle more than 1 tax for line %s"
 msgstr "Impossibile gestire più di un'imposta per la riga %s"
 
 #. module: l10n_it_bill_of_entry
-#: model:ir.model,name:l10n_it_bill_of_entry.model_account_invoice
-msgid "Invoice"
-msgstr "Fattura"
-
-#. module: l10n_it_bill_of_entry
-#: field:account.invoice.line,advance_customs_vat:0
+#: model:ir.model.fields,field_description:l10n_it_bill_of_entry.field_account_invoice_line_advance_customs_vat
 msgid "Advance Customs Vat"
 msgstr "IVA doganale anticipata"
 
 #. module: l10n_it_bill_of_entry
-#: code:addons/l10n_it_bill_of_entry/account_invoice.py:65
+#: code:addons/l10n_it_bill_of_entry/account_invoice.py:75
 #, python-format
 msgid "No Bill of entry Storno journal configured"
 msgstr "Nessun sezionale di storno bolla doganale configurato"
diff --git a/l10n_it_bill_of_entry/models/__init__.py b/l10n_it_bill_of_entry/models/__init__.py
new file mode 100644
index 000000000000..1eb4fdd51ec2
--- /dev/null
+++ b/l10n_it_bill_of_entry/models/__init__.py
@@ -0,0 +1,14 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    Copyright (C) 2013-2017 Agile Business Group sagl (http://www.agilebg.com)
+#    Copyright (C) 2017 CQ Creativi Quadrati (http://www.creativiquadrati.it)
+#    @author Diego Bruselli <d.bruselli@creativiquadrati.it>
+#    Copyright (C) 2013
+#
+#    License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
+#
+##############################################################################
+
+from . import account_invoice
+from . import company
diff --git a/l10n_it_bill_of_entry/models/account_invoice.py b/l10n_it_bill_of_entry/models/account_invoice.py
new file mode 100644
index 000000000000..919f3d877d2d
--- /dev/null
+++ b/l10n_it_bill_of_entry/models/account_invoice.py
@@ -0,0 +1,152 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    Copyright (C) 2013-2017 Agile Business Group sagl (http://www.agilebg.com)
+#    @author Alex Comba <alex.comba@agilebg.com>
+#    @author Lorenzo Battistini <lorenzo.battistini@agilebg.com>
+#    Copyright (C) 2017 CQ Creativi Quadrati (http://www.creativiquadrati.it)
+#    @author Diego Bruselli <d.bruselli@creativiquadrati.it>
+#    Copyright (C) 2013
+#
+#    License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
+#
+##############################################################################
+
+from odoo import fields, models, api
+from odoo.tools.translate import _
+from odoo.exceptions import UserError
+
+
+class AccountInvoice(models.Model):
+    _inherit = "account.invoice"
+
+    customs_doc_type = fields.Selection([
+        ('bill_of_entry', 'Bill of Entry'),
+        ('supplier_invoice', 'Supplier Invoice'),
+        ('forwarder_invoice', 'Forwarder Invoice'),
+    ], 'Customs Doc Type', readonly=True)
+    supplier_bill_of_entry_ids = fields.Many2many(
+        'account.invoice', 'sboe_invoice_rel', 'sboe_id', 'invoice_id',
+        'Supplier Bill of Entries', readonly=True)
+    supplier_invoice_ids = fields.Many2many(
+        'account.invoice', 'sboe_invoice_rel', 'invoice_id', 'sboe_id',
+        'Supplier Invoices')
+    forwarder_invoice_id = fields.Many2one(
+        'account.invoice', 'Forwarder Invoice')
+    forwarder_bill_of_entry_ids = fields.One2many(
+        'account.invoice', 'forwarder_invoice_id',
+        'Forward Bill of Entries', readonly=True)
+    bill_of_entry_storno_id = fields.Many2one(
+        'account.move', 'Bill of Entry Storno', readonly=True)
+
+    @api.multi
+    def action_move_create(self):
+        res = super(AccountInvoice, self).action_move_create()
+
+        AccountMove = self.env['account.move']
+        AccountMoveLine = self.env['account.move.line']
+        for invoice in self:
+            if invoice.customs_doc_type == 'forwarder_invoice':
+                for bill_of_entry in invoice.forwarder_bill_of_entry_ids:
+                    if bill_of_entry.state not in ('open', 'paid'):
+                        raise UserError(
+                            _('Bill of entry %s is in state %s')
+                            % (
+                                bill_of_entry.partner_id.name,
+                                bill_of_entry.state)
+                        )
+                advance_customs_vat_line = False
+                if invoice.forwarder_bill_of_entry_ids:
+                    for line in invoice.invoice_line_ids:
+                        if line.advance_customs_vat:
+                            advance_customs_vat_line = True
+                            break
+                if not advance_customs_vat_line:
+                    raise UserError(
+                        _("Forwarder invoice %s does not have lines with "
+                          "'Advance Customs Vat'")
+                        % invoice.number)
+                if not invoice.company_id.bill_of_entry_journal_id:
+                    raise UserError(
+                        _('No Bill of entry Storno journal configured')
+                    )
+                move_vals = {
+                    'journal_id': (
+                        invoice.company_id.bill_of_entry_journal_id.id),
+                    'date': invoice.date_invoice,
+                }
+                move_lines = []
+                for inv_line in invoice.invoice_line_ids:
+                    if inv_line.advance_customs_vat:
+                        line_vals = {
+                            'name': _("Customs expenses"),
+                            'account_id': inv_line.account_id.id,
+                            'debit': 0.0,
+                            'credit': inv_line.price_subtotal,
+                            'partner_id': inv_line.partner_id.id,
+                        }
+                        if inv_line.product_id:
+                            line_vals['product_id'] = inv_line.product_id.id
+                        move_lines.append((0, 0, line_vals))
+                for bill_of_entry in invoice.forwarder_bill_of_entry_ids:
+                    line_vals = {
+                        'name': _("Customs supplier"),
+                        'account_id': bill_of_entry.account_id.id,
+                        'debit': bill_of_entry.amount_total,
+                        'credit': 0.0,
+                        'partner_id': bill_of_entry.partner_id.id,
+                    }
+                    move_lines.append((0, 0, line_vals))
+                    for boe_line in bill_of_entry.invoice_line_ids:
+                        if boe_line.invoice_line_tax_ids:
+                            if len(boe_line.invoice_line_tax_ids) > 1:
+                                raise UserError(
+                                    _("Can't handle more than 1 tax for line "
+                                      "%s") % boe_line.name)
+
+                        line_vals = {
+                            'name': _("Extra CEE expenses"),
+                            'account_id': boe_line.account_id.id,
+                            'debit': 0.0,
+                            'credit': boe_line.price_subtotal,
+                            'partner_id': boe_line.partner_id.id,
+                        }
+                        if boe_line.product_id:
+                            line_vals['product_id'] = boe_line.product_id.id
+                        move_lines.append((0, 0, line_vals))
+                move_vals['line_ids'] = move_lines
+                move = AccountMove.create(move_vals)
+                invoice.write(
+                    {'bill_of_entry_storno_id': move.id})
+
+                reconcile_ids = []
+                for move_line in move.line_ids:
+                    for boe in invoice.forwarder_bill_of_entry_ids:
+                        if (
+                            move_line.account_id.id ==
+                            boe.account_id.id
+                        ):
+                            reconcile_ids.append(move_line.id)
+                            for boe_move_line in boe.move_id.line_ids:
+                                if (
+                                    boe_move_line.account_id.id ==
+                                    boe.account_id.id
+                                ):
+                                    reconcile_ids.append(boe_move_line.id)
+
+                AccountMoveLine.browse(reconcile_ids).reconcile()
+        return res
+
+    def action_cancel(self):
+        res = super(AccountInvoice, self).action_cancel()
+        for invoice in self:
+            if invoice.bill_of_entry_storno_id:
+                invoice.bill_of_entry_storno_id.button_cancel()
+                invoice.bill_of_entry_storno_id.unlink()
+        return res
+
+
+class AccountInvoiceLine(models.Model):
+    _inherit = "account.invoice.line"
+
+    advance_customs_vat = fields.Boolean("Advance Customs Vat")
diff --git a/l10n_it_bill_of_entry/models/company.py b/l10n_it_bill_of_entry/models/company.py
new file mode 100644
index 000000000000..cbca401e2814
--- /dev/null
+++ b/l10n_it_bill_of_entry/models/company.py
@@ -0,0 +1,34 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    Copyright (C) 2013-2017 Agile Business Group sagl (http://www.agilebg.com)
+#    @author Alex Comba <alex.comba@agilebg.com>
+#    @author Lorenzo Battistini <lorenzo.battistini@agilebg.com>
+#    Copyright (C) 2017 CQ Creativi Quadrati (http://www.creativiquadrati.it)
+#    @author Diego Bruselli <d.bruselli@creativiquadrati.it>
+#    Copyright (C) 2013
+#
+#    License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
+#
+##############################################################################
+
+from odoo import fields, models
+
+
+class Company(models.Model):
+    _inherit = 'res.company'
+
+    bill_of_entry_journal_id = fields.Many2one(
+        'account.journal', 'Bill of entry Storno journal',
+        help="Journal used for reconciliation of customs supplier",
+    )
+
+
+class AccountConfigSettings(models.TransientModel):
+    _inherit = 'account.config.settings'
+
+    bill_of_entry_journal_id = fields.Many2one(
+        'account.journal', related='company_id.bill_of_entry_journal_id',
+        string="Bill of entry Storno journal",
+        help="Journal used for reconciliation of customs supplier",
+    )
diff --git a/l10n_it_bill_of_entry/static/description/icon.png b/l10n_it_bill_of_entry/static/description/icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..3a0328b516c4980e8e44cdb63fd945757ddd132d
GIT binary patch
literal 9455
zcmW++2RxMjAAjx~&dlBk9S+%}OXg)AGE&Cb*&}<C%<R2Kc9faym6aW`f0Dh5$js*d
z_}}Z!;XIG;_cPz`_vag-p{7Ve$Uq1H00~A(?iu(VaQlMefnU3&OozZXm@69d91cGG
z;O61r&je0NdamH#&)mKsXk?Zb_)B^>d0jUxM@u(PQx^-s)6<jB#=*|j%+$$(&(Xyy
zYgd8+09XKwoa}S2?48%%ZU#L~n^g{fE40h%YEx5by;GuJ(K|vI1uO;0m}=J7R4@Bs
z>97TX<v{QF=s?r`z`m$a0ZvrhBU7}{15RN9M`j!kv_Mp+3~{||YNuFzHNvhMYm3=Q
zo!q+OJ5(%-oNM^I^M%*luKMiVL`lo`bcKGymX7i3MIFWj1i|9+CGNvn`cu-RsK0Qh
zoYlwB>`ehR4?GS^qbkof1cslKgk<Uw6DeIxZyT_?=OwX|lwC*A?ac*gHF7jmS080$
z>U)h65qZ9Oc=ml_0temigYLJfnz{IDzUf>bGs4N!v3=Z3jMq&A#7%rM5eQ#dc?k~!
zVpnB`o+K7|Al`Q_U<UrcmRnh6jExs}l(hZs0%T~Dnpu-NENdhioRv(T{Qmv>;eD$B
zfJtP*jH`siUq~{KE)`jP2|#TUEFGRryE2`i0**z#*^6~AI|YzIWy$Cu#CSLW3q=GA
z6`?GZymC;dCPk~rBS%eCb`5OLr;RUZ;D`}um=H)BfVIq%7VhiMr)_#G0N#zrNH|__
zc+blN2UAB0=617@>_<D4$IPL<k1zq(*VmlDPer&h1n6`AG;9A!_W=N$JthhQWXZ<i
zGURc6f<i*joK3xSWaOOXxAc8ES>u;MPHN;P;N#YoE=)R#i$k_`UAA>WWCcEVMh~L_
zj--gtp&|K1#58Yz*AHCTMziU1Jzt_jG0I@qAOHsk$2}yTmVkBp_eHuY$A9)>P6o~I
z%aQ?!(GqeQ-Y+b0I(m9pwgi(IIZZzsbMv+9w{PFtd_<_(LA~0H(xz<Z(Qt1jC2cC|
z6WbMo9YgON{L#ZDl$sV4*<CP(>{=FhLB@(1&qHA5EJw1>>=%q2f&^X>IQ{!GJ4e9U
z&KlB)z(84HmNgm2hg2C0>WM{E(DdPr+EeU_N@57;PC2&DmGFW_9kP&%?X4}+xWi)(
z;)z%wI5>D4a*5XwD)P--sPkoY(a~WBw;E~AW`Yue4kFa^LM3X`8x|}ZUeMnqr}>kH
zG%WWW>3ml$Yez?i%)2pbKPI7?5o?hydokgQyZsNEr{a|mLdt;X2TX(#B1j35xPnPW
z*bMSSOauW>o;*=kO8ojw91VX!qoOQb)zHJ!odWB}d+*K?#sY_jqPdg{Sm2HdYzdEx
zOGVPhVRTGPtv0o}RfVP;Nd(|CB)<HrC1(%ZOEd8PI?r9b_$Cp-${bh59Z_R7n&YCp
zl8lfMpes*8{FVm;oJH@0LLoWmxD59u?JwHz2iRrAaE0`Hc&g;t5~$P*kdeOZn9OJ3
zRczo@ZkWU)RG+hcfH~{49Vvb3D(W0wRX#|$cA0Iqy^VR~(4hqA2AFI-rK!FM!#fJ_
zGFI@iqJOPXZ!=VjTS3dMuu~9xU3K1&?th;$)cqM#WGxbDEyB$y`#9j%>I;*t&QO8h
zFfekr30S!-LHmV_Su-W+rEwYXJ^;6&3|L$mMC8*bQptyOo9;>Qb9Q9`ySe3%V$A*9
zeKEe+b0{#KWGp$F+tga)0RtI)nhMa-K@JS}2krK~n8vJ=Ngm?R!9G<~RyuU0d?nz#
z-5EK$o(!F?hmX*2Yt6+coY`6jGbb7t<dboft~zeDZwK=+l2bFWs5^+|r{J6GO9Cwl
z&SW58BRs?XdFLuhtzl7WLbQ#~z#`jAB3AbSUg6jW6@qVd2Q~9qN(izT1y*>F#6nHA
zuKk=GGJ;ZwON1iAfG$E#Y7MnZVmrY|j0eVI(DN_MNFJmyZ|;w4tf@=CCDZ#5N_0K=
z$;R~bbk?}TpfDjfB&aiQ$VA}s?P}xPERJG{kxk5~R`iRS(SK5d+Xs9swCozZISbnS
zk!)I0>t=A<-^z(cmSFz3=jZ23u13X><0b)P)^1T_))Kr`e!-pb#q&J*Q`p+B6la%C
zuVl&0duN<;uOsB3%T9Fp8t{ED108<?)`y_~Hnd9AUX7h-H?jVuU|}My+C=TjH(jKz
zqMVr0re3S$H@t{zI95qa)+Crz*5Zj}Ao%4Z><+W(nOZd?gDnfNBC3>M8WE61$So|P
zVvqH0SNtDTcs<xiU1;=a39$d&&l5EwoIH1db#`S9Kw!YC1jhR)VbCWMptlUUkpfif
zMzi-i8)WL?|C$*Q?iqbS{w<lA9XN(rD)VS<zn>UdzaMDpT=Ty0pDHHNL@Z0w$Y`XO
z2M-_r1S+GaH%pz#Uy0*w$Vdl=X=rQXEzO}d6J^R6zjM1u&c9vYLvLp?W7w(?np9x1
zE_0JSAJCPB%i7p*Wvg)pn5T`8k3-uR?*NT|J`eS#_#54p>!p(mLDvmc-3o0mX*mp_
zN*AeS<>#^-{S%W<*mz^!X$w_2dHWpcJ6^j64qFBft-o}o_Vx80o0>}Du;>kLts;$8
zC`7q$QI(dKYG`Wa8#wl@V4jVWBRGQ@1dr-hstpQL)Tl+aqVpGpbSfN>5i&QMXfiZ>
zaA?T1VGe?rpQ@;+pkrVdd{klI&jVS@I5_iz!=UMpTsa~mBga?1r}a<Xwa$pLotZk<
zsykXwQO37I=aXew7x=}YWiW)^p)|C#g+)an!@j?EcY8C0t)BlK#y{YLtkJ6=D6H-5
zp2*ANf@>RBm1WS;TT*s0f0lY=JBl66Upy)-k4J}lh=P^8(SXk~0xW=T9v*B|gzIhN
z>qsO7dFd~mgxAy4V?&)=5ieYq?zi?ZEoj)&2o)RLy=<bK!vY7J*RP!&i_xU}i*o6o
z?xN*1<rEe1L2HBkCSgiYM3a|4w?Bo7CJL7?Eh;9An1m$1t?h1v92<Xg2(#)bjbL|o
zH_H0}!Og=1dOBynXHu>@hbCRcfT5ji<pmK_U*~T(A$I-*rM$8-BCv{=@=7F)2pdtU
z5==tp!}A*&Xgf{F>gwtQGE{L*8<@Yd{zg;CsL5mvzfDY}P-wos_6PfprFVaeqNE%h
zKZhLtcQld;ZD+>=nqN~>GvROfueSzJD&<KAVm#0W>BE*}XfU|H&(FssBqY=hPCt`d
zH?@s2>I(|;fcW&YM6#V<T#ysvE$@4oRO>#!kUIP8$Nkdh0A(bEVj``-AAyYgwY~jB
zT|I7Bf@%;7aL7Wf4dZ%VqF$eiaC38OV6oy3Z#TER2G+fOCd9Iaoy6aLYbPTN{XRPz
z;U!V|vBf%H!}52L2gH_+j;`bTcQRXB+y9onc^wLm5wi3-Be}U>k_u>2Eg$=k!(l@I
zcCg+flakT2Nej3i0yn+g+}%NYb?ta;R<sv-KjYb}UVFjITQ)VAEWu*)Lz7*-f^A*H
z<25#Ynt~-Qh?$wWx4$1=T2`j@bKp!)3IXh(LC@)%WGW$+j(tGz(6#bGw&K0j=Np@B
zt}@t$R`z(>?(g5SnwsQ49U8Wng8d|{B+lyRcEDvR3+`O{zfmrmvFrL6acVP%yG98X
zo&+VBg@px@i)%o?dG(`T;n*$S5*rnyiR#=wW}}GsAcfyQpE|>a{=$Hjg=-*_K;UtD
z<sX7(ZJc+Q;#xP8uk`jnF@a^|TWw*55if6@@}%7lOBaGo9Ia-e?`RPQc^w^EWfhe}
zHWHTvDA+r}Xf5Yqpr;QU-88%QC9F_>#z-)AXwSRY?<M%E84!g*1GC?E>OPefw^iI+
z)AXz#PfEjlwTes|_{sB?4(O@fg0AJ^g8gP}ex9Ucf*@_^J(s_5jJV}c)s$`Myn|Kd
z$<h)Fm>6>}#q^n{4vN@+Os$m7KV+`}c%4)4pv@06af4-x5#wj!KKb%caK{A&Y#Rfs
z-po?Dcb1({W=6FKIUirH&(yg=*6aLCekcKwyfK^JN5{wcA3nhO(o}SK#!CINhI`-I
z1)6&n7O&ZmyFMuNwvEic#IiOAwNkR=u5it{B9n2sAJV5pNhar=j5`*N!Na;c7g!l$
z3aYBqUkqqTJ=Re-;)s!EOeij=7SQZ3Hq}ZRds%IM*PtM$wV<GYik+VfZene%bm(n6
z`r@rc^TVw7EN{|O7rORMlw)zt(Z#enc3joE#IIk!M)L8gk^go9E9AxiP9o#OqmvV>
z@;rlc*NRK7i3y5BETSKuumEN`Xu_8<BQ)z0!-JuC8x}?$qo8SEko}oUWNI(4h*VHO
zAi!Egy!f(o9aHs2dhSE6ki(be*&w&+WLOB<(b3T_Hide(NvVvLQV{BN|2?UJFaY*@
z9CXA5B_*8i5Bf6sn~d`R>GP1Ri=OK<SGIb#BCTo3qI#UBUg+dkR+2ilUwIg%XFV;l
z+>Q$@I^ko8>H6)4rjiG5{VBM>B|%`&&s^)jS|-_95&yc=GqjNo{zFkw%%HHhS~e=s
zD#sfS+-?*t|J!+ozP6KvtOl!R)@@-z24}`9{QaVLD^9VCSR2b`b!KC#o;Ki<+wXB6
zx3&O0LOWcg4&rv4QG0)4yb}7BFSEg~=IR5<g6yi=XozU}zReXL{rA%c`$IQAs<ObZ
zep*ITZ0C(~W*`?XH^l1t7&+qigAfY9tVJ5DH!~jY>#ZRj8kg}dS7_V&^%#Do==#`u
zpy6{ox?jWuR(;pg+f@mT>#HGWHAJRRDDDv~@(IDw&R>9643kK<aUZ^OhBu;1e6t#{
zxKehVgz`HT;A`FMivG<tq0OcrXwHUX_<$j<uk%m>#HN`!1vBJHnC+RM&yIh8{gG2q
zA%e*U3|N0XSRa~oX-3EAneep)@{h2vvd3Xvy$7og(sayr@95+e6~Xvi1tUqnIxoIH
zVWo*OwYElb#uyW{Imam6f2<eMTQj#)z8+N&ZY?tSPo%&2eVNU=4=?rlO<*9Twaxco
zEVE=Jh?_x>rGbjR!Y3`#gPqkv57dB6K^wRGxc9B(t|aYDGS=m$&S!NmCtrMMaUg(c
zc2qC=2Z`EEFMW-me5B)24AqF*bV5Dr-M5ig(l-WPS%CgaPzs6p_gnCIvTJ=Y<6!gT
zVt@AfYCzjjsMEGi=rDQHo0yc;HqoRNnNFeWZgcm?f;cp(6CNylj36DoL(?TS7eU#+
z7&mfr#y))+CJOXQKUMZ7QIdS9@#-}7y2K1{8)cCt0~-X0O!O?Qx#E4Og+;A2SjalQ
zs7r?qn0H044=sDN$SRG$arw~n=+T_DNdSrarmu)V6@|?1-ZB#hRn`uilTGPJ@fqEy
zGt(f0B+^JDP&f=r{#Y_wi#AVDf-y!RIXU^0jXsFpf>=Ji*TeqSY!H~AMbJdCGLhC)
zn7Rx+sXw6uYj;WRYrLd^5IZq@6JI1C^YkgnedZEYy<&4(z%Q$5yv#B<pkvWZft^C&
z;+zNo+VJNluxaDF!`gW+F0=MxsCQ~~#CYKa;ULfj5hTa8a6;d*(<eeQ7-ZQgz2et^
zf|7URfj;x*#HiF0wuBCOTEpbeD&kkENqolCm2#cQGHCeEC<&I3j+P6?sX?BPp4~46
zx-S~EJ>oo{AH8n$<d4loB?vL3RqXwK_COrQ6xRoWGOdFnWy(hhzrG8k;2k}8Zj&>a
zhb4Y3PWdr269&?V%uI$xMcUrMzl=;w<_nm*qr=c3Rl@i5wWB;e-`t7D&c-mcQl7x!
zZWB`UGcw=Y2=}~wzrfLx=uet<;m3~=8I~ZRuzvMQUQdr+yTV|ATf1Uuomr__nDf=X
zZ3WYJtHp_ri(}SQAPjv+Y+0=<GD??Na(2AG`s>fH4krOP@S&=zZ-t1jW1o@}z;xk8
z(Nz1co&El^HK^NrhVHa-_;&88vTU>_J33=%{if;BEY*J#1n59=07jrGQ#IP>@u#3A
z;!q+E1Rj3ZJ+!4bq9F8PXJ@yMgZL;>&gYA0%_Kbi8?S=XGM~dnQZQ!yBSgcZhY96H
zrWnU;k)qy`rX&&xlDyA%(a1Hhi5CWkmg(`Gb%m(HKi-7Z!LKGRP_B8@`7&hdDy5n=
z`OIxqxiVfX@OX1p(mQu>0Ai*v_cTMiw4qRt3~N<X{IYiJ3k=4u-u*nJEBnJ<OdI8P
zXmK`OYkO5a{YDhI3PL|H4m=p>Bvr9oBy0)r>w3p~V0SCm=An6@3n)>@z!|o-$HvDK
z|3D2ZMJkLE5loMKl6R^ez@Zz%S$&mbeoqH5`Bb){Ei21q&VP)hWS2tjShfFtGE+$z
zzCR$P#uktu+#!w)cX!<osOkId_HzAT-HD2N`M+v2l+zwdW%GgZbQMuhfE*hHjKXKg
z45hphqVETPDbX6wpTlZqza0gFaRGh`3L~0id)F6#%@9;w(e%PjzuD7@inuToA!B?F
zCMLJc!u{3N)s?lB-!11!GxXsCak8zQomO)gmn02f-5~OkMYnm~#jVwwYNw@LAv!KN
z-n`q1|AXw*TW>lWN1XU%K-r=s{|j?)Akf@q#3b#{6cZCuJ~gCxuMXRmI$nGtnH+-h
z+GEi!*X=AP<|fG`1>MBdTb?28JYc=fGvAi2I<$B(rs$;eoJCyR6_bc~p!XR@O-+sD
z=eH`-ye})I5ic1eL~TDmtfJ|8`0VJ*Yr=hNCd)G1p2MMz4C3^Mj?7;!w|Ly%JqmuW
zlIEW^Ft%z?*|fpXda>Jr^1noFZEwFgVV%|*XhH@acv8rdGxeEX{M$(vG{Zw+x(ei@
zmfXb22}8-?Fi`vo-YVrTH*C?a8%M=Hv9MqVH7H^J$KsD?>!SFZ;ZsvnHr_gn=7acz
z#W?0eCdVhVMWN12VV^$>WlQ?f;P^{(&pYTops|btm6aj>_Uz+hqpGwB)vWp0Cf5y<
zft8-je~nn?W11plq}N)4A{l8I7$!ks_x$PXW-2XaRFswX_BnF{R#6YIwMhAgd5F9X
zGmwdadS6(a^fjHtXg8=l?Rc0Sm%hk6E9!5cLVloEy4eh(=FwgP`)~I^5~pBEWo+F6
zSf2ncyMurJN91#cJTy_u8Y}@%!bq1RkGC~-bV@SXRd4F{R-*V<h953|jk-C&|3)z%
ze&_30-6q1)a0(!xXqA+_t(WC`HA_yYaW@>`bS+6;W5vZ(&+I<9$;-V|eNfLa5n-6%
z2(}&uGRF;p9<Q%jdNy1%e7XTzyu7EEQT(5LrnvX~T%K!IuDyHY`ZneVJu#k_1T)xA
z*yxB?y4!pOJ$DTZzBm|8OIQq+AtV25aJ+X5EJjAu><tfuiNClI2BSoMgqLnU-5t95
zEnZ(^g~1RgD=UMB({c;$HujG&%DqGF;5jI~roRT+(rOoS$6f6SsURIuAVkAeIVc~{
z5ZxLN%m%Z*Sg;qYCf3<$dE6~&w_!EBx%yl4YC~LH{FCFNRBc_I>2eS*sE*o<YSPrx
z{M(reV{~jKue#Y6ZOnqJia{fQc!UxV4m)l389OmzR6A3|2!i<P{r82jKw+zq4%@ny
znopi6g!1Vx9Bml#a~KdL2lp2C)qSTKIh43vgycQHfQb_I!kQY&p;X@Bz|{^SXsW1K
zP&Ag1CW_r6u5-4=s(W>R$@pexaqr*meB)VhmIg@h{uzkk$9~qh#cHhw#>O%)b@+(|
z^IQgqzuj~Sk(J;swEM-3TrJAPCq9k^^^`q{IItKBRXYe}e0Tdr=Huf7da3$l4<V=<
zfr<*%iOB1EY}w3tF2Cwl7a2OS&~Y-lu<s)T^9=OFU8(CeN|63BiMxf*)5gesGU<eZ
z9DigzL3+quZ1o2T<KAZbCGJx&lrl*e#}Dpv24bZO$B<Yoc5hbeP0y?@P%|Tvw||e%
zV#e^q0D2R_Oq_c+=x5vP&hg4k+df{o7$aNZCM>PdpwWDop%^}n;dD#K4s#DYA8SHZ
z&1!riV4W4R7R#C))JH1~axJ)RYnM$$lIR%6fIVA@zV{XVyx}C+a-Dt8Y9M)^KU0+H
zR4IUb2CJ{Hg>CuaXtD50jB(_Tcx=Z$^W<wsNa}nUDpNk$q{>Yu2u5kubqmwp%drJ6
z?Fo40g!Qd<-l=TQxqHEOuPX0;^z7iX?Ke^a%XT<13TA^5`4Xcw6D@Ur&VT&CUe0d}
z1GjOVF1^L@>O)l@?bD~$wzgf(nxX1OGD8fEV?TdJcZc2KoUe|oP1#=$$7ee|xbY)A
zDZq+cuTpc(fFdj^=!;{k03C69lMQ(|>uhRfRu%+!k&<F<Z7l=VnwB^RA&^APMi=Tn
zNc}%IJL~xB4OP6bJNwAw)~Ma2=UP0dhr%X=kco(it+@F<#$xrIJ8@|{Buh<)h`xg?
z_U}pe=3#zmDfdqE4`Hyn<!?&CfCp#GTeXo8;AYd1Opd&cXER8cBSOF3iFJ#XPgQVp
zZSiQf7V^Dt?ITs8aMF~e1hq0P@^oB)#byh|6q_7F1B%ST%WL~J?ySn>YOi-3|1QKB
z<?_cUy)V3go%%^l)lRa=dmY_XQG3Z{Q?52d$qG}vIe|EZbYEtrR$rh(iS)O#dU-(>
z?n?eq1XP>p-IM$Z^C;2L3itnbJZAip*Zo0aw2bs8@(s^~*8T9go!%dHcAz2lM;`yp
zD=7&xjFV$S&5uDaiScyD?B-i1ze`+CoRtz`Wn+Zl&#<i<Zx(`=7k~{%`w&<EbG}U<
z0%E^8lyw>s4&}MO{@N!ufrzjG$B79)Y2d3tBk&)TxUTw@<TSeYlROCt(gU?O((-qu
zs>QS0TEL_?njX|<LXnSC4TlId(D4W|GQ?L@$3Ue@N8p=l9-sC<=z(lPk;^sT(v2*k
zc~vp#Hp`mXjzhml2NMCh^h5)sqsan+jJ_l<a4w|G&ac02hrz8#6|kFraA~rta0}!q
zB4BE{QWY7MtxHn_xB);Avf#Lf<GG<A?Q3JVyc1p8^H}$8(Gn=_&F1!m8$sKyeue+L
z5&392wm+wO;_oXoTEJ=wxVXk}dt<d~CgUUMW_PPTe(c<7n18#mVaX)vK}-PzZq7<b
zNJbVTFaq(8ZLx|A*G$H3ugT2aVziDEGa66FVt@hr1|D{RWN6yuqlglM!rp^YG;UpG
zrnm?ek079l3VoOU^p%f^A9Yzn8IVX?^rB4LbgJ|PONhzM_0{P?S(V$OI=u5IBjfT#
z0ntLLnhg5$0fAHJaG6HCx4X7;RmvMtE}8C>@vq?Uz(nBFK5Pq7*xj#u*R&i|?7+6#
z+|r_n#SW&LXhtheZdah{ZVoqwyT{D>MC3nkFF#N)xLi{p7J1jXlmVeb;cP5?e(=f#
zuT7fv<Q3o5LspCx-RPkzLw{VsDE>jSbjS781v?7{)-X3*?>tq?)Yd)~|1{BDS(pqC
zC}~H#WXlkUW*H5CDOo<)#x7%RY)A;ShGhI5s*#cRDA8YgqG(HeKDx+#(ZQ?386dv!
zlXCO)w91~Vw4AmOcATuV653fa9R$fyK8<JV*@W33SMHM;w!OmUXar{O;_8j>ul%rG
z-<zwGD)!Y{+(T{%ob~79zpXX%zulyiy1_UHWvu@YqxKAK3e9GO6Os4R0Naujn>wfS
zihugoZyr38Im?Zuh6@RcF~t1anQu7>#lPpb#}4cOA!EM11`%f*07RqOVkmX{p~KJ9
z^zP;K#|)$`^Rb{rnH<AdQ^(;gQMcF>GH{~>1(fawV0*Z#)}M`m8-?ZJV<+e}s9wE#
z)l&az?w^5{)`S(%MRzxdNqrs1n*-=jS^_jqE*5XDrA0+VE`5^*p3CuM<&dZEeCjoz
zR;uu_H9ZPZV|fQq`Cyw4nscrVwi!fE6ciMmX$!_hN7uF;jjKG)d2@aC4ropY)8<!P
zAOHj?oPbjQ%hh|vE_1IMB)43eQpeLi&)R>etW=xJvni)8eHi`H$%#zn^WJ<U7gogJ
z?A^!2J~rI78JH|Ml2EldmKY5K8;Zx(FGcBdM<5oe#G+nd6dObqz@Af%%M*aBE_pn8
zXQo2`Bw*IwvP3#1Ev<%YocpBodO9+Rw~`5*CY3{L;qf1PxV!r%NI+#Q1f8GU7$~#U
zAA9$4&g-k=8BYi*3i@0^UX}nTQVyOf)8T(}G^Ti?Vqvk~bJRR#EAQ?u`dClPxk@{;
zxvO?%jSX`2{8|^z0*C5DR1Z^>5NLc-rqk|u&&4Z6fD_m&JfSI1Bvb?b<*n&sfl0^t
z=HnmRl`XrFvMKB%9}>PaA`m-fK6a0(8=qPkWS5bb4=v?XcWi&hRY?O5HdulRi4?fN
zlsJ*N-0Qw+Yic@s0(2uy%F@ib;GjXt01F<S%GT3P{Ck&Y*^gWuie`o_g+ZNDNIV|F
z)zEe|Ij*4$H1(<RLz0($;AD3VsUJwI@liw^?fh(V?VC`Sz7h`*Q<VYlhbHJ?&h+!W
zAJC)U;Lx_QRaSNFYbyi|7+MeNTgA+Znh}qFzf>mx5XbRo6+n|pP(&nodMoap^z{~q
ziEeaUT@Mxe3vJSfI6?uLND(CNr=#^W<1b}jzW58bIfyWTDle$mmS(|x-0|2UlX+9k
zQ<WB5+u#`K#~J$81)#?BuTOKLk|+S>^EX7Nw}?EzVoBfT(-LT|=9N@^hcn-_p&sqG
z&*oVs2JSU+N4ZD`FhCAWaS;>|wH2G*Id|?pa#@>tyxX`+4HyIArWDvVrX)2WAOQff
z0qyHu&-S@i^MS-+j--!pr4fPBj~_8({~e1bfcl0wI1kaoN>mJL6KUPQm5N7lB(ui1
zE-o%kq)&djzWJ}ob<-GfDlkB;F31j-VHKvQUGQ3sp`CwyGJk_i!y^sD0fqC@$9|jO
zOqN!r!8-p==F@ZVP=U$qSpY(gQ0)59P1&t@y?5rvg<}E+GB}2<F#{*|k0E{$&_`~)
zkzDcsi#!7r<a8lPUCMj?{CK;e|9#-xj>6NYPp4f2YFQrQtot5mn3wu_qprZ=>Ig-$
zbW26Ws~IgY>}^5w`vTB(G`PTZaDiGBo5o(tp)qli|NeV(<Rzgqw(Ze!7hEGKKx((>
z@H_=R8V39rt5J5YB2Ky?4eJJ#b`_iBe2ot~6%7mLt5t8Vwi^Jy7|jWXqa3amOIoRb
zOr}WVFP--DsS`1WpN%~)t3R!arKF^Q$e12KEqU36AWwnCBICpH4XCsfnyrHr>$I$4
z!DpKX$OKLWarN7nv@!uIA+~RNO)l$$w}p(;b>mx8pwYvu;dD_unryX_N<mojSrG!`
zgkqx4t<XLL6ZUppvjeV9PJ6dG>hT8*Tj>BTrTTL&!?O+%Rv;b?B??gSzdp?6Uug9{
zd@V08Z$BdI?fpoCS$)t4mg4rT8Q_I}h`0d-vYZ^|dOB*Q^S|xqTV*<bTMtKO;_Z)R
zRSOJrd5TFO0aO%#%-sNa{`SiQ^$$1^@oUd&^lB{MKZ>vIg?@fVFSmMpaw0qtTRbx}
z({Pg?#{2`sc9)M5N$*N|4;^t$+Q<Wh^yJ?FzJ*$wiB{j;CMy+?m1MbsJo0ubR==f9
z>P?#mo<zt1E6=Ilm*nbmYmpxfAj7*m*Wh@=7|;!%(-pviW`nuCktLveet9^$*y^>v
zGVC@I*lBVrOU-%2y!7%)fAKjpEFsgQc4{amtiHb95KQEwvf<(3T<9-Zm$xIew#P22
zc2Ix|App^>v6(3L_MCU0d3W##AB<Fxl*nmny6_RsCu%1a)so}}uCXSzwY70Y@uTxK
z=5nu(N*2HDbrIcL)t_*{*84mvmV_Y9<vxHJJ;0gUdNjyW)jDb|@|j*qR8;gsMa5Ir
z02fHv=%xyN9VLv_ZLL4y|F*p$S^^T47m{aok5{rmM{$s7^Xu2!_fo1$IG6kkG_Tgx
zFfjPm3;g>0M~3D00EWoKZqsJYT(#@w$Y_H7G22M~ApVFTRHMI_3be)Lkn#0F*V8Pq
zc}`Cjy$bE;FJ6H7p=0y#R>`}-m4(0F>%@P|?7fx{=R^uFdISRnZ2W_xQhD{YuR3t<
z{6yxu=4~JkeA;|(J6_nv#>Nvs&FuLA&PW^he@t(UwFFE8)|a!R{`E`K`i^ZnyE4$k
z;(749Ix|oi$c3QbEJ3b~D_kQsPz~fIUKym($a_7dJ?o+40*OLl^{=&oq$<#Q(yyrp
z{J-FAniyAw9tPbe&IhQ|a`DqFTVQGQ&Gq3!C2==4x{6EJwiPZ8zub-iXoUtkJiG{}
zPaR&}_fn8_z~(=;5lD-aPWD3z8PZS@AaUiomF!G8I}Mf>e~0g#BelA-5#`cj;O5>N
Xviia!U7SGha1wx#SCgwmn*{w2TRX*I

literal 0
HcmV?d00001

diff --git a/l10n_it_bill_of_entry/static/src/css/l10n_it_bill_of_entry.css b/l10n_it_bill_of_entry/static/src/css/l10n_it_bill_of_entry.css
new file mode 100644
index 000000000000..832e7a8aff63
--- /dev/null
+++ b/l10n_it_bill_of_entry/static/src/css/l10n_it_bill_of_entry.css
@@ -0,0 +1,32 @@
+table {border: 0px;}
+thead {background: #F5F5F5;}
+
+
+.left_with_line {
+    text-align:left; vertical-align:text-top; border-top:1px solid #A1A1A1; padding:5px;
+}
+.right_with_line {
+    text-align:right; vertical-align:text-top; border-top:1px solid #A1A1A1; padding:5px;
+}
+.left_without_line {
+    text-align:left; vertical-align:text-top; padding:5px;
+}
+.right_without_line {
+    text-align:right; vertical-align:text-top; padding:5px;
+}
+.left_with_line_bottom {
+    text-align:left; vertical-align:text-top; border-bottom:1px solid #A1A1A1; padding:5px;
+}
+.right_with_line_bottom {
+    text-align:right; vertical-align:text-top; border-bottom:1px solid #A1A1A1; padding:5px;
+}
+.left_without_line_bold {
+    text-align:left; vertical-align:text-top; padding:5px; font-weight: bold;
+}
+.right_without_line_bold {
+    text-align:right; vertical-align:text-top; padding:5px; font-weight: bold;
+}
+
+.first_th_row {
+    border-style:solid;border-width:1px;border-color:#A1A1A1; background: #fff;
+}
\ No newline at end of file
diff --git a/l10n_it_bill_of_entry/tests/__init__.py b/l10n_it_bill_of_entry/tests/__init__.py
new file mode 100644
index 000000000000..0bdae6def7f2
--- /dev/null
+++ b/l10n_it_bill_of_entry/tests/__init__.py
@@ -0,0 +1,11 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    Copyright (C) 2017 CQ Creativi Quadrati (http://www.creativiquadrati.it)
+#    @author Diego Bruselli <d.bruselli@creativiquadrati.it>
+#
+#    License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
+#
+##############################################################################
+
+from . import test_bill_of_entry
diff --git a/l10n_it_bill_of_entry/tests/test_bill_of_entry.py b/l10n_it_bill_of_entry/tests/test_bill_of_entry.py
new file mode 100644
index 000000000000..e3e4e1fa564e
--- /dev/null
+++ b/l10n_it_bill_of_entry/tests/test_bill_of_entry.py
@@ -0,0 +1,250 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    Copyright (C) 2017 CQ Creativi Quadrati (http://www.creativiquadrati.it)
+#    @author Diego Bruselli <d.bruselli@creativiquadrati.it>
+#
+#    License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
+#
+##############################################################################
+
+from odoo.tests.common import SingleTransactionCase
+
+
+class TestBillOfEntry(SingleTransactionCase):
+
+    def _get_invline_vals(self, product, quantity=1., price_unit=1.):
+        vals = {
+            'product_id': product.id,
+            'quantity': quantity,
+            'price_unit': price_unit,
+        }
+        return vals
+
+    def _create_invoice(self, partner, customs_doc_type, journal):
+        vals = {
+            'type': 'in_invoice',
+            'partner_id': partner.id
+        }
+        if customs_doc_type:
+            vals['customs_doc_type'] = customs_doc_type
+        if journal:
+            vals['journal_id'] = journal.id
+        invoice = self.env['account.invoice'].create(vals)
+        invoice._onchange_partner_id()
+        invoice._onchange_journal_id()
+        invoice._convert_to_write(invoice._cache)
+        return invoice
+
+    def _create_invoice_line(self, invoice, vals):
+        new_vals = {
+            'invoice_id': invoice.id,
+            'account_id': self.account_revenue.id,
+            'name': 'something in',
+        }
+        vals.update(new_vals)
+        line = self.env['account.invoice.line'].create(vals)
+        line._onchange_product_id()
+        line._convert_to_write(line._cache)
+        return line
+
+    def setUp(self):
+        super(TestBillOfEntry, self).setUp()
+
+        self.account_model = self.env['account.account']
+        self.tax_model = self.env['account.tax']
+        self.journal_model = self.env['account.journal']
+        self.invoice_model = self.env['account.invoice']
+        self.inv_line_model = self.env['account.invoice.line']
+        self.move_line_model = self.env['account.move.line']
+        self.fp_model = self.env['account.fiscal.position']
+        self.fp_tax_model = self.env['account.fiscal.position.tax']
+
+        # Default accounts for invoice line account_id
+        receivable_acctype_id = self.env.ref(
+            'account.data_account_type_receivable'
+        ).id
+        self.account_receivable = self.account_model.search(
+            [('user_type_id', '=', receivable_acctype_id)], limit=1
+        )
+        revenue_acctype_id = self.env.ref(
+            'account.data_account_type_revenue'
+        ).id
+        self.account_revenue = self.account_model.search(
+            [('user_type_id', '=', revenue_acctype_id)], limit=1
+        )
+        # Default purchase journal
+        self.journal = self.journal_model.search(
+            [('type', '=', 'purchase')], limit=1
+        )
+        self.journal.update_posted = True
+        # Extra EU purchase journal for differentiate
+        # extra EU purchase invoices from ordinary ones
+        self.extra_journal = self.env.ref(
+            'l10n_it_bill_of_entry.account_journal_purchase_extraEU'
+        )
+        # Bill of entry storno journal
+        self.company = self.env.ref('base.main_company')
+        self.company.bill_of_entry_journal_id = self.journal_model.search(
+            [('type', '=', 'general')], limit=1
+        )
+        self.company.bill_of_entry_journal_id.update_posted = True
+
+        # Extra EU fiscal position tax correspondence
+        self.tax22 = self.tax_model.create({
+            'name': '22%',
+            'amount': 22,
+            'amount_type': 'percent',
+            'type_tax_use': 'purchase',
+            'tax_group_id': self.env.ref('account.tax_group_taxes').id
+        })
+        self.fiscpos_extra = self.env.ref(
+            'l10n_it_bill_of_entry.fiscal_position_extraEU'
+        )
+        self.fp_tax_model.create({
+            'position_id': self.fiscpos_extra.id,
+            'tax_src_id': self.tax22.id,
+        })
+
+        # Delivery Expense account
+        self.account_delivery_expense = \
+            self.env.ref('l10n_it_bill_of_entry.'
+                         'account_account_delivery_expense')
+
+        # Extra EU purchase journal
+        self.journal_extra = \
+            self.env.ref('l10n_it_bill_of_entry.'
+                         'account_journal_purchase_extraEU')
+
+        # Products
+        self.product1 = self.env.ref('product.product_product_5b')
+        self.product1.write({
+            'supplier_taxes_id': [(6, 0, [self.tax22.id])],
+        })
+        self.product_extra = \
+            self.env.ref('l10n_it_bill_of_entry.'
+                         'product_product_extraEU_purchase')
+        self.adv_customs_expense = \
+            self.env.ref('l10n_it_bill_of_entry.'
+                         'product_product_adv_customs_expense')
+        self.customs_expense = \
+            self.env.ref('l10n_it_bill_of_entry.'
+                         'product_product_customs_expense')
+        self.product_delivery = \
+            self.env.ref('l10n_it_bill_of_entry.'
+                         'product_product_delivery')
+        self.product_stamp = \
+            self.env.ref('l10n_it_bill_of_entry.'
+                         'product_product_stamp_duties')
+
+        # Partners
+        self.customs = self.env.ref('l10n_it_bill_of_entry.'
+                                    'partner_customs')
+        self.supplier = self.env.ref('base.res_partner_1')
+        self.supplier.property_account_position_id = \
+            self.fiscpos_extra.id
+        self.forwarder = self.env.ref('base.res_partner_12')
+
+        # Extra EU supplier invoice - draft state
+        self.supplier_invoice = self._create_invoice(
+            self.supplier, 'supplier_invoice', self.journal_extra
+        )
+        line_vals = self._get_invline_vals(self.product1, 1., 2500.)
+        self._create_invoice_line(self.supplier_invoice, line_vals)
+        self.supplier_invoice.compute_taxes()
+        # self.supplier_invoice.action_invoice_open()
+
+        # Bill of Entry - draft state
+        self.bill_of_entry = self._create_invoice(
+            self.customs, 'bill_of_entry', self.journal
+        )
+        line_vals = self._get_invline_vals(self.product_extra, 1., 2645.)
+        self._create_invoice_line(self.bill_of_entry, line_vals)
+        self.bill_of_entry.compute_taxes()
+        self.bill_of_entry.write({
+            'supplier_invoice_ids': [(6, 0, [self.supplier_invoice.id])]
+        })
+        # self.bill_of_entry.action_invoice_open()
+
+        # Forwarder Invoice - draft state
+        self.forwarder_invoice = self._create_invoice(
+            self.forwarder, 'forwarder_invoice', self.journal
+        )
+        line_vals = self._get_invline_vals(self.product_delivery, 1., 300.)
+        self._create_invoice_line(self.forwarder_invoice, line_vals)
+        line_vals = self._get_invline_vals(
+            self.adv_customs_expense, 1., 581.9
+        )
+        self.adv_customs_expense_line = self._create_invoice_line(
+            self.forwarder_invoice, line_vals
+        )
+        self.adv_customs_expense_line.advance_customs_vat = True
+        line_vals = self._get_invline_vals(self.customs_expense, 1., 145.)
+        self._create_invoice_line(self.forwarder_invoice, line_vals)
+        line_vals = self._get_invline_vals(self.product_stamp, 1., 1.81)
+        self._create_invoice_line(self.forwarder_invoice, line_vals)
+        self.forwarder_invoice.compute_taxes()
+        self.forwarder_invoice.write({
+            'forwarder_bill_of_entry_ids': [(4, self.bill_of_entry.id)],
+        })
+
+    def test_storno_create(self):
+
+        # Validate bill of entry
+        self.bill_of_entry.action_invoice_open()
+
+        # Validate forwarder invoice
+        self.forwarder_invoice.action_invoice_open()
+
+        # Storno Bill of Entry account.move
+        storno = self.forwarder_invoice.bill_of_entry_storno_id
+        self.assertTrue(storno)
+        self.assertEqual(storno.date, self.forwarder_invoice.date_invoice)
+
+        # Advance Customs Expense account.move.line
+        move_line_domain = [
+            ('account_id', '=', self.adv_customs_expense_line.account_id.id),
+            ('debit', '=', 0.),
+            ('credit', '=', self.adv_customs_expense_line.price_subtotal),
+            ('partner_id', '=', self.adv_customs_expense_line.partner_id.id),
+            ('product_id', '=', self.adv_customs_expense_line.product_id.id)
+        ]
+        adv_customs_expense_moveline = \
+            self.move_line_model.search(move_line_domain)
+        self.assertEqual(len(adv_customs_expense_moveline), 1)
+
+        # Customs Expense account.move.lines
+        move_line_domain = [
+            ('account_id', '=', self.bill_of_entry.account_id.id),
+            ('debit', '=', self.bill_of_entry.amount_total),
+            ('credit', '=', 0.),
+            ('partner_id', '=', self.bill_of_entry.partner_id.id)
+        ]
+        customs_expense_moveline = \
+            self.move_line_model.search(move_line_domain)
+        self.assertEqual(len(customs_expense_moveline), 1)
+
+        # Extra EU goods purchase account.move.lines
+        for boe_line in self.bill_of_entry.invoice_line_ids:
+            move_line_domain = [
+                ('account_id', '=', boe_line.account_id.id),
+                ('debit', '=', 0.),
+                ('credit', '=', boe_line.price_subtotal),
+                ('partner_id', '=', boe_line.partner_id.id),
+                ('product_id', '=', boe_line.product_id.id)
+            ]
+            extraeu_expense_moveline = \
+                self.move_line_model.search(move_line_domain)
+            self.assertEqual(len(extraeu_expense_moveline), 1)
+
+        # Storno - BoE reconciliation (supplier debit account)
+        storno_reconcile_ids = storno.line_ids.filtered(
+            lambda l: l.full_reconcile_id
+        ).mapped('full_reconcile_id.id')
+        boe_reconcile_ids = self.bill_of_entry.move_id.line_ids.filtered(
+            lambda l: l.full_reconcile_id
+        ).mapped('full_reconcile_id.id')
+        self.assertEqual(
+            sorted(storno_reconcile_ids),
+            sorted(boe_reconcile_ids)
+        )
diff --git a/l10n_it_bill_of_entry/views/account_invoice_view.xml b/l10n_it_bill_of_entry/views/account_invoice_view.xml
new file mode 100644
index 000000000000..2752e7740d3c
--- /dev/null
+++ b/l10n_it_bill_of_entry/views/account_invoice_view.xml
@@ -0,0 +1,61 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+
+    <record model="ir.ui.view" id="invoice_supplier_boe_form">
+        <field name="name">invoice.supplier.boe.form</field>
+        <field name="model">account.invoice</field>
+        <field name="inherit_id" ref="account.invoice_supplier_form"/>
+        <field name="arch" type="xml">
+            <xpath expr="//field[@name='move_name']" position="after">
+                <field name="customs_doc_type"
+                    attrs="{'readonly': ['|',('state', '!=', 'draft'), ('forwarder_bill_of_entry_ids', '!=', [])]}"/>
+            </xpath>
+            <xpath expr="//notebook/page[2]" position="after">
+                <page string="Customs" name="customs" attrs="{'invisible': [('customs_doc_type','=', False)]}">
+                    <separator string="Bill of entries" name="boe_no_supplier" colspan="4"
+                        attrs="{'invisible': [('customs_doc_type','!=', 'supplier_invoice')]}"/>
+                    <field name="supplier_bill_of_entry_ids"
+                        attrs="{'invisible': [('customs_doc_type','!=', 'supplier_invoice')]}"/>
+                    <separator string="Supplier invoices" name="supplier_invoices" colspan="4"
+                        attrs="{'invisible': [('customs_doc_type','!=', 'bill_of_entry')]}"/>
+                    <field name="supplier_invoice_ids"
+                        attrs="{'invisible': [('customs_doc_type','!=', 'bill_of_entry')]}"
+                        domain="[('customs_doc_type', '=', 'supplier_invoice')]"
+                        context="{'default_customs_doc_type': 'supplier_invoice'}"/>
+                    <group name="forwarder_invoice">
+                        <field name="forwarder_invoice_id"
+                            attrs="{'invisible': [('customs_doc_type','!=', 'bill_of_entry')]}"
+                            domain="[('customs_doc_type','=', 'forwarder_invoice')]"
+                            context="{'default_customs_doc_type': 'forwarder_invoice'}"/>
+                    </group>
+                    <separator string="Bill of entries" name="boe_no_forwarder" colspan="4"
+                        attrs="{'invisible': [('customs_doc_type','!=', 'forwarder_invoice')]}"/>
+                    <field name="forwarder_bill_of_entry_ids"
+                        attrs="{'invisible': [('customs_doc_type','!=', 'forwarder_invoice')]}"/>
+                    <group name="storno">
+                        <field name="bill_of_entry_storno_id"
+                            attrs="{'invisible': [('customs_doc_type','!=', 'forwarder_invoice')]}"/>
+                    </group>
+                </page>
+            </xpath>
+            <xpath expr="//notebook/page[1]/field[@name='invoice_line_ids']/tree/field[@name='price_subtotal']" position="after">
+                <!--It seems attrs doesn't work -->
+                <field name="advance_customs_vat"/>
+            </xpath>
+        </field>
+    </record>
+
+    <record model="ir.ui.view" id="invoice_line_boe_form">
+        <field name="name">invoice.line.boe.form</field>
+        <field name="model">account.invoice.line</field>
+        <field name="inherit_id" ref="account.view_invoice_line_form"/>
+        <field name="arch" type="xml">
+            <field name="name" position="after">
+                <group name="advance_customs_vat">
+                    <field name="advance_customs_vat"/>
+                </group>
+            </field>
+        </field>
+    </record>
+
+</odoo>
diff --git a/l10n_it_bill_of_entry/views/company_view.xml b/l10n_it_bill_of_entry/views/company_view.xml
new file mode 100644
index 000000000000..2a1dca8d547c
--- /dev/null
+++ b/l10n_it_bill_of_entry/views/company_view.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+
+    <record id="view_boe_config_settings" model="ir.ui.view">
+        <field name="name">view.boe.config.setting</field>
+        <field name="model">account.config.settings</field>
+        <field name="inherit_id" ref="account.view_account_config_settings"/>
+        <field name="arch" type="xml">
+            <xpath expr="//separator[@name='analytic_account']" position="before">
+                <separator name="bill_of_entry" string="Bill of entry"/>
+                <group name="Bill of entry">
+                    <label for="id" string="Configuration"/>
+                    <div>
+                        <div>
+                            <label for="bill_of_entry_journal_id"/>
+                            <field name="bill_of_entry_journal_id" class="oe_inline"/>
+                        </div>
+                    </div>
+                </group>
+            </xpath>
+        </field>
+    </record>
+
+</odoo>
diff --git a/l10n_it_bill_of_entry/wizard/__init__.py b/l10n_it_bill_of_entry/wizard/__init__.py
deleted file mode 100644
index a22b7fbd1570..000000000000
--- a/l10n_it_bill_of_entry/wizard/__init__.py
+++ /dev/null
@@ -1,24 +0,0 @@
-# -*- encoding: utf-8 -*-
-##############################################################################
-#
-#    Copyright (C) 2013 Agile Business Group sagl
-#    (<http://www.agilebg.com>)
-#    Copyright (C) 2013
-#    Associazione OpenERP Italia (<http://www.openerp-italia.org>)
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as published by
-#    the Free Software Foundation, either version 3 of the License, or
-#    (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU General Public License for more details.
-#
-#    You should have received a copy of the GNU General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-##############################################################################
-
-import select_template
diff --git a/l10n_it_bill_of_entry/wizard/select_template.py b/l10n_it_bill_of_entry/wizard/select_template.py
deleted file mode 100644
index ad72e8186518..000000000000
--- a/l10n_it_bill_of_entry/wizard/select_template.py
+++ /dev/null
@@ -1,42 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#
-#    Copyright (C) 2013 Agile Business Group sagl (<http://www.agilebg.com>)
-#    Copyright (C) 2013
-#    Associazione OpenERP Italia (<http://www.openerp-italia.org>)
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as published
-#    by the Free Software Foundation, either version 3 of the License, or
-#    (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-##############################################################################
-
-from openerp.osv import fields, osv, orm
-from openerp.tools.translate import _
-
-
-class wizard_select_invoice_template(orm.TransientModel):
-    _inherit = "wizard.select.invoice.template"
-
-    def load_template(self, cr, uid, ids, context=None):
-        res = super(wizard_select_invoice_template, self).load_template(cr, uid, ids, context=context)
-        if context.get('active_model') == 'account.invoice':
-            invoice = self.pool.get('account.invoice').browse(cr, uid,
-                context.get('active_id'), context=context)
-            if invoice and invoice.customs_doc_type == 'forwarder_invoice':
-                invoice_id = res['res_id']
-                invoice_obj = self.pool.get('account.invoice')
-                invoice_obj.write(cr, uid, invoice_id, {
-                    'customs_doc_type': 'bill_of_entry',
-                    'forwarder_invoice_id': context.get('active_id')
-                }, context=context)
-        return res

From 4ac787c8b67161f86a4dec2e56a9e0e05b5c8189 Mon Sep 17 00:00:00 2001
From: eLBati <lb@takobi.online>
Date: Tue, 9 Feb 2021 18:13:13 +0100
Subject: [PATCH 06/20] porting l10n_it_bill_of_entry to v12 + improvements

---
 l10n_it_bill_of_entry/README.rst              | 129 ---------
 l10n_it_bill_of_entry/__init__.py             |  14 -
 l10n_it_bill_of_entry/__manifest__.py         |  14 +-
 .../demo/bill_of_entry_demo.xml               |  57 ++--
 l10n_it_bill_of_entry/i18n/it.po              | 259 ++++++++++++------
 l10n_it_bill_of_entry/models/__init__.py      |  12 -
 .../models/account_invoice.py                 | 137 ++++++++-
 l10n_it_bill_of_entry/models/company.py       |  40 +--
 l10n_it_bill_of_entry/readme/CONFIGURE.rst    |  51 ++++
 l10n_it_bill_of_entry/readme/CONTRIBUTORS.rst |   6 +
 l10n_it_bill_of_entry/readme/DESCRIPTION.rst  |   8 +
 l10n_it_bill_of_entry/readme/USAGE.rst        |  21 ++
 .../static/description/icon.png               | Bin 9455 -> 0 bytes
 .../static/src/css/l10n_it_bill_of_entry.css  |  32 ---
 .../tests/test_bill_of_entry.py               |  69 ++---
 .../views/account_invoice_view.xml            |  55 ++--
 l10n_it_bill_of_entry/views/company_view.xml  |  38 ++-
 17 files changed, 510 insertions(+), 432 deletions(-)
 delete mode 100644 l10n_it_bill_of_entry/README.rst
 create mode 100644 l10n_it_bill_of_entry/readme/CONFIGURE.rst
 create mode 100644 l10n_it_bill_of_entry/readme/CONTRIBUTORS.rst
 create mode 100644 l10n_it_bill_of_entry/readme/DESCRIPTION.rst
 create mode 100644 l10n_it_bill_of_entry/readme/USAGE.rst
 delete mode 100644 l10n_it_bill_of_entry/static/description/icon.png
 delete mode 100644 l10n_it_bill_of_entry/static/src/css/l10n_it_bill_of_entry.css

diff --git a/l10n_it_bill_of_entry/README.rst b/l10n_it_bill_of_entry/README.rst
deleted file mode 100644
index c8b55be1d202..000000000000
--- a/l10n_it_bill_of_entry/README.rst
+++ /dev/null
@@ -1,129 +0,0 @@
-.. image:: https://img.shields.io/badge/licence-AGPL--3-blue.svg
-   :target: http://www.gnu.org/licenses/agpl-3.0-standalone.html
-   :alt: License: AGPL-3
-
-====================================================
-Italian Localization - Bill of Entry: Bolle Doganali
-====================================================
-
-This module enables to manage extraUE import purchases, generating a bill of entry
-according to the supplier invoice.
-It involves three documents:
-
-* Supplier Invoice
-* Forwarder Invoice
-* Bill of Entry
-
-Here how documents are linked each other:
-
-* N bill of entries --> N supplier invoices
-* N bill of entries --> 1 forwarder invoice
-
-Configuration
-=============
-
-Mandatory settings:
-
-* An account journal required by the closing transfer account move (e.g. "Bolle Doganali").
-* An account journal for extraCEE supplier invoices, apart from 
-  ordinary supplier invoices. In this way, extraCEE supplier invoices don't appear in VAT registries;
-  in this way, VAT registries have no missing numbers.
-* Add a tax mapping on Extra EU fiscal position: purchase taxes (e.g. 22%) should be mapped to
-  to no one tax. In this way, every purchase invoice for extra UE fiscal position
-  don't show taxes in lines, according to law.
-* A virtual supplier (e.g. "Customs" or "Dogana") for the bill of entry.
-* The forwarder as a real supplier.
-* An expense account where recording the bill of entry net amount (e.g. "ACQUISTO MERCI ExtraCEE").
-* An expense account where recording the bill of entry VAT amount,
-  paid in advance by the forwarder and declared in the forwarder invoice (e.g. "SPESE DOGANALI ANTICIPATE").
-
-Optional settings:
-
-* An account tax, with the same VAT rate as the ordinary one (i.e. 22% for Italy),
-  applied on the bill of entry net amount (e.g. "22% debito ExtraCEE"). In this way,
-  bill of entries are highlighted in VAT registries due to this tax code.
-* An account for delivery expenses, recorded in the forwarderd invoice (e.g. "SPESE DI TRASPORTO").
-* An account for customs duties, recorded in the forwarderd invoice (e.g. "DIRITTI DOGANALI").
-* An account for stamp duties, recorded in the forwarderd invoice (e.g. "IMPOSTE DI BOLLO").
-
-Usage
-=====
-
-English
--------
-
-Each bill of entry can be manually linked to its corresponding supplier invoice.
-
-The forwarder invoice requires one (or more) line(s) marked as the
-advance customs vat.
-
-At the forwarder invoice confirmation, it would be linked to the closing
-transfer account move, which closes and reconciles the bill of entry.
-
-Italiano
---------
-
-Dalla bolla doganale è possibile collegare manualmente la (o le) fattura(e)
-fornitore corrispondente.
-
-Nella fattura spedizioniere bisogna indicare quale (o quali) riga (righe)
-rappresenti(no) l'IVA anticipata alla dogana.
-
-Alla conferma della fattura spedizioniere, verrà generata la scrittura
-contabile di giroconto per chiudere la bolla doganale.
-
-
-.. image:: https://odoo-community.org/website/image/ir.attachment/5784_f2813bd/datas
-   :alt: Try me on Runbot
-   :target: https://runbot.odoo-community.org/runbot/122/10.0
-
-Workplan and future improvements
-================================
-
-Previous releases of this module were able to create bill of entries
-through a wizard button, according to a predefined bill of entry invoice template.
-
-This feature requires account_invoice_template module, which is not yet fully available.
-
-
-Bug Tracker
-===========
-
-Bugs are tracked on `GitHub Issues
-<https://github.com/OCA/l10n-italy/issues>`_. In case of trouble, please
-check there if your issue has already been reported. If you spotted it first,
-help us smash it by providing detailed and welcomed feedback.
-
-Credits
-=======
-
-Contributors
-------------
-
-* Alex Comba <alex.comba@agilebg.com>
-* Lorenzo Battistini <lorenzo.battistini@agilebg.com>
-* Diego Bruselli <d.bruselli@creativiquadrati.it>
-
-Do not contact contributors directly about support or help with technical issues.
-
-Funders
--------
-
-The development of this module has been financially supported by:
-
-* Odoo Italia Network
-
-Maintainer
-----------
-
-.. image:: http://odoo-community.org/logo.png
-   :alt: Odoo Community Association
-   :target: http://odoo-community.org
-
-This module is maintained by the OCA.
-
-OCA, or the Odoo Community Association, is a nonprofit organization whose
-mission is to support the collaborative development of Odoo features and
-promote its widespread use.
-
-To contribute to this module, please visit http://odoo-community.org.
diff --git a/l10n_it_bill_of_entry/__init__.py b/l10n_it_bill_of_entry/__init__.py
index dc2b7d742df5..0ee8b5073e26 100644
--- a/l10n_it_bill_of_entry/__init__.py
+++ b/l10n_it_bill_of_entry/__init__.py
@@ -1,16 +1,2 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#
-#    Copyright (C) 2013-2017 Agile Business Group sagl (http://www.agilebg.com)
-#    @author Alex Comba <alex.comba@agilebg.com>
-#    @author Lorenzo Battistini <lorenzo.battistini@agilebg.com>
-#    Copyright (C) 2017 CQ Creativi Quadrati (http://www.creativiquadrati.it)
-#    @author Diego Bruselli <d.bruselli@creativiquadrati.it>
-#    Copyright (C) 2013
-#
-#    License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
-#
-##############################################################################
-
 from . import models
 from . import tests
diff --git a/l10n_it_bill_of_entry/__manifest__.py b/l10n_it_bill_of_entry/__manifest__.py
index a8a3c9590d6a..74596aca9e81 100644
--- a/l10n_it_bill_of_entry/__manifest__.py
+++ b/l10n_it_bill_of_entry/__manifest__.py
@@ -1,9 +1,8 @@
-# -*- coding: utf-8 -*-
 ##############################################################################
 #
 #    Copyright (C) 2013-2017 Agile Business Group sagl (http://www.agilebg.com)
 #    @author Alex Comba <alex.comba@agilebg.com>
-#    @author Lorenzo Battistini <lorenzo.battistini@agilebg.com>
+#    @author Lorenzo Battistini <https://github.com/eLBati>
 #    Copyright (C) 2017 CQ Creativi Quadrati (http://www.creativiquadrati.it)
 #    @author Diego Bruselli <d.bruselli@creativiquadrati.it>
 #    Copyright (C) 2013
@@ -13,21 +12,16 @@
 ##############################################################################
 
 {
-    'name': 'Italian Localisation - Bill of Entry',
-    'version': '10.0.1.0.0',
+    'name': 'ITA - Bolle doganali',
+    'version': '12.0.1.0.0',
     'category': 'Localization/Italy',
-    'summary': 'Bolle Doganali',
     'author': "Odoo Community Association (OCA), "
               "Agile Business Group, CQ Creativi Quadrati",
-    'website': "https://odoo-community.org/",
+    'website': "https://github.com/OCA/l10n-italy",
     'license': 'AGPL-3',
-    # account dependency should be replaced with account_invoice_template
-    # when this PR will be merged:
-    # https://github.com/OCA/account-invoicing/pull/250
     'depends': [
         'base',
         'account',
-        # 'account_invoice_template',
     ],
     'data': [
         'views/company_view.xml',
diff --git a/l10n_it_bill_of_entry/demo/bill_of_entry_demo.xml b/l10n_it_bill_of_entry/demo/bill_of_entry_demo.xml
index baf065f2020e..b00a71a20ed3 100644
--- a/l10n_it_bill_of_entry/demo/bill_of_entry_demo.xml
+++ b/l10n_it_bill_of_entry/demo/bill_of_entry_demo.xml
@@ -2,7 +2,6 @@
 <odoo>
     <data>
 
-
         <!-- Account account -->
         <record id="account_account_extraEU_purchase" model="account.account">
             <field name="code">280310</field>
@@ -47,20 +46,19 @@
 
         <!-- Account Tax -->
         <record id="tax_tag_22extraUE" model="account.account.tag">
-            <field name="name">22aExtraCEE</field>
+            <field name="name">22aExtraUE</field>
             <field name="applicability">taxes</field>
         </record>
         <record id="tax_22extraUE" model="account.tax">
-            <field name="name">Iva al 22% ExtraCEE (credito)</field>
+            <field name="name">Iva al 22% ExtraUE (credito)</field>
             <field name="type_tax_use">purchase</field>
             <field name="amount_type">percent</field>
             <field name="amount">22</field>
-            <field name="description">22aExtraCEE</field>
+            <field name="description">22aExtraUE</field>
             <field name="tax_group_id" ref="account.tax_group_taxes"/>
+            <field name="sequence">99</field>
         </record>
 
-
-
         <!-- Partner -->
         <record id="partner_customs" model="res.partner">
             <field name="name">Customs</field>
@@ -73,24 +71,14 @@
             <field name="name">Extra EU</field>
          </record>
 
-        <!-- Account Fiscal Position Tax -->
-<!--
-        tax correspondence is gonna create in *.py
-        <record id="fiscal_position_tax_purchase_extraEU" model="account.fiscal.position.tax">
-            <field name="position_id" ref="fiscal_position_extraEU"/>
-
-         </record>
--->
-
         <!-- Account Journal -->
         <record id="account_journal_purchase_extraEU" model="account.journal">
-            <field name="name">Supplier Invoices ExtraCEE</field>
+            <field name="name">Supplier Invoices ExtraUE</field>
             <field name="type">purchase</field>
-            <field name="code">NOCEE</field>
+            <field name="code">NOUE</field>
             <field name="update_posted">True</field>
          </record>
 
-
         <!-- Product product -->
         <record id="product_product_extraEU_purchase" model="product.product">
             <field name="name">ExtraEU Goods Purchase</field>
@@ -99,12 +87,8 @@
             <field name="standard_price">1.0</field>
             <field name="list_price">1.0</field>
             <field name="type">service</field>
-            <field name="uom_id" ref="product.product_uom_unit"/>
-            <field name="uom_po_id" ref="product.product_uom_unit"/>
-            <field name="property_account_expense_id"
-                eval="[(6, 0, [ref('account_account_extraEU_purchase')])]"/>
-            <field name="supplier_taxes_id"
-                eval="[(6, 0, [ref('tax_22extraUE')])]"/>
+            <field name="uom_id" ref="uom.product_uom_unit"/>
+            <field name="uom_po_id" ref="uom.product_uom_unit"/>
         </record>
         <record id="product_product_adv_customs_expense" model="product.product">
             <field name="name">Advance Customs Expense</field>
@@ -113,10 +97,8 @@
             <field name="standard_price">1.0</field>
             <field name="list_price">1.0</field>
             <field name="type">service</field>
-            <field name="uom_id" ref="product.product_uom_unit"/>
-            <field name="uom_po_id" ref="product.product_uom_unit"/>
-            <field name="property_account_expense_id"
-                eval="[(6, 0, [ref('account_account_adv_customs_expense')])]"/>
+            <field name="uom_id" ref="uom.product_uom_unit"/>
+            <field name="uom_po_id" ref="uom.product_uom_unit"/>
         </record>
         <record id="product_product_customs_expense" model="product.product">
             <field name="name">Customs Expense</field>
@@ -125,10 +107,8 @@
             <field name="standard_price">1.0</field>
             <field name="list_price">1.0</field>
             <field name="type">service</field>
-            <field name="uom_id" ref="product.product_uom_unit"/>
-            <field name="uom_po_id" ref="product.product_uom_unit"/>
-            <field name="property_account_expense_id"
-                eval="[(6, 0, [ref('account_account_customs_expense')])]"/>
+            <field name="uom_id" ref="uom.product_uom_unit"/>
+            <field name="uom_po_id" ref="uom.product_uom_unit"/>
         </record>
         <record id="product_product_delivery" model="product.product">
             <field name="name">Delivery Expense</field>
@@ -137,10 +117,11 @@
             <field name="standard_price">1.0</field>
             <field name="list_price">1.0</field>
             <field name="type">service</field>
-            <field name="uom_id" ref="product.product_uom_unit"/>
-            <field name="uom_po_id" ref="product.product_uom_unit"/>
-            <field name="property_account_expense_id"
-                eval="[(6, 0, [ref('account_account_delivery_expense')])]"/>
+            <field name="uom_id" ref="uom.product_uom_unit"/>
+            <field name="uom_po_id" ref="uom.product_uom_unit"/>
+            <!-- Usually this is standard VAT -->
+            <field name="supplier_taxes_id"
+                eval="[(6, 0, [ref('tax_22extraUE')])]"/>
         </record>
         <record id="product_product_stamp_duties" model="product.product">
             <field name="name">Stamp Duties</field>
@@ -149,8 +130,8 @@
             <field name="standard_price">1.0</field>
             <field name="list_price">1.0</field>
             <field name="type">service</field>
-            <field name="uom_id" ref="product.product_uom_unit"/>
-            <field name="uom_po_id" ref="product.product_uom_unit"/>
+            <field name="uom_id" ref="uom.product_uom_unit"/>
+            <field name="uom_po_id" ref="uom.product_uom_unit"/>
             <field name="property_account_expense_id"
                 eval="[(6, 0, [ref('account_account_stamp_duties')])]"/>
         </record>
diff --git a/l10n_it_bill_of_entry/i18n/it.po b/l10n_it_bill_of_entry/i18n/it.po
index 8c8f5d57c2e8..3ea3f9aa0f70 100644
--- a/l10n_it_bill_of_entry/i18n/it.po
+++ b/l10n_it_bill_of_entry/i18n/it.po
@@ -1,163 +1,242 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
-# * l10n_it_bill_of_entry
-# 
-# Translators:
+#	* l10n_it_bill_of_entry
+#
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Server 10.0\n"
+"Project-Id-Version: Odoo Server 12.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-09-25 08:32+0000\n"
-"PO-Revision-Date: 2017-09-25 08:32+0000\n"
-"Last-Translator: Diego Bruselli <d.bruselli@gmail.com>\n"
-"Language-Team: Italian (http://www.transifex.com/oca/OCA-l10n-italy-10-0/language/it/)\n"
+"POT-Creation-Date: 2021-02-10 17:32+0000\n"
+"PO-Revision-Date: 2021-02-10 17:32+0000\n"
+"Last-Translator: <>\n"
+"Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: \n"
-"Language: it\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"Plural-Forms: \n"
 
 #. module: l10n_it_bill_of_entry
-#: model:ir.ui.view,arch_db:l10n_it_bill_of_entry.invoice_supplier_boe_form
-msgid "Supplier invoices"
-msgstr "Fatture fornitore"
-
-#. module: l10n_it_bill_of_entry
-#: model:ir.model.fields,field_description:l10n_it_bill_of_entry.field_account_invoice_customs_doc_type
-msgid "Customs Doc Type"
-msgstr "Tipo documento doganale"
+#: model_terms:ir.ui.view,arch_db:l10n_it_bill_of_entry.view_boe_config_settings
+msgid "<span class=\"fa fa-lg fa-building-o\" title=\"Values set here are company-specific.\" aria-label=\"Values set here are company-specific.\" groups=\"base.group_multi_company\" role=\"img\"/>"
+msgstr "<span class=\"fa fa-lg fa-building-o\" title=\"I valori impostati qui sono specifici per azienda.\" aria-label=\"Values set here are company-specific.\" groups=\"base.group_multi_company\" role=\"img\"/>"
 
 #. module: l10n_it_bill_of_entry
-#: model:ir.model,name:l10n_it_bill_of_entry.model_account_config_settings
-msgid "account.config.settings"
-msgstr "account.config.settings"
+#: model:ir.model.fields,field_description:l10n_it_bill_of_entry.field_account_invoice_line__advance_customs_vat
+msgid "Advance Customs Vat"
+msgstr "IVA dogana anticipata"
 
 #. module: l10n_it_bill_of_entry
 #: selection:account.invoice,customs_doc_type:0
-msgid "Supplier Invoice"
-msgstr "Fattura fornitore"
-
-#. module: l10n_it_bill_of_entry
-#: code:addons/l10n_it_bill_of_entry/account_invoice.py:70
-#, python-format
-msgid "Forwarder invoice %s does not have lines with 'Advance Customs Vat'"
-msgstr "La fattura fornitore %s non ha riga con 'IVA anticipata'"
+msgid "Bill of Entry"
+msgstr "Bolla doganale"
 
 #. module: l10n_it_bill_of_entry
-#: model:ir.model.fields,field_description:l10n_it_bill_of_entry.field_account_invoice_bill_of_entry_storno_id
+#: model:ir.model.fields,field_description:l10n_it_bill_of_entry.field_account_invoice__bill_of_entry_storno_id
 msgid "Bill of Entry Storno"
 msgstr "Storno bolla doganale"
 
 #. module: l10n_it_bill_of_entry
-#: selection:account.invoice,customs_doc_type:0
-msgid "Bill of Entry"
-msgstr "Bolla doganale"
+#: model_terms:ir.ui.view,arch_db:l10n_it_bill_of_entry.invoice_supplier_boe_form
+#: model_terms:ir.ui.view,arch_db:l10n_it_bill_of_entry.view_boe_config_settings
+msgid "Bill of entries"
+msgstr "Bolle doganali"
 
 #. module: l10n_it_bill_of_entry
-#: model:ir.model.fields,field_description:l10n_it_bill_of_entry.field_account_invoice_supplier_invoice_ids
-msgid "Supplier Invoices"
-msgstr "Fatture fornitore"
+#: model:ir.model.fields,field_description:l10n_it_bill_of_entry.field_account_invoice__forwarder_bill_of_entries_count
+msgid "Bill of entries for forwarder"
+msgstr "Bolle doganali per spedizioniere"
 
 #. module: l10n_it_bill_of_entry
-#: model:ir.ui.view,arch_db:l10n_it_bill_of_entry.invoice_supplier_form
-msgid "Make Bill of Entry"
-msgstr "Genera bolla doganale"
+#: model:ir.model.fields,field_description:l10n_it_bill_of_entry.field_account_invoice__bill_of_entries_count
+msgid "Bill of entries number"
+msgstr "Numero bolle doganali"
 
 #. module: l10n_it_bill_of_entry
-#: model:ir.model.fields,field_description:l10n_it_bill_of_entry.field_account_invoice_supplier_bill_of_entry_ids
-msgid "Supplier Bill of Entries"
-msgstr "Bolle doganali fornitore"
+#: code:addons/l10n_it_bill_of_entry/models/account_invoice.py:115
+#, python-format
+msgid "Bill of entry %s is in state %s"
+msgstr "La bolla doganale %s è nello stato %s"
 
 #. module: l10n_it_bill_of_entry
-#: model:ir.ui.view,arch_db:l10n_it_bill_of_entry.invoice_supplier_boe_form
-msgid "Customs"
-msgstr "Dogana"
+#: model:ir.model.fields,field_description:l10n_it_bill_of_entry.field_res_company__bill_of_entry_journal_id
+#: model:ir.model.fields,field_description:l10n_it_bill_of_entry.field_res_config_settings__bill_of_entry_journal_id
+msgid "Bill of entry Storno journal"
+msgstr "Registro storno bolla doganale"
 
 #. module: l10n_it_bill_of_entry
-#: code:addons/l10n_it_bill_of_entry/account_invoice.py:123
-#, python-format
-msgid "Extra CEE expenses"
-msgstr "Uscite extra CEE"
+#: model:ir.model.fields,field_description:l10n_it_bill_of_entry.field_res_company__bill_of_entry_partner_id
+#: model:ir.model.fields,field_description:l10n_it_bill_of_entry.field_res_config_settings__bill_of_entry_partner_id
+msgid "Bill of entry partner"
+msgstr "Partner bolla doganale"
 
 #. module: l10n_it_bill_of_entry
-#: model:ir.ui.view,arch_db:l10n_it_bill_of_entry.invoice_supplier_boe_form
-msgid "Bill of entries"
-msgstr "Bolle doganali"
+#: model:ir.model.fields,field_description:l10n_it_bill_of_entry.field_res_company__bill_of_entry_tax_id
+#: model:ir.model.fields,field_description:l10n_it_bill_of_entry.field_res_config_settings__bill_of_entry_tax_id
+msgid "Bill of entry tax"
+msgstr "Imposta bolla doganale"
 
 #. module: l10n_it_bill_of_entry
-#: model:ir.ui.view,arch_db:l10n_it_bill_of_entry.view_boe_config_settings
-msgid "Configuration"
-msgstr "Configurazione"
+#: code:addons/l10n_it_bill_of_entry/models/account_invoice.py:166
+#, python-format
+msgid "Can't handle more than 1 tax for line %s"
+msgstr "Impossibile gestire più di 1 imposta per la riga %s"
 
 #. module: l10n_it_bill_of_entry
-#: model:ir.ui.view,arch_db:l10n_it_bill_of_entry.view_boe_config_settings
-msgid "Bill of entry"
-msgstr "Bolla doganale"
+#: model:ir.model,name:l10n_it_bill_of_entry.model_res_company
+msgid "Companies"
+msgstr "Aziende"
 
 #. module: l10n_it_bill_of_entry
-#: model:ir.model.fields,field_description:l10n_it_bill_of_entry.field_res_company_bill_of_entry_journal_id
-#: model:ir.model.fields,field_description:l10n_it_bill_of_entry.field_account_config_settings_bill_of_entry_journal_id
-msgid "Bill of entry Storno journal"
-msgstr "Sezionale di storno bolla doganale"
+#: model:ir.model,name:l10n_it_bill_of_entry.model_res_config_settings
+msgid "Config Settings"
+msgstr "Impostazioni di configurazione"
 
 #. module: l10n_it_bill_of_entry
-#: model:ir.model.fields,help:l10n_it_bill_of_entry.field_res_company_bill_of_entry_journal_id
-#: model:ir.model.fields,help:l10n_it_bill_of_entry.field_account_config_settings_bill_of_entry_journal_id
-msgid "Journal used for reconciliation of customs supplier"
-msgstr "Sezionale usato per la riconciliazione del fornitore dogana"
+#: model_terms:ir.ui.view,arch_db:l10n_it_bill_of_entry.invoice_supplier_boe_form
+msgid "Customs"
+msgstr "Dogana"
 
 #. module: l10n_it_bill_of_entry
-#: model:ir.model.fields,field_description:l10n_it_bill_of_entry.field_account_invoice_forwarder_bill_of_entry_ids
-msgid "Forward Bill of Entries"
-msgstr "Bolla doganale spedizioniere"
+#: model:ir.model.fields,field_description:l10n_it_bill_of_entry.field_account_invoice__customs_doc_type
+msgid "Customs Doc Type"
+msgstr "Tipo doc Dogana"
 
 #. module: l10n_it_bill_of_entry
-#: code:addons/l10n_it_bill_of_entry/account_invoice.py:99
+#: code:addons/l10n_it_bill_of_entry/models/account_invoice.py:144
+#, python-format
+msgid "Customs expenses"
+msgstr "Spese dogana"
+
+#. module: l10n_it_bill_of_entry
+#: code:addons/l10n_it_bill_of_entry/models/account_invoice.py:155
 #, python-format
 msgid "Customs supplier"
 msgstr "Fornitore dogana"
 
+#. module: l10n_it_bill_of_entry
+#: code:addons/l10n_it_bill_of_entry/models/account_invoice.py:170
+#, python-format
+msgid "Extra UE expenses"
+msgstr "Spese extra UE"
+
+#. module: l10n_it_bill_of_entry
+#: code:addons/l10n_it_bill_of_entry/models/account_invoice.py:220
+#, python-format
+msgid "Extra UE supplier invoice must have no taxes"
+msgstr "La fattura del fornitore extra UE non deve avere imposte"
+
+#. module: l10n_it_bill_of_entry
+#: model_terms:ir.ui.view,arch_db:l10n_it_bill_of_entry.invoice_supplier_boe_form
+msgid "Extra invoices"
+msgstr "Fatture extra"
+
+#. module: l10n_it_bill_of_entry
+#: model:ir.model.fields,field_description:l10n_it_bill_of_entry.field_account_invoice__forwarder_bill_of_entry_ids
+msgid "Forward Bill of Entries"
+msgstr "Bolle doganali spedizioniere"
+
 #. module: l10n_it_bill_of_entry
 #: selection:account.invoice,customs_doc_type:0
-#: model:ir.model.fields,field_description:l10n_it_bill_of_entry.field_account_invoice_forwarder_invoice_id
+#: model:ir.model.fields,field_description:l10n_it_bill_of_entry.field_account_invoice__forwarder_invoice_id
 msgid "Forwarder Invoice"
 msgstr "Fattura spedizioniere"
 
 #. module: l10n_it_bill_of_entry
-#: code:addons/l10n_it_bill_of_entry/account_invoice.py:57
+#: code:addons/l10n_it_bill_of_entry/models/account_invoice.py:128
 #, python-format
-msgid "Bill of entry %s is in state %s"
-msgstr "La bolla doganale %s è in stato %s"
+msgid "Forwarder invoice %s does not have lines with 'Advance Customs Vat'"
+msgstr "La fattura spedizioniere %s non ha righe con 'IVA dogana anticipata'"
+
+#. module: l10n_it_bill_of_entry
+#: model_terms:ir.ui.view,arch_db:l10n_it_bill_of_entry.invoice_supplier_boe_form
+msgid "Generate bill of entry"
+msgstr "Generare bolla doganale"
+
+#. module: l10n_it_bill_of_entry
+#: model:ir.model,name:l10n_it_bill_of_entry.model_account_invoice
+msgid "Invoice"
+msgstr "Fattura"
 
 #. module: l10n_it_bill_of_entry
 #: model:ir.model,name:l10n_it_bill_of_entry.model_account_invoice_line
 msgid "Invoice Line"
-msgstr "Righe Fattura"
+msgstr "Riga fattura"
+
+#. module: l10n_it_bill_of_entry
+#: model:ir.model.fields,help:l10n_it_bill_of_entry.field_res_company__bill_of_entry_journal_id
+#: model:ir.model.fields,help:l10n_it_bill_of_entry.field_res_config_settings__bill_of_entry_journal_id
+#: model_terms:ir.ui.view,arch_db:l10n_it_bill_of_entry.view_boe_config_settings
+msgid "Journal used for reconciliation of bill of entries"
+msgstr "Registro usato per la riconciliazione delle bolle doganali"
 
 #. module: l10n_it_bill_of_entry
-#: code:addons/l10n_it_bill_of_entry/account_invoice.py:88
+#: code:addons/l10n_it_bill_of_entry/models/account_invoice.py:133
 #, python-format
-msgid "Customs expenses"
-msgstr "Spese doganali"
+msgid "No Bill of entry Storno journal configured"
+msgstr "Nessun registro per storno della bolla doganale configurato"
 
 #. module: l10n_it_bill_of_entry
-#: model:ir.model,name:l10n_it_bill_of_entry.model_wizard_select_invoice_template
-msgid "wizard.select.invoice.template"
-msgstr "wizard.select.invoice.template"
+#: code:addons/l10n_it_bill_of_entry/models/account_invoice.py:231
+#, python-format
+msgid "Please set 'Bill of entry partner' in accounting configuration"
+msgstr "Prego impostare 'Partner dogana' in configurazione contabilità"
 
 #. module: l10n_it_bill_of_entry
-#: code:addons/l10n_it_bill_of_entry/account_invoice.py:113
+#: code:addons/l10n_it_bill_of_entry/models/account_invoice.py:228
 #, python-format
-msgid "Can't handle more than 1 tax for line %s"
-msgstr "Impossibile gestire più di un'imposta per la riga %s"
+msgid "Please set 'Bill of entry tax' in accounting configuration"
+msgstr "Prego impostare 'Imposta dogana'"
 
 #. module: l10n_it_bill_of_entry
-#: model:ir.model.fields,field_description:l10n_it_bill_of_entry.field_account_invoice_line_advance_customs_vat
-msgid "Advance Customs Vat"
-msgstr "IVA doganale anticipata"
+#: model:ir.model.fields,field_description:l10n_it_bill_of_entry.field_account_invoice__supplier_bill_of_entry_ids
+msgid "Supplier Bill of Entries"
+msgstr "Fornitore bolle doganali"
+
+#. module: l10n_it_bill_of_entry
+#: selection:account.invoice,customs_doc_type:0
+msgid "Supplier Invoice"
+msgstr "Fattura fornitore"
+
+#. module: l10n_it_bill_of_entry
+#: model:ir.model.fields,field_description:l10n_it_bill_of_entry.field_account_invoice__supplier_invoice_ids
+msgid "Supplier Invoices"
+msgstr "Fatture fornitore"
+
+#. module: l10n_it_bill_of_entry
+#: model_terms:ir.ui.view,arch_db:l10n_it_bill_of_entry.invoice_supplier_boe_form
+msgid "Supplier invoices"
+msgstr "Fatture fornitore"
 
 #. module: l10n_it_bill_of_entry
-#: code:addons/l10n_it_bill_of_entry/account_invoice.py:75
+#: model:ir.model.fields,field_description:l10n_it_bill_of_entry.field_account_invoice__extra_supplier_invoices_count
+msgid "Supplier invoices number"
+msgstr "Numero fatture fornitore"
+
+#. module: l10n_it_bill_of_entry
+#: model:ir.model.fields,help:l10n_it_bill_of_entry.field_res_company__bill_of_entry_partner_id
+#: model:ir.model.fields,help:l10n_it_bill_of_entry.field_res_config_settings__bill_of_entry_partner_id
+#: model_terms:ir.ui.view,arch_db:l10n_it_bill_of_entry.view_boe_config_settings
+msgid "Supplier used in bill of entries"
+msgstr "Fornitore usato nelle bolle doganali"
+
+#. module: l10n_it_bill_of_entry
+#: model:ir.model.fields,help:l10n_it_bill_of_entry.field_res_company__bill_of_entry_tax_id
+msgid "Tax used in bill of entries"
+msgstr "Imposta usata nelle bolle doganali"
+
+#. module: l10n_it_bill_of_entry
+#: model_terms:ir.ui.view,arch_db:l10n_it_bill_of_entry.view_boe_config_settings
+msgid "Tax used in bill of entries generation, when product is not present"
+msgstr "Imposta usata nella generazione delle bolle doganali, quando il prodotto non è presente"
+
+#. module: l10n_it_bill_of_entry
+#: model:ir.model.fields,help:l10n_it_bill_of_entry.field_res_config_settings__bill_of_entry_tax_id
+msgid "Tax used in bill of entries, when product is not present"
+msgstr "Imposta usata nelle bolle doganali, quando il prodotto non è presente"
+
+#. module: l10n_it_bill_of_entry
+#: code:addons/l10n_it_bill_of_entry/models/account_invoice.py:225
 #, python-format
-msgid "No Bill of entry Storno journal configured"
-msgstr "Nessun sezionale di storno bolla doganale configurato"
+msgid "You can generate bill of entry from extra UE supplier invoice only"
+msgstr "È possibile generare la bolla doganale solamente da una fattura fornitore extra UE"
+
diff --git a/l10n_it_bill_of_entry/models/__init__.py b/l10n_it_bill_of_entry/models/__init__.py
index 1eb4fdd51ec2..8e1d75d59773 100644
--- a/l10n_it_bill_of_entry/models/__init__.py
+++ b/l10n_it_bill_of_entry/models/__init__.py
@@ -1,14 +1,2 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#
-#    Copyright (C) 2013-2017 Agile Business Group sagl (http://www.agilebg.com)
-#    Copyright (C) 2017 CQ Creativi Quadrati (http://www.creativiquadrati.it)
-#    @author Diego Bruselli <d.bruselli@creativiquadrati.it>
-#    Copyright (C) 2013
-#
-#    License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
-#
-##############################################################################
-
 from . import account_invoice
 from . import company
diff --git a/l10n_it_bill_of_entry/models/account_invoice.py b/l10n_it_bill_of_entry/models/account_invoice.py
index 919f3d877d2d..b105ff9b2a14 100644
--- a/l10n_it_bill_of_entry/models/account_invoice.py
+++ b/l10n_it_bill_of_entry/models/account_invoice.py
@@ -1,17 +1,3 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#
-#    Copyright (C) 2013-2017 Agile Business Group sagl (http://www.agilebg.com)
-#    @author Alex Comba <alex.comba@agilebg.com>
-#    @author Lorenzo Battistini <lorenzo.battistini@agilebg.com>
-#    Copyright (C) 2017 CQ Creativi Quadrati (http://www.creativiquadrati.it)
-#    @author Diego Bruselli <d.bruselli@creativiquadrati.it>
-#    Copyright (C) 2013
-#
-#    License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
-#
-##############################################################################
-
 from odoo import fields, models, api
 from odoo.tools.translate import _
 from odoo.exceptions import UserError
@@ -38,6 +24,82 @@ class AccountInvoice(models.Model):
         'Forward Bill of Entries', readonly=True)
     bill_of_entry_storno_id = fields.Many2one(
         'account.move', 'Bill of Entry Storno', readonly=True)
+    bill_of_entries_count = fields.Integer(
+        "Bill of entries number", compute="_compute_bill_of_entries_count")
+    extra_supplier_invoices_count = fields.Integer(
+        "Supplier invoices number", compute="_compute_extra_supplier_invoices_count")
+    forwarder_bill_of_entries_count = fields.Integer(
+        "Bill of entries for forwarder",
+        compute="_compute_forwarder_bill_of_entries_count")
+
+    @api.multi
+    def _compute_bill_of_entries_count(self):
+        for inv in self:
+            inv.bill_of_entries_count = len(inv.supplier_bill_of_entry_ids)
+
+    @api.multi
+    def _compute_extra_supplier_invoices_count(self):
+        for inv in self:
+            inv.extra_supplier_invoices_count = len(inv.supplier_invoice_ids)
+
+    @api.multi
+    def _compute_forwarder_bill_of_entries_count(self):
+        for inv in self:
+            inv.forwarder_bill_of_entries_count = len(inv.forwarder_bill_of_entry_ids)
+
+    @api.multi
+    def action_view_bill_of_entries(self):
+        boes = self.mapped('supplier_bill_of_entry_ids')
+        action = self.env.ref('account.action_vendor_bill_template').read()[0]
+        if len(boes) > 1:
+            action['domain'] = [('id', 'in', boes.ids)]
+        elif len(boes) == 1:
+            form_view = [(self.env.ref('account.invoice_supplier_form').id, 'form')]
+            if 'views' in action:
+                action['views'] = form_view + [
+                    (state, view) for state, view in action['views'] if view != 'form']
+            else:
+                action['views'] = form_view
+            action['res_id'] = boes.ids[0]
+        else:
+            action = {'type': 'ir.actions.act_window_close'}
+        return action
+
+    @api.multi
+    def action_view_extra_supplier_invoices(self):
+        invoices = self.mapped('supplier_invoice_ids')
+        action = self.env.ref('account.action_vendor_bill_template').read()[0]
+        if len(invoices) > 1:
+            action['domain'] = [('id', 'in', invoices.ids)]
+        elif len(invoices) == 1:
+            form_view = [(self.env.ref('account.invoice_supplier_form').id, 'form')]
+            if 'views' in action:
+                action['views'] = form_view + [
+                    (state, view) for state, view in action['views'] if view != 'form']
+            else:
+                action['views'] = form_view
+            action['res_id'] = invoices.ids[0]
+        else:
+            action = {'type': 'ir.actions.act_window_close'}
+        return action
+
+    @api.multi
+    def action_view_forwarder_bill_of_entries(self):
+        boes = self.mapped('forwarder_bill_of_entry_ids')
+        action = self.env.ref('account.action_vendor_bill_template').read()[0]
+        if len(boes) > 1:
+            action['domain'] = [('id', 'in', boes.ids)]
+        elif len(boes) == 1:
+            form_view = [(self.env.ref('account.invoice_supplier_form').id, 'form')]
+            if 'views' in action:
+                action['views'] = form_view + [
+                    (state, view) for state, view in action['views'] if view != 'form']
+            else:
+                action['views'] = form_view
+            action['res_id'] = boes.ids[0]
+        else:
+            action = {'type': 'ir.actions.act_window_close'}
+        return action
 
     @api.multi
     def action_move_create(self):
@@ -105,7 +167,7 @@ def action_move_create(self):
                                       "%s") % boe_line.name)
 
                         line_vals = {
-                            'name': _("Extra CEE expenses"),
+                            'name': _("Extra UE expenses"),
                             'account_id': boe_line.account_id.id,
                             'debit': 0.0,
                             'credit': boe_line.price_subtotal,
@@ -116,6 +178,7 @@ def action_move_create(self):
                         move_lines.append((0, 0, line_vals))
                 move_vals['line_ids'] = move_lines
                 move = AccountMove.create(move_vals)
+                move.action_post()
                 invoice.write(
                     {'bill_of_entry_storno_id': move.id})
 
@@ -140,11 +203,55 @@ def action_move_create(self):
     def action_cancel(self):
         res = super(AccountInvoice, self).action_cancel()
         for invoice in self:
+            for boe in invoice.forwarder_bill_of_entry_ids:
+                move = boe.move_id
+                rec_lines = move.mapped('line_ids').filtered(
+                    'full_reconcile_id'
+                ).mapped('full_reconcile_id.reconciled_line_ids')
+                rec_lines.remove_move_reconcile()
             if invoice.bill_of_entry_storno_id:
                 invoice.bill_of_entry_storno_id.button_cancel()
                 invoice.bill_of_entry_storno_id.unlink()
         return res
 
+    def _check_no_taxes(self):
+        for line in self.invoice_line_ids:
+            if line.invoice_line_tax_ids:
+                raise (_("Extra UE supplier invoice must have no taxes"))
+
+    def generate_bill_of_entry(self):
+        self.ensure_one()
+        if self.customs_doc_type != "supplier_invoice":
+            raise UserError(_(
+                "You can generate bill of entry from extra UE supplier invoice only"))
+        if not self.company_id.bill_of_entry_tax_id:
+            raise UserError(_(
+                "Please set 'Bill of entry tax' in accounting configuration"))
+        if not self.company_id.bill_of_entry_partner_id:
+            raise UserError(_(
+                "Please set 'Bill of entry partner' in accounting configuration"))
+        self._check_no_taxes()
+        boe_inv = self.copy(default={
+            "partner_id": self.company_id.bill_of_entry_partner_id.id,
+            "customs_doc_type": "bill_of_entry",
+        })
+        for line in boe_inv.invoice_line_ids:
+            tax = self.company_id.bill_of_entry_tax_id
+            if line.product_id.supplier_taxes_id:
+                tax = line.product_id.supplier_taxes_id[0]
+            line.invoice_line_tax_ids = [(6, 0, [tax.id])]
+        boe_inv.supplier_invoice_ids = [(4, self.id)]
+        boe_inv.compute_taxes()
+        action = self.env.ref('account.action_vendor_bill_template').read()[0]
+        form_view = [(self.env.ref('account.invoice_supplier_form').id, 'form')]
+        if 'views' in action:
+            action['views'] = form_view + [
+                (state, view) for state, view in action['views'] if view != 'form']
+        else:
+            action['views'] = form_view
+        action['res_id'] = boe_inv.ids[0]
+        return action
+
 
 class AccountInvoiceLine(models.Model):
     _inherit = "account.invoice.line"
diff --git a/l10n_it_bill_of_entry/models/company.py b/l10n_it_bill_of_entry/models/company.py
index cbca401e2814..8630fce8d7e0 100644
--- a/l10n_it_bill_of_entry/models/company.py
+++ b/l10n_it_bill_of_entry/models/company.py
@@ -1,17 +1,3 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#
-#    Copyright (C) 2013-2017 Agile Business Group sagl (http://www.agilebg.com)
-#    @author Alex Comba <alex.comba@agilebg.com>
-#    @author Lorenzo Battistini <lorenzo.battistini@agilebg.com>
-#    Copyright (C) 2017 CQ Creativi Quadrati (http://www.creativiquadrati.it)
-#    @author Diego Bruselli <d.bruselli@creativiquadrati.it>
-#    Copyright (C) 2013
-#
-#    License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
-#
-##############################################################################
-
 from odoo import fields, models
 
 
@@ -20,15 +6,33 @@ class Company(models.Model):
 
     bill_of_entry_journal_id = fields.Many2one(
         'account.journal', 'Bill of entry Storno journal',
-        help="Journal used for reconciliation of customs supplier",
+        help="Journal used for reconciliation of bill of entries",
+    )
+    bill_of_entry_tax_id = fields.Many2one(
+        'account.tax', 'Bill of entry tax',
+        help="Tax used in bill of entries",
+    )
+    bill_of_entry_partner_id = fields.Many2one(
+        'res.partner', 'Bill of entry partner',
+        help="Supplier used in bill of entries",
     )
 
 
 class AccountConfigSettings(models.TransientModel):
-    _inherit = 'account.config.settings'
+    _inherit = 'res.config.settings'
 
     bill_of_entry_journal_id = fields.Many2one(
         'account.journal', related='company_id.bill_of_entry_journal_id',
-        string="Bill of entry Storno journal",
-        help="Journal used for reconciliation of customs supplier",
+        string="Bill of entry Storno journal", readonly=False,
+        help="Journal used for reconciliation of bill of entries",
+    )
+    bill_of_entry_tax_id = fields.Many2one(
+        'account.tax', related='company_id.bill_of_entry_tax_id',
+        string="Bill of entry tax", readonly=False,
+        help="Tax used in bill of entries, when product is not present",
+    )
+    bill_of_entry_partner_id = fields.Many2one(
+        'res.partner', related='company_id.bill_of_entry_partner_id',
+        string="Bill of entry partner", readonly=False,
+        help="Supplier used in bill of entries",
     )
diff --git a/l10n_it_bill_of_entry/readme/CONFIGURE.rst b/l10n_it_bill_of_entry/readme/CONFIGURE.rst
new file mode 100644
index 000000000000..0e37a7e72307
--- /dev/null
+++ b/l10n_it_bill_of_entry/readme/CONFIGURE.rst
@@ -0,0 +1,51 @@
+English
+-------
+
+Mandatory settings:
+
+* An account journal required by the closing transfer account move (e.g. "Bolle Doganali").
+* An account journal for extraUE supplier invoices, apart from
+  ordinary supplier invoices. In this way, extraUE supplier invoices don't appear in VAT registries;
+  in this way, VAT registries have no missing numbers.
+* Create the "Extra UE goods purchases" and add a tax mapping: purchase taxes (e.g. 22%) should be mapped to
+  to no one tax. In this way, every purchase invoice for extra UE fiscal position
+  don't show taxes in lines, according to law.
+* A virtual supplier (e.g. "Customs" or "Dogana") for the bill of entry.
+* The forwarder as a real supplier.
+
+Optional settings:
+
+* An expense account where recording the bill of entry net amount (e.g. "ACQUISTO MERCI ExtraUE").
+* An expense account where recording the bill of entry VAT amount,
+  paid in advance by the forwarder and declared in the forwarder invoice (e.g. "SPESE DOGANALI ANTICIPATE").
+* An account tax, with the same VAT rate as the ordinary one (i.e. 22% for Italy),
+  applied on the bill of entry net amount (e.g. "22% debito ExtraUE"). In this way,
+  bill of entries are highlighted in VAT registries due to this tax code.
+* An account for delivery expenses, recorded in the forwarder invoice (e.g. "SPESE DI TRASPORTO").
+* An account for customs duties, recorded in the forwarder invoice (e.g. "DIRITTI DOGANALI").
+* An account for stamp duties, recorded in the forwarder invoice (e.g. "IMPOSTE DI BOLLO").
+
+Italiano
+--------
+
+Impostazioni obbligatorie:
+
+* Un registro utilizzato per la registrazione di giroconto (ad es. "Bolle Doganali" o "Varie") da impostare in configurazione contabilità.
+* Un imposta con aliquota standard da applicare alla bolla doganale (ad es. "22% debito ExtraUE") da impostare in configurazione contabilità.
+  In questo modo questa imposta viene evidenziata nei registri IVA.
+* Un fornitore "Dogana" per le bolle doganali, da impostare in configurazione contabilità.
+* Un registro per le fatture dei fornitori extra UE, distinto da quello delle fatture passive ordinarie.
+  In questo modo, le fatture dei fornitori extra non appariranno nei registri IVA ed i registri IVA non avranno numeri mancanti.
+* Una posizione fiscale "Acquisti beni extra UE" e aggiungere la mappatura: l'imposta d'acquisto (ad es. 22%) deve essere mappata a nessuna imposta.
+  In questo modo, ogni fattura passive per questa posizione fiscale non avrà imposte sulle righe.
+* Il fornitore spedizioniere
+
+Impostazioni opzionali:
+
+* Un conto di costo dove registrare l'importo netto della bolla doganale (ad es. "ACQUISTO MERCI ExtraUE"),
+  da associare eventualmente ai prodotti acquistati extra UE
+* Un conto di costo dove registrare l'importo dell'IVA della bolla doganale,
+  pagata in anticipo dello spedizioniere e evidenziata nella fattura dello spedizioniere (ad es. "SPESE DOGANALI ANTICIPATE").
+* Un conto per le spese di consegna, registrate nella fattura spedizioniere (ad es. "SPESE DI TRASPORTO")
+* Un conto per i diritti doganali, registrati nella fattura spedizioniere (ad es. "DIRITTI DOGANALI")
+* Un conto per le imposte di bollo, registrate nella fattura spedizioniere (ad es. "IMPOSTE DI BOLLO")
diff --git a/l10n_it_bill_of_entry/readme/CONTRIBUTORS.rst b/l10n_it_bill_of_entry/readme/CONTRIBUTORS.rst
new file mode 100644
index 000000000000..f76cc6ca25f7
--- /dev/null
+++ b/l10n_it_bill_of_entry/readme/CONTRIBUTORS.rst
@@ -0,0 +1,6 @@
+* Alex Comba <alex.comba@agilebg.com>
+* `TAKOBI <https://takobi.online>`_:
+
+  * Lorenzo Battistini
+
+* Diego Bruselli <d.bruselli@creativiquadrati.it>
diff --git a/l10n_it_bill_of_entry/readme/DESCRIPTION.rst b/l10n_it_bill_of_entry/readme/DESCRIPTION.rst
new file mode 100644
index 000000000000..9e03bcfb786c
--- /dev/null
+++ b/l10n_it_bill_of_entry/readme/DESCRIPTION.rst
@@ -0,0 +1,8 @@
+This module enables to manage extraUE import purchases, generating a bill of entry
+according to the supplier invoice.
+
+It involves three documents:
+
+* Supplier Invoice
+* Forwarder Invoice
+* Bill of Entry
diff --git a/l10n_it_bill_of_entry/readme/USAGE.rst b/l10n_it_bill_of_entry/readme/USAGE.rst
new file mode 100644
index 000000000000..09453382c6d9
--- /dev/null
+++ b/l10n_it_bill_of_entry/readme/USAGE.rst
@@ -0,0 +1,21 @@
+English
+-------
+
+From supplier invoice it is possible to generate the bill of entry.
+
+The forwarder invoice requires one (or more) line(s) marked as the
+advance customs vat.
+
+At the forwarder invoice confirmation, it will be linked to the closing
+transfer account move, which closes and reconciles the bill of entry.
+
+Italiano
+--------
+
+Dalla fattura fornitore è possibile generare la bolla doganale.
+
+Nella fattura spedizioniere bisogna indicare quale (o quali) riga (righe)
+rappresenti(no) l'IVA anticipata alla dogana.
+
+Alla conferma della fattura spedizioniere, verrà generata la scrittura
+contabile di giroconto per chiudere la bolla doganale.
diff --git a/l10n_it_bill_of_entry/static/description/icon.png b/l10n_it_bill_of_entry/static/description/icon.png
deleted file mode 100644
index 3a0328b516c4980e8e44cdb63fd945757ddd132d..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 9455
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
Xviia!U7SGha1wx#SCgwmn*{w2TRX*I

diff --git a/l10n_it_bill_of_entry/static/src/css/l10n_it_bill_of_entry.css b/l10n_it_bill_of_entry/static/src/css/l10n_it_bill_of_entry.css
deleted file mode 100644
index 832e7a8aff63..000000000000
--- a/l10n_it_bill_of_entry/static/src/css/l10n_it_bill_of_entry.css
+++ /dev/null
@@ -1,32 +0,0 @@
-table {border: 0px;}
-thead {background: #F5F5F5;}
-
-
-.left_with_line {
-    text-align:left; vertical-align:text-top; border-top:1px solid #A1A1A1; padding:5px;
-}
-.right_with_line {
-    text-align:right; vertical-align:text-top; border-top:1px solid #A1A1A1; padding:5px;
-}
-.left_without_line {
-    text-align:left; vertical-align:text-top; padding:5px;
-}
-.right_without_line {
-    text-align:right; vertical-align:text-top; padding:5px;
-}
-.left_with_line_bottom {
-    text-align:left; vertical-align:text-top; border-bottom:1px solid #A1A1A1; padding:5px;
-}
-.right_with_line_bottom {
-    text-align:right; vertical-align:text-top; border-bottom:1px solid #A1A1A1; padding:5px;
-}
-.left_without_line_bold {
-    text-align:left; vertical-align:text-top; padding:5px; font-weight: bold;
-}
-.right_without_line_bold {
-    text-align:right; vertical-align:text-top; padding:5px; font-weight: bold;
-}
-
-.first_th_row {
-    border-style:solid;border-width:1px;border-color:#A1A1A1; background: #fff;
-}
\ No newline at end of file
diff --git a/l10n_it_bill_of_entry/tests/test_bill_of_entry.py b/l10n_it_bill_of_entry/tests/test_bill_of_entry.py
index e3e4e1fa564e..15578998cabe 100644
--- a/l10n_it_bill_of_entry/tests/test_bill_of_entry.py
+++ b/l10n_it_bill_of_entry/tests/test_bill_of_entry.py
@@ -8,10 +8,10 @@
 #
 ##############################################################################
 
-from odoo.tests.common import SingleTransactionCase
+from odoo.tests.common import TransactionCase
 
 
-class TestBillOfEntry(SingleTransactionCase):
+class TestBillOfEntry(TransactionCase):
 
     def _get_invline_vals(self, product, quantity=1., price_unit=1.):
         vals = {
@@ -24,7 +24,7 @@ def _get_invline_vals(self, product, quantity=1., price_unit=1.):
     def _create_invoice(self, partner, customs_doc_type, journal):
         vals = {
             'type': 'in_invoice',
-            'partner_id': partner.id
+            'partner_id': partner.id,
         }
         if customs_doc_type:
             vals['customs_doc_type'] = customs_doc_type
@@ -61,12 +61,6 @@ def setUp(self):
         self.fp_tax_model = self.env['account.fiscal.position.tax']
 
         # Default accounts for invoice line account_id
-        receivable_acctype_id = self.env.ref(
-            'account.data_account_type_receivable'
-        ).id
-        self.account_receivable = self.account_model.search(
-            [('user_type_id', '=', receivable_acctype_id)], limit=1
-        )
         revenue_acctype_id = self.env.ref(
             'account.data_account_type_revenue'
         ).id
@@ -85,10 +79,13 @@ def setUp(self):
         )
         # Bill of entry storno journal
         self.company = self.env.ref('base.main_company')
-        self.company.bill_of_entry_journal_id = self.journal_model.search(
-            [('type', '=', 'general')], limit=1
-        )
-        self.company.bill_of_entry_journal_id.update_posted = True
+        self.bill_of_entry_journal = self.journal_model.create({
+            'name': 'bill_of_entry_journal',
+            'type': 'general',
+            'code': 'BOE',
+            'update_posted': True
+        })
+        self.company.bill_of_entry_journal_id = self.bill_of_entry_journal.id
 
         # Extra EU fiscal position tax correspondence
         self.tax22 = self.tax_model.create({
@@ -108,38 +105,33 @@ def setUp(self):
 
         # Delivery Expense account
         self.account_delivery_expense = \
-            self.env.ref('l10n_it_bill_of_entry.'
-                         'account_account_delivery_expense')
+            self.env.ref('l10n_it_bill_of_entry.account_account_delivery_expense')
 
         # Extra EU purchase journal
         self.journal_extra = \
-            self.env.ref('l10n_it_bill_of_entry.'
-                         'account_journal_purchase_extraEU')
+            self.env.ref('l10n_it_bill_of_entry.account_journal_purchase_extraEU')
 
         # Products
-        self.product1 = self.env.ref('product.product_product_5b')
+        self.product1 = self.env.ref('product.product_delivery_01')
         self.product1.write({
             'supplier_taxes_id': [(6, 0, [self.tax22.id])],
         })
+        self.tax_22extraUE = self.env.ref('l10n_it_bill_of_entry.tax_22extraUE')
         self.product_extra = \
-            self.env.ref('l10n_it_bill_of_entry.'
-                         'product_product_extraEU_purchase')
+            self.env.ref('l10n_it_bill_of_entry.product_product_extraEU_purchase')
+        self.product_extra.supplier_taxes_id = [(6, 0, self.tax_22extraUE.ids)]
         self.adv_customs_expense = \
-            self.env.ref('l10n_it_bill_of_entry.'
-                         'product_product_adv_customs_expense')
+            self.env.ref('l10n_it_bill_of_entry.product_product_adv_customs_expense')
         self.customs_expense = \
-            self.env.ref('l10n_it_bill_of_entry.'
-                         'product_product_customs_expense')
+            self.env.ref('l10n_it_bill_of_entry.product_product_customs_expense')
         self.product_delivery = \
-            self.env.ref('l10n_it_bill_of_entry.'
-                         'product_product_delivery')
+            self.env.ref('l10n_it_bill_of_entry.product_product_delivery')
+        self.product_delivery.supplier_taxes_id = [(6, 0, [self.tax22.id])]
         self.product_stamp = \
-            self.env.ref('l10n_it_bill_of_entry.'
-                         'product_product_stamp_duties')
+            self.env.ref('l10n_it_bill_of_entry.product_product_stamp_duties')
 
         # Partners
-        self.customs = self.env.ref('l10n_it_bill_of_entry.'
-                                    'partner_customs')
+        self.customs = self.env.ref('l10n_it_bill_of_entry.partner_customs')
         self.supplier = self.env.ref('base.res_partner_1')
         self.supplier.property_account_position_id = \
             self.fiscpos_extra.id
@@ -149,7 +141,7 @@ def setUp(self):
         self.supplier_invoice = self._create_invoice(
             self.supplier, 'supplier_invoice', self.journal_extra
         )
-        line_vals = self._get_invline_vals(self.product1, 1., 2500.)
+        line_vals = self._get_invline_vals(self.product1, 1, 2500)
         self._create_invoice_line(self.supplier_invoice, line_vals)
         self.supplier_invoice.compute_taxes()
         # self.supplier_invoice.action_invoice_open()
@@ -158,7 +150,7 @@ def setUp(self):
         self.bill_of_entry = self._create_invoice(
             self.customs, 'bill_of_entry', self.journal
         )
-        line_vals = self._get_invline_vals(self.product_extra, 1., 2645.)
+        line_vals = self._get_invline_vals(self.product_extra, 1, 2500)
         self._create_invoice_line(self.bill_of_entry, line_vals)
         self.bill_of_entry.compute_taxes()
         self.bill_of_entry.write({
@@ -170,19 +162,16 @@ def setUp(self):
         self.forwarder_invoice = self._create_invoice(
             self.forwarder, 'forwarder_invoice', self.journal
         )
-        line_vals = self._get_invline_vals(self.product_delivery, 1., 300.)
+        line_vals = self._get_invline_vals(self.product_delivery, 1, 300)
         self._create_invoice_line(self.forwarder_invoice, line_vals)
         line_vals = self._get_invline_vals(
-            self.adv_customs_expense, 1., 581.9
+            self.adv_customs_expense, 1, 550
         )
         self.adv_customs_expense_line = self._create_invoice_line(
             self.forwarder_invoice, line_vals
         )
         self.adv_customs_expense_line.advance_customs_vat = True
-        line_vals = self._get_invline_vals(self.customs_expense, 1., 145.)
-        self._create_invoice_line(self.forwarder_invoice, line_vals)
-        line_vals = self._get_invline_vals(self.product_stamp, 1., 1.81)
-        self._create_invoice_line(self.forwarder_invoice, line_vals)
+        self.adv_customs_expense_line.invoice_line_tax_ids = [(6, 0, [])]
         self.forwarder_invoice.compute_taxes()
         self.forwarder_invoice.write({
             'forwarder_bill_of_entry_ids': [(4, self.bill_of_entry.id)],
@@ -240,10 +229,10 @@ def test_storno_create(self):
         # Storno - BoE reconciliation (supplier debit account)
         storno_reconcile_ids = storno.line_ids.filtered(
             lambda l: l.full_reconcile_id
-        ).mapped('full_reconcile_id.id')
+        ).mapped('full_reconcile_id').ids
         boe_reconcile_ids = self.bill_of_entry.move_id.line_ids.filtered(
             lambda l: l.full_reconcile_id
-        ).mapped('full_reconcile_id.id')
+        ).mapped('full_reconcile_id').ids
         self.assertEqual(
             sorted(storno_reconcile_ids),
             sorted(boe_reconcile_ids)
diff --git a/l10n_it_bill_of_entry/views/account_invoice_view.xml b/l10n_it_bill_of_entry/views/account_invoice_view.xml
index 2752e7740d3c..5b72d754aa8b 100644
--- a/l10n_it_bill_of_entry/views/account_invoice_view.xml
+++ b/l10n_it_bill_of_entry/views/account_invoice_view.xml
@@ -6,16 +6,42 @@
         <field name="model">account.invoice</field>
         <field name="inherit_id" ref="account.invoice_supplier_form"/>
         <field name="arch" type="xml">
+            <xpath expr="//sheet/div[1]" position="before">
+                <div class="oe_button_box" name="button_box">
+                    <button name="action_view_bill_of_entries"
+                        type="object"
+                        class="oe_stat_button"
+                        icon="fa-pencil-square-o"
+                        attrs="{'invisible': [('bill_of_entries_count', '=', 0)]}">
+                        <field name="bill_of_entries_count" widget="statinfo" string="Bill of entries"/>
+                    </button>
+                    <button name="action_view_extra_supplier_invoices"
+                        type="object"
+                        class="oe_stat_button"
+                        icon="fa-pencil-square-o"
+                        attrs="{'invisible': [('extra_supplier_invoices_count', '=', 0)]}">
+                        <field name="extra_supplier_invoices_count" widget="statinfo" string="Extra invoices"/>
+                    </button>
+                    <button name="action_view_forwarder_bill_of_entries"
+                        type="object"
+                        class="oe_stat_button"
+                        icon="fa-pencil-square-o"
+                        attrs="{'invisible': [('forwarder_bill_of_entries_count', '=', 0)]}">
+                        <field name="forwarder_bill_of_entries_count" widget="statinfo" string="Bill of entries"/>
+                    </button>
+                </div>
+            </xpath>
+            <xpath expr="//button[@name='action_invoice_draft']" position="after">
+                <button name="generate_bill_of_entry" class="oe_highlight"
+                        attrs="{'invisible': ['|', ('customs_doc_type', '!=', 'supplier_invoice'), ('bill_of_entries_count', '!=', 0)]}"
+                        string="Generate bill of entry" type="object" groups="account.group_account_invoice"/>
+            </xpath>
             <xpath expr="//field[@name='move_name']" position="after">
                 <field name="customs_doc_type"
-                    attrs="{'readonly': ['|',('state', '!=', 'draft'), ('forwarder_bill_of_entry_ids', '!=', [])]}"/>
+                    attrs="{'readonly': ['|',('state', '!=', 'draft'), ('forwarder_bill_of_entries_count', '!=', 0)]}"/>
             </xpath>
             <xpath expr="//notebook/page[2]" position="after">
-                <page string="Customs" name="customs" attrs="{'invisible': [('customs_doc_type','=', False)]}">
-                    <separator string="Bill of entries" name="boe_no_supplier" colspan="4"
-                        attrs="{'invisible': [('customs_doc_type','!=', 'supplier_invoice')]}"/>
-                    <field name="supplier_bill_of_entry_ids"
-                        attrs="{'invisible': [('customs_doc_type','!=', 'supplier_invoice')]}"/>
+                <page string="Customs" name="customs" attrs="{'invisible': [('customs_doc_type','not in', ['bill_of_entry', 'forwarder_invoice'])]}">
                     <separator string="Supplier invoices" name="supplier_invoices" colspan="4"
                         attrs="{'invisible': [('customs_doc_type','!=', 'bill_of_entry')]}"/>
                     <field name="supplier_invoice_ids"
@@ -28,10 +54,6 @@
                             domain="[('customs_doc_type','=', 'forwarder_invoice')]"
                             context="{'default_customs_doc_type': 'forwarder_invoice'}"/>
                     </group>
-                    <separator string="Bill of entries" name="boe_no_forwarder" colspan="4"
-                        attrs="{'invisible': [('customs_doc_type','!=', 'forwarder_invoice')]}"/>
-                    <field name="forwarder_bill_of_entry_ids"
-                        attrs="{'invisible': [('customs_doc_type','!=', 'forwarder_invoice')]}"/>
                     <group name="storno">
                         <field name="bill_of_entry_storno_id"
                             attrs="{'invisible': [('customs_doc_type','!=', 'forwarder_invoice')]}"/>
@@ -45,17 +67,4 @@
         </field>
     </record>
 
-    <record model="ir.ui.view" id="invoice_line_boe_form">
-        <field name="name">invoice.line.boe.form</field>
-        <field name="model">account.invoice.line</field>
-        <field name="inherit_id" ref="account.view_invoice_line_form"/>
-        <field name="arch" type="xml">
-            <field name="name" position="after">
-                <group name="advance_customs_vat">
-                    <field name="advance_customs_vat"/>
-                </group>
-            </field>
-        </field>
-    </record>
-
 </odoo>
diff --git a/l10n_it_bill_of_entry/views/company_view.xml b/l10n_it_bill_of_entry/views/company_view.xml
index 2a1dca8d547c..5d2d2440af3f 100644
--- a/l10n_it_bill_of_entry/views/company_view.xml
+++ b/l10n_it_bill_of_entry/views/company_view.xml
@@ -3,20 +3,36 @@
 
     <record id="view_boe_config_settings" model="ir.ui.view">
         <field name="name">view.boe.config.setting</field>
-        <field name="model">account.config.settings</field>
-        <field name="inherit_id" ref="account.view_account_config_settings"/>
+        <field name="model">res.config.settings</field>
+        <field name="inherit_id" ref="account.res_config_settings_view_form"/>
         <field name="arch" type="xml">
-            <xpath expr="//separator[@name='analytic_account']" position="before">
-                <separator name="bill_of_entry" string="Bill of entry"/>
-                <group name="Bill of entry">
-                    <label for="id" string="Configuration"/>
-                    <div>
-                        <div>
-                            <label for="bill_of_entry_journal_id"/>
-                            <field name="bill_of_entry_journal_id" class="oe_inline"/>
+            <xpath expr="//div[@id='analytic']" position="after">
+            <h2>Bill of entries</h2>
+                <div class="row mt16 o_settings_container" id="bill_of_entries_settings">
+                    <div class="col-12 col-lg-6 o_setting_box">
+                        <div class="o_setting_left_pane"/>
+                        <div class="o_setting_right_pane">
+                            <span class="fa fa-lg fa-building-o" title="Values set here are company-specific." aria-label="Values set here are company-specific." groups="base.group_multi_company" role="img"/>
+                            <div class="content-group">
+                                <div>
+                                    <label for="bill_of_entry_journal_id"/>
+                                    <div class="text-muted">Journal used for reconciliation of bill of entries</div>
+                                    <field name="bill_of_entry_journal_id" class="o_light_label" options="{'no_create': True}"/>
+                                </div>
+                                <div>
+                                    <label for="bill_of_entry_tax_id"/>
+                                    <div class="text-muted">Tax used in bill of entries generation, when product is not present</div>
+                                    <field name="bill_of_entry_tax_id" class="o_light_label" options="{'no_create': True}"/>
+                                </div>
+                                <div>
+                                    <label for="bill_of_entry_partner_id"/>
+                                    <div class="text-muted">Supplier used in bill of entries</div>
+                                    <field name="bill_of_entry_partner_id" class="o_light_label"/>
+                                </div>
+                            </div>
                         </div>
                     </div>
-                </group>
+                </div>
             </xpath>
         </field>
     </record>

From 4ebe8add7c3dfecd2d4388babf4dd1803682186d Mon Sep 17 00:00:00 2001
From: Mario Riva <mr@takobi.online>
Date: Wed, 24 Mar 2021 17:46:28 +0100
Subject: [PATCH 07/20] Update CONFIGURE.rst

---
 l10n_it_bill_of_entry/__manifest__.py      | 4 ++--
 l10n_it_bill_of_entry/readme/CONFIGURE.rst | 8 +++-----
 l10n_it_bill_of_entry/readme/USAGE.rst     | 6 ++----
 3 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/l10n_it_bill_of_entry/__manifest__.py b/l10n_it_bill_of_entry/__manifest__.py
index 74596aca9e81..b44bf953bfdf 100644
--- a/l10n_it_bill_of_entry/__manifest__.py
+++ b/l10n_it_bill_of_entry/__manifest__.py
@@ -15,8 +15,8 @@
     'name': 'ITA - Bolle doganali',
     'version': '12.0.1.0.0',
     'category': 'Localization/Italy',
-    'author': "Odoo Community Association (OCA), "
-              "Agile Business Group, CQ Creativi Quadrati",
+    'author': "Agile Business Group, CQ Creativi Quadrati, TAKOBI, "
+              "Odoo Community Association (OCA)",
     'website': "https://github.com/OCA/l10n-italy",
     'license': 'AGPL-3',
     'depends': [
diff --git a/l10n_it_bill_of_entry/readme/CONFIGURE.rst b/l10n_it_bill_of_entry/readme/CONFIGURE.rst
index 0e37a7e72307..b4417a8bce3c 100644
--- a/l10n_it_bill_of_entry/readme/CONFIGURE.rst
+++ b/l10n_it_bill_of_entry/readme/CONFIGURE.rst
@@ -1,5 +1,4 @@
-English
--------
+**English**
 
 Mandatory settings:
 
@@ -25,13 +24,12 @@ Optional settings:
 * An account for customs duties, recorded in the forwarder invoice (e.g. "DIRITTI DOGANALI").
 * An account for stamp duties, recorded in the forwarder invoice (e.g. "IMPOSTE DI BOLLO").
 
-Italiano
---------
+**Italiano**
 
 Impostazioni obbligatorie:
 
 * Un registro utilizzato per la registrazione di giroconto (ad es. "Bolle Doganali" o "Varie") da impostare in configurazione contabilità.
-* Un imposta con aliquota standard da applicare alla bolla doganale (ad es. "22% debito ExtraUE") da impostare in configurazione contabilità.
+* Un imposta con aliquota standard da applicare alla bolla doganale (ad es. "22% credito ExtraUE") da impostare in configurazione contabilità.
   In questo modo questa imposta viene evidenziata nei registri IVA.
 * Un fornitore "Dogana" per le bolle doganali, da impostare in configurazione contabilità.
 * Un registro per le fatture dei fornitori extra UE, distinto da quello delle fatture passive ordinarie.
diff --git a/l10n_it_bill_of_entry/readme/USAGE.rst b/l10n_it_bill_of_entry/readme/USAGE.rst
index 09453382c6d9..afef7d8c903f 100644
--- a/l10n_it_bill_of_entry/readme/USAGE.rst
+++ b/l10n_it_bill_of_entry/readme/USAGE.rst
@@ -1,5 +1,4 @@
-English
--------
+**English**
 
 From supplier invoice it is possible to generate the bill of entry.
 
@@ -9,8 +8,7 @@ advance customs vat.
 At the forwarder invoice confirmation, it will be linked to the closing
 transfer account move, which closes and reconciles the bill of entry.
 
-Italiano
---------
+**Italiano**
 
 Dalla fattura fornitore è possibile generare la bolla doganale.
 

From 3fe17c74f5460497c2556d97e93b0de081684192 Mon Sep 17 00:00:00 2001
From: eLBati <lb@takobi.online>
Date: Fri, 28 Jan 2022 14:58:39 +0100
Subject: [PATCH 08/20] 3 menu for 3 customs doc types

---
 l10n_it_bill_of_entry/i18n/it.po              | 21 +++++-
 .../views/account_invoice_view.xml            | 69 +++++++++++++++++++
 2 files changed, 87 insertions(+), 3 deletions(-)

diff --git a/l10n_it_bill_of_entry/i18n/it.po b/l10n_it_bill_of_entry/i18n/it.po
index 3ea3f9aa0f70..b7f87f1fe2a7 100644
--- a/l10n_it_bill_of_entry/i18n/it.po
+++ b/l10n_it_bill_of_entry/i18n/it.po
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 12.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-02-10 17:32+0000\n"
-"PO-Revision-Date: 2021-02-10 17:32+0000\n"
+"POT-Creation-Date: 2022-01-28 13:54+0000\n"
+"PO-Revision-Date: 2022-01-28 13:54+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -18,7 +18,7 @@ msgstr ""
 #. module: l10n_it_bill_of_entry
 #: model_terms:ir.ui.view,arch_db:l10n_it_bill_of_entry.view_boe_config_settings
 msgid "<span class=\"fa fa-lg fa-building-o\" title=\"Values set here are company-specific.\" aria-label=\"Values set here are company-specific.\" groups=\"base.group_multi_company\" role=\"img\"/>"
-msgstr "<span class=\"fa fa-lg fa-building-o\" title=\"I valori impostati qui sono specifici per azienda.\" aria-label=\"Values set here are company-specific.\" groups=\"base.group_multi_company\" role=\"img\"/>"
+msgstr "<span class=\"fa fa-lg fa-building-o\" title=\"I valori impostati qui sono specifici per azienda.\" aria-label=\"I valori impostati qui sono specifici per azienda.\" groups=\"base.group_multi_company\" role=\"img\"/>"
 
 #. module: l10n_it_bill_of_entry
 #: model:ir.model.fields,field_description:l10n_it_bill_of_entry.field_account_invoice_line__advance_customs_vat
@@ -75,6 +75,12 @@ msgstr "Partner bolla doganale"
 msgid "Bill of entry tax"
 msgstr "Imposta bolla doganale"
 
+#. module: l10n_it_bill_of_entry
+#: model:ir.actions.act_window,name:l10n_it_bill_of_entry.action_bill_of_entry
+#: model:ir.ui.menu,name:l10n_it_bill_of_entry.menu_action_bill_of_entry
+msgid "Bills of entry"
+msgstr "Bolle doganali"
+
 #. module: l10n_it_bill_of_entry
 #: code:addons/l10n_it_bill_of_entry/models/account_invoice.py:166
 #, python-format
@@ -92,6 +98,7 @@ msgid "Config Settings"
 msgstr "Impostazioni di configurazione"
 
 #. module: l10n_it_bill_of_entry
+#: model:ir.ui.menu,name:l10n_it_bill_of_entry.customs
 #: model_terms:ir.ui.view,arch_db:l10n_it_bill_of_entry.invoice_supplier_boe_form
 msgid "Customs"
 msgstr "Dogana"
@@ -147,6 +154,12 @@ msgstr "Fattura spedizioniere"
 msgid "Forwarder invoice %s does not have lines with 'Advance Customs Vat'"
 msgstr "La fattura spedizioniere %s non ha righe con 'IVA dogana anticipata'"
 
+#. module: l10n_it_bill_of_entry
+#: model:ir.actions.act_window,name:l10n_it_bill_of_entry.action_forwarder_invoice
+#: model:ir.ui.menu,name:l10n_it_bill_of_entry.menu_action_forwarder_invoice
+msgid "Forwarder invoices"
+msgstr "Fatture spedizionieri"
+
 #. module: l10n_it_bill_of_entry
 #: model_terms:ir.ui.view,arch_db:l10n_it_bill_of_entry.invoice_supplier_boe_form
 msgid "Generate bill of entry"
@@ -203,6 +216,8 @@ msgid "Supplier Invoices"
 msgstr "Fatture fornitore"
 
 #. module: l10n_it_bill_of_entry
+#: model:ir.actions.act_window,name:l10n_it_bill_of_entry.action_supplier_invoice
+#: model:ir.ui.menu,name:l10n_it_bill_of_entry.menu_action_supplier_invoice
 #: model_terms:ir.ui.view,arch_db:l10n_it_bill_of_entry.invoice_supplier_boe_form
 msgid "Supplier invoices"
 msgstr "Fatture fornitore"
diff --git a/l10n_it_bill_of_entry/views/account_invoice_view.xml b/l10n_it_bill_of_entry/views/account_invoice_view.xml
index 5b72d754aa8b..0a607ea9ad79 100644
--- a/l10n_it_bill_of_entry/views/account_invoice_view.xml
+++ b/l10n_it_bill_of_entry/views/account_invoice_view.xml
@@ -67,4 +67,73 @@
         </field>
     </record>
 
+    <menuitem id="customs" name="Customs"
+          sequence="99" parent="account.menu_finance_payables"/>
+
+    <record id="action_supplier_invoice" model="ir.actions.act_window">
+        <field name="name">Supplier invoices</field>
+        <field name="res_model">account.invoice</field>
+        <field name="view_type">form</field>
+        <field name="view_mode">tree,kanban,form,calendar,pivot,graph,activity</field>
+        <field name="domain">[('type','=','in_invoice'), ('customs_doc_type', '=', 'supplier_invoice')]</field>
+        <field name="context">{'default_type': 'in_invoice', 'type': 'in_invoice', 'journal_type': 'purchase', 'default_customs_doc_type': 'supplier_invoice'}</field>
+    </record>
+    <record id="action_supplier_invoice_view1" model="ir.actions.act_window.view">
+        <field eval="1" name="sequence"/>
+        <field name="view_mode">tree</field>
+        <field name="view_id" ref="account.invoice_supplier_tree"/>
+        <field name="act_window_id" ref="action_supplier_invoice"/>
+    </record>
+    <record id="action_supplier_invoice_view2" model="ir.actions.act_window.view">
+        <field eval="2" name="sequence"/>
+        <field name="view_mode">form</field>
+        <field name="view_id" ref="account.invoice_supplier_form"/>
+        <field name="act_window_id" ref="action_supplier_invoice"/>
+    </record>
+    <menuitem action="action_supplier_invoice" id="menu_action_supplier_invoice" parent="customs"/>
+
+    <record id="action_bill_of_entry" model="ir.actions.act_window">
+        <field name="name">Bills of entry</field>
+        <field name="res_model">account.invoice</field>
+        <field name="view_type">form</field>
+        <field name="view_mode">tree,kanban,form,calendar,pivot,graph,activity</field>
+        <field name="domain">[('type','=','in_invoice'), ('customs_doc_type', '=', 'bill_of_entry')]</field>
+        <field name="context">{'default_type': 'in_invoice', 'type': 'in_invoice', 'journal_type': 'purchase', 'default_customs_doc_type': 'bill_of_entry'}</field>
+    </record>
+    <record id="action_bill_of_entry_view1" model="ir.actions.act_window.view">
+        <field eval="1" name="sequence"/>
+        <field name="view_mode">tree</field>
+        <field name="view_id" ref="account.invoice_supplier_tree"/>
+        <field name="act_window_id" ref="action_bill_of_entry"/>
+    </record>
+    <record id="action_bill_of_entry_view2" model="ir.actions.act_window.view">
+        <field eval="2" name="sequence"/>
+        <field name="view_mode">form</field>
+        <field name="view_id" ref="account.invoice_supplier_form"/>
+        <field name="act_window_id" ref="action_bill_of_entry"/>
+    </record>
+    <menuitem action="action_bill_of_entry" id="menu_action_bill_of_entry" parent="customs"/>
+
+    <record id="action_forwarder_invoice" model="ir.actions.act_window">
+        <field name="name">Forwarder invoices</field>
+        <field name="res_model">account.invoice</field>
+        <field name="view_type">form</field>
+        <field name="view_mode">tree,kanban,form,calendar,pivot,graph,activity</field>
+        <field name="domain">[('type','=','in_invoice'), ('customs_doc_type', '=', 'forwarder_invoice')]</field>
+        <field name="context">{'default_type': 'in_invoice', 'type': 'in_invoice', 'journal_type': 'purchase', 'default_customs_doc_type': 'forwarder_invoice'}</field>
+    </record>
+    <record id="action_forwarder_invoice_view1" model="ir.actions.act_window.view">
+        <field eval="1" name="sequence"/>
+        <field name="view_mode">tree</field>
+        <field name="view_id" ref="account.invoice_supplier_tree"/>
+        <field name="act_window_id" ref="action_forwarder_invoice"/>
+    </record>
+    <record id="action_forwarder_invoice_view2" model="ir.actions.act_window.view">
+        <field eval="2" name="sequence"/>
+        <field name="view_mode">form</field>
+        <field name="view_id" ref="account.invoice_supplier_form"/>
+        <field name="act_window_id" ref="action_forwarder_invoice"/>
+    </record>
+    <menuitem action="action_forwarder_invoice" id="menu_action_forwarder_invoice" parent="customs"/>
+
 </odoo>

From 644953003f0f8bc1bc820cdd237c053cb382b4b8 Mon Sep 17 00:00:00 2001
From: eLBati <lb@takobi.online>
Date: Fri, 28 Jan 2022 15:00:11 +0100
Subject: [PATCH 09/20] Do not copy fields that should not be copied

---
 l10n_it_bill_of_entry/models/account_invoice.py | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/l10n_it_bill_of_entry/models/account_invoice.py b/l10n_it_bill_of_entry/models/account_invoice.py
index b105ff9b2a14..053fa3e6dc31 100644
--- a/l10n_it_bill_of_entry/models/account_invoice.py
+++ b/l10n_it_bill_of_entry/models/account_invoice.py
@@ -13,17 +13,17 @@ class AccountInvoice(models.Model):
     ], 'Customs Doc Type', readonly=True)
     supplier_bill_of_entry_ids = fields.Many2many(
         'account.invoice', 'sboe_invoice_rel', 'sboe_id', 'invoice_id',
-        'Supplier Bill of Entries', readonly=True)
+        'Supplier Bill of Entries', readonly=True, copy=False)
     supplier_invoice_ids = fields.Many2many(
         'account.invoice', 'sboe_invoice_rel', 'invoice_id', 'sboe_id',
-        'Supplier Invoices')
+        'Supplier Invoices', copy=False)
     forwarder_invoice_id = fields.Many2one(
-        'account.invoice', 'Forwarder Invoice')
+        'account.invoice', 'Forwarder Invoice', copy=False)
     forwarder_bill_of_entry_ids = fields.One2many(
         'account.invoice', 'forwarder_invoice_id',
-        'Forward Bill of Entries', readonly=True)
+        'Forward Bill of Entries', readonly=True, copy=False)
     bill_of_entry_storno_id = fields.Many2one(
-        'account.move', 'Bill of Entry Storno', readonly=True)
+        'account.move', 'Bill of Entry Storno', readonly=True, copy=False)
     bill_of_entries_count = fields.Integer(
         "Bill of entries number", compute="_compute_bill_of_entries_count")
     extra_supplier_invoices_count = fields.Integer(

From 5be63e7fe1c667b54c57dee37454c841b3c3f804 Mon Sep 17 00:00:00 2001
From: eLBati <lb@takobi.online>
Date: Fri, 28 Jan 2022 15:09:40 +0100
Subject: [PATCH 10/20] Only draft forwarder invoices should be linked,
 validated invoices already generated storno

---
 l10n_it_bill_of_entry/views/account_invoice_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/l10n_it_bill_of_entry/views/account_invoice_view.xml b/l10n_it_bill_of_entry/views/account_invoice_view.xml
index 0a607ea9ad79..02f08d699b01 100644
--- a/l10n_it_bill_of_entry/views/account_invoice_view.xml
+++ b/l10n_it_bill_of_entry/views/account_invoice_view.xml
@@ -51,7 +51,7 @@
                     <group name="forwarder_invoice">
                         <field name="forwarder_invoice_id"
                             attrs="{'invisible': [('customs_doc_type','!=', 'bill_of_entry')]}"
-                            domain="[('customs_doc_type','=', 'forwarder_invoice')]"
+                            domain="[('customs_doc_type','=', 'forwarder_invoice'), ('state', '=', 'draft')]"
                             context="{'default_customs_doc_type': 'forwarder_invoice'}"/>
                     </group>
                     <group name="storno">

From 6f81971045ec77389b902e747959a7b03c45c7bc Mon Sep 17 00:00:00 2001
From: eLBati <lb@takobi.online>
Date: Thu, 3 Feb 2022 11:21:44 +0100
Subject: [PATCH 11/20] in caso di dichiarazione d'intento inviata alla dogana,
 la dogana non addebita IVA

---
 l10n_it_bill_of_entry/i18n/it.po              | 32 +++++++++++--------
 .../models/account_invoice.py                 | 28 ++++++++++++----
 2 files changed, 41 insertions(+), 19 deletions(-)

diff --git a/l10n_it_bill_of_entry/i18n/it.po b/l10n_it_bill_of_entry/i18n/it.po
index b7f87f1fe2a7..b80ff5b4115e 100644
--- a/l10n_it_bill_of_entry/i18n/it.po
+++ b/l10n_it_bill_of_entry/i18n/it.po
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 12.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-01-28 13:54+0000\n"
-"PO-Revision-Date: 2022-01-28 13:54+0000\n"
+"POT-Creation-Date: 2022-02-03 10:17+0000\n"
+"PO-Revision-Date: 2022-02-03 10:17+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -52,7 +52,7 @@ msgid "Bill of entries number"
 msgstr "Numero bolle doganali"
 
 #. module: l10n_it_bill_of_entry
-#: code:addons/l10n_it_bill_of_entry/models/account_invoice.py:115
+#: code:addons/l10n_it_bill_of_entry/models/account_invoice.py:117
 #, python-format
 msgid "Bill of entry %s is in state %s"
 msgstr "La bolla doganale %s è nello stato %s"
@@ -82,7 +82,7 @@ msgid "Bills of entry"
 msgstr "Bolle doganali"
 
 #. module: l10n_it_bill_of_entry
-#: code:addons/l10n_it_bill_of_entry/models/account_invoice.py:166
+#: code:addons/l10n_it_bill_of_entry/models/account_invoice.py:171
 #, python-format
 msgid "Can't handle more than 1 tax for line %s"
 msgstr "Impossibile gestire più di 1 imposta per la riga %s"
@@ -109,25 +109,25 @@ msgid "Customs Doc Type"
 msgstr "Tipo doc Dogana"
 
 #. module: l10n_it_bill_of_entry
-#: code:addons/l10n_it_bill_of_entry/models/account_invoice.py:144
+#: code:addons/l10n_it_bill_of_entry/models/account_invoice.py:149
 #, python-format
 msgid "Customs expenses"
 msgstr "Spese dogana"
 
 #. module: l10n_it_bill_of_entry
-#: code:addons/l10n_it_bill_of_entry/models/account_invoice.py:155
+#: code:addons/l10n_it_bill_of_entry/models/account_invoice.py:160
 #, python-format
 msgid "Customs supplier"
 msgstr "Fornitore dogana"
 
 #. module: l10n_it_bill_of_entry
-#: code:addons/l10n_it_bill_of_entry/models/account_invoice.py:170
+#: code:addons/l10n_it_bill_of_entry/models/account_invoice.py:175
 #, python-format
 msgid "Extra UE expenses"
 msgstr "Spese extra UE"
 
 #. module: l10n_it_bill_of_entry
-#: code:addons/l10n_it_bill_of_entry/models/account_invoice.py:220
+#: code:addons/l10n_it_bill_of_entry/models/account_invoice.py:225
 #, python-format
 msgid "Extra UE supplier invoice must have no taxes"
 msgstr "La fattura del fornitore extra UE non deve avere imposte"
@@ -149,7 +149,7 @@ msgid "Forwarder Invoice"
 msgstr "Fattura spedizioniere"
 
 #. module: l10n_it_bill_of_entry
-#: code:addons/l10n_it_bill_of_entry/models/account_invoice.py:128
+#: code:addons/l10n_it_bill_of_entry/models/account_invoice.py:133
 #, python-format
 msgid "Forwarder invoice %s does not have lines with 'Advance Customs Vat'"
 msgstr "La fattura spedizioniere %s non ha righe con 'IVA dogana anticipata'"
@@ -183,19 +183,25 @@ msgid "Journal used for reconciliation of bill of entries"
 msgstr "Registro usato per la riconciliazione delle bolle doganali"
 
 #. module: l10n_it_bill_of_entry
-#: code:addons/l10n_it_bill_of_entry/models/account_invoice.py:133
+#: code:addons/l10n_it_bill_of_entry/models/account_invoice.py:138
 #, python-format
 msgid "No Bill of entry Storno journal configured"
 msgstr "Nessun registro per storno della bolla doganale configurato"
 
 #. module: l10n_it_bill_of_entry
-#: code:addons/l10n_it_bill_of_entry/models/account_invoice.py:231
+#: code:addons/l10n_it_bill_of_entry/models/account_invoice.py:113
+#, python-format
+msgid "No bill of entries found for this invoice"
+msgstr "Nessuna bolla doganale trovata per questa fattura"
+
+#. module: l10n_it_bill_of_entry
+#: code:addons/l10n_it_bill_of_entry/models/account_invoice.py:236
 #, python-format
 msgid "Please set 'Bill of entry partner' in accounting configuration"
 msgstr "Prego impostare 'Partner dogana' in configurazione contabilità"
 
 #. module: l10n_it_bill_of_entry
-#: code:addons/l10n_it_bill_of_entry/models/account_invoice.py:228
+#: code:addons/l10n_it_bill_of_entry/models/account_invoice.py:233
 #, python-format
 msgid "Please set 'Bill of entry tax' in accounting configuration"
 msgstr "Prego impostare 'Imposta dogana'"
@@ -250,7 +256,7 @@ msgid "Tax used in bill of entries, when product is not present"
 msgstr "Imposta usata nelle bolle doganali, quando il prodotto non è presente"
 
 #. module: l10n_it_bill_of_entry
-#: code:addons/l10n_it_bill_of_entry/models/account_invoice.py:225
+#: code:addons/l10n_it_bill_of_entry/models/account_invoice.py:230
 #, python-format
 msgid "You can generate bill of entry from extra UE supplier invoice only"
 msgstr "È possibile generare la bolla doganale solamente da una fattura fornitore extra UE"
diff --git a/l10n_it_bill_of_entry/models/account_invoice.py b/l10n_it_bill_of_entry/models/account_invoice.py
index 053fa3e6dc31..3dfa99ea0a05 100644
--- a/l10n_it_bill_of_entry/models/account_invoice.py
+++ b/l10n_it_bill_of_entry/models/account_invoice.py
@@ -109,6 +109,8 @@ def action_move_create(self):
         AccountMoveLine = self.env['account.move.line']
         for invoice in self:
             if invoice.customs_doc_type == 'forwarder_invoice':
+                if not invoice.forwarder_bill_of_entry_ids:
+                    raise UserError(_("No bill of entries found for this invoice"))
                 for bill_of_entry in invoice.forwarder_bill_of_entry_ids:
                     if bill_of_entry.state not in ('open', 'paid'):
                         raise UserError(
@@ -118,12 +120,26 @@ def action_move_create(self):
                                 bill_of_entry.state)
                         )
                 advance_customs_vat_line = False
-                if invoice.forwarder_bill_of_entry_ids:
-                    for line in invoice.invoice_line_ids:
-                        if line.advance_customs_vat:
-                            advance_customs_vat_line = True
-                            break
-                if not advance_customs_vat_line:
+                for line in invoice.invoice_line_ids:
+                    if line.advance_customs_vat:
+                        advance_customs_vat_line = True
+                        break
+                boe_tax_rates = invoice.forwarder_bill_of_entry_ids.mapped(
+                    "invoice_line_ids.invoice_line_tax_ids.amount")
+                boe_amounts = invoice.forwarder_bill_of_entry_ids.mapped(
+                    "amount_total")
+
+                # In caso di dichiarazione d'intento inviata alla dogana,
+                # la dogana non addebita IVA.
+                # La bolla doganale ha righe positive e negative, il cui totale è 0
+                if list(set(boe_amounts)) == [0.0]:
+                    # Nessuna registrazione di storno è necessaria
+                    continue
+
+                if (
+                    not advance_customs_vat_line
+                    and list(set(boe_tax_rates)) != [0.0]
+                ):
                     raise UserError(
                         _("Forwarder invoice %s does not have lines with "
                           "'Advance Customs Vat'")

From 9916067c82f53c1985bb3985eb90dad174c09e40 Mon Sep 17 00:00:00 2001
From: eLBati <lb@takobi.online>
Date: Thu, 3 Feb 2022 11:32:43 +0100
Subject: [PATCH 12/20] advance_customs_vat only valid for forwarder invoices

---
 l10n_it_bill_of_entry/views/account_invoice_view.xml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/l10n_it_bill_of_entry/views/account_invoice_view.xml b/l10n_it_bill_of_entry/views/account_invoice_view.xml
index 02f08d699b01..942bec9a9a64 100644
--- a/l10n_it_bill_of_entry/views/account_invoice_view.xml
+++ b/l10n_it_bill_of_entry/views/account_invoice_view.xml
@@ -61,8 +61,7 @@
                 </page>
             </xpath>
             <xpath expr="//notebook/page[1]/field[@name='invoice_line_ids']/tree/field[@name='price_subtotal']" position="after">
-                <!--It seems attrs doesn't work -->
-                <field name="advance_customs_vat"/>
+                <field name="advance_customs_vat" attrs="{'column_invisible': [('parent.customs_doc_type', '!=', 'forwarder_invoice')]}"/>
             </xpath>
         </field>
     </record>

From 8ddbcf9745245a54576664ec5591d42f935a2109 Mon Sep 17 00:00:00 2001
From: oca-travis <oca+oca-travis@odoo-community.org>
Date: Wed, 20 Jul 2022 10:10:17 +0000
Subject: [PATCH 13/20] [UPD] Update l10n_it_bill_of_entry.pot

---
 l10n_it_bill_of_entry/i18n/it.po              | 102 +++++-
 .../i18n/l10n_it_bill_of_entry.pot            | 319 ++++++++++++++++++
 2 files changed, 405 insertions(+), 16 deletions(-)
 create mode 100644 l10n_it_bill_of_entry/i18n/l10n_it_bill_of_entry.pot

diff --git a/l10n_it_bill_of_entry/i18n/it.po b/l10n_it_bill_of_entry/i18n/it.po
index b80ff5b4115e..b451b025131f 100644
--- a/l10n_it_bill_of_entry/i18n/it.po
+++ b/l10n_it_bill_of_entry/i18n/it.po
@@ -1,6 +1,6 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
-#	* l10n_it_bill_of_entry
+# 	* l10n_it_bill_of_entry
 #
 msgid ""
 msgstr ""
@@ -10,6 +10,7 @@ msgstr ""
 "PO-Revision-Date: 2022-02-03 10:17+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: \n"
@@ -17,8 +18,21 @@ msgstr ""
 
 #. module: l10n_it_bill_of_entry
 #: model_terms:ir.ui.view,arch_db:l10n_it_bill_of_entry.view_boe_config_settings
-msgid "<span class=\"fa fa-lg fa-building-o\" title=\"Values set here are company-specific.\" aria-label=\"Values set here are company-specific.\" groups=\"base.group_multi_company\" role=\"img\"/>"
-msgstr "<span class=\"fa fa-lg fa-building-o\" title=\"I valori impostati qui sono specifici per azienda.\" aria-label=\"I valori impostati qui sono specifici per azienda.\" groups=\"base.group_multi_company\" role=\"img\"/>"
+msgid ""
+"<span class=\"fa fa-lg fa-building-o\" title=\"Values set here are company-"
+"specific.\" aria-label=\"Values set here are company-specific.\" groups="
+"\"base.group_multi_company\" role=\"img\"/>"
+msgstr ""
+"<span class=\"fa fa-lg fa-building-o\" title=\"I valori impostati qui sono "
+"specifici per azienda.\" aria-label=\"I valori impostati qui sono specifici "
+"per azienda.\" groups=\"base.group_multi_company\" role=\"img\"/>"
+
+#. module: l10n_it_bill_of_entry
+#: model:product.product,name:l10n_it_bill_of_entry.product_product_adv_customs_expense
+#: model:product.template,name:l10n_it_bill_of_entry.product_product_adv_customs_expense_product_template
+#, fuzzy
+msgid "Advance Customs Expense"
+msgstr "IVA dogana anticipata"
 
 #. module: l10n_it_bill_of_entry
 #: model:ir.model.fields,field_description:l10n_it_bill_of_entry.field_account_invoice_line__advance_customs_vat
@@ -82,7 +96,7 @@ msgid "Bills of entry"
 msgstr "Bolle doganali"
 
 #. module: l10n_it_bill_of_entry
-#: code:addons/l10n_it_bill_of_entry/models/account_invoice.py:171
+#: code:addons/l10n_it_bill_of_entry/models/account_invoice.py:182
 #, python-format
 msgid "Can't handle more than 1 tax for line %s"
 msgstr "Impossibile gestire più di 1 imposta per la riga %s"
@@ -109,25 +123,38 @@ msgid "Customs Doc Type"
 msgstr "Tipo doc Dogana"
 
 #. module: l10n_it_bill_of_entry
-#: code:addons/l10n_it_bill_of_entry/models/account_invoice.py:149
+#: model:product.product,name:l10n_it_bill_of_entry.product_product_customs_expense
+#: model:product.template,name:l10n_it_bill_of_entry.product_product_customs_expense_product_template
+#, fuzzy
+msgid "Customs Expense"
+msgstr "Spese dogana"
+
+#. module: l10n_it_bill_of_entry
+#: code:addons/l10n_it_bill_of_entry/models/account_invoice.py:160
 #, python-format
 msgid "Customs expenses"
 msgstr "Spese dogana"
 
 #. module: l10n_it_bill_of_entry
-#: code:addons/l10n_it_bill_of_entry/models/account_invoice.py:160
+#: code:addons/l10n_it_bill_of_entry/models/account_invoice.py:171
 #, python-format
 msgid "Customs supplier"
 msgstr "Fornitore dogana"
 
 #. module: l10n_it_bill_of_entry
-#: code:addons/l10n_it_bill_of_entry/models/account_invoice.py:175
+#: model:product.product,name:l10n_it_bill_of_entry.product_product_delivery
+#: model:product.template,name:l10n_it_bill_of_entry.product_product_delivery_product_template
+msgid "Delivery Expense"
+msgstr ""
+
+#. module: l10n_it_bill_of_entry
+#: code:addons/l10n_it_bill_of_entry/models/account_invoice.py:186
 #, python-format
 msgid "Extra UE expenses"
 msgstr "Spese extra UE"
 
 #. module: l10n_it_bill_of_entry
-#: code:addons/l10n_it_bill_of_entry/models/account_invoice.py:225
+#: code:addons/l10n_it_bill_of_entry/models/account_invoice.py:236
 #, python-format
 msgid "Extra UE supplier invoice must have no taxes"
 msgstr "La fattura del fornitore extra UE non deve avere imposte"
@@ -137,6 +164,12 @@ msgstr "La fattura del fornitore extra UE non deve avere imposte"
 msgid "Extra invoices"
 msgstr "Fatture extra"
 
+#. module: l10n_it_bill_of_entry
+#: model:product.product,name:l10n_it_bill_of_entry.product_product_extraEU_purchase
+#: model:product.template,name:l10n_it_bill_of_entry.product_product_extraEU_purchase_product_template
+msgid "ExtraEU Goods Purchase"
+msgstr ""
+
 #. module: l10n_it_bill_of_entry
 #: model:ir.model.fields,field_description:l10n_it_bill_of_entry.field_account_invoice__forwarder_bill_of_entry_ids
 msgid "Forward Bill of Entries"
@@ -149,7 +182,7 @@ msgid "Forwarder Invoice"
 msgstr "Fattura spedizioniere"
 
 #. module: l10n_it_bill_of_entry
-#: code:addons/l10n_it_bill_of_entry/models/account_invoice.py:133
+#: code:addons/l10n_it_bill_of_entry/models/account_invoice.py:144
 #, python-format
 msgid "Forwarder invoice %s does not have lines with 'Advance Customs Vat'"
 msgstr "La fattura spedizioniere %s non ha righe con 'IVA dogana anticipata'"
@@ -183,7 +216,7 @@ msgid "Journal used for reconciliation of bill of entries"
 msgstr "Registro usato per la riconciliazione delle bolle doganali"
 
 #. module: l10n_it_bill_of_entry
-#: code:addons/l10n_it_bill_of_entry/models/account_invoice.py:138
+#: code:addons/l10n_it_bill_of_entry/models/account_invoice.py:149
 #, python-format
 msgid "No Bill of entry Storno journal configured"
 msgstr "Nessun registro per storno della bolla doganale configurato"
@@ -195,17 +228,23 @@ msgid "No bill of entries found for this invoice"
 msgstr "Nessuna bolla doganale trovata per questa fattura"
 
 #. module: l10n_it_bill_of_entry
-#: code:addons/l10n_it_bill_of_entry/models/account_invoice.py:236
+#: code:addons/l10n_it_bill_of_entry/models/account_invoice.py:247
 #, python-format
 msgid "Please set 'Bill of entry partner' in accounting configuration"
 msgstr "Prego impostare 'Partner dogana' in configurazione contabilità"
 
 #. module: l10n_it_bill_of_entry
-#: code:addons/l10n_it_bill_of_entry/models/account_invoice.py:233
+#: code:addons/l10n_it_bill_of_entry/models/account_invoice.py:244
 #, python-format
 msgid "Please set 'Bill of entry tax' in accounting configuration"
 msgstr "Prego impostare 'Imposta dogana'"
 
+#. module: l10n_it_bill_of_entry
+#: model:product.product,name:l10n_it_bill_of_entry.product_product_stamp_duties
+#: model:product.template,name:l10n_it_bill_of_entry.product_product_stamp_duties_product_template
+msgid "Stamp Duties"
+msgstr ""
+
 #. module: l10n_it_bill_of_entry
 #: model:ir.model.fields,field_description:l10n_it_bill_of_entry.field_account_invoice__supplier_bill_of_entry_ids
 msgid "Supplier Bill of Entries"
@@ -248,7 +287,9 @@ msgstr "Imposta usata nelle bolle doganali"
 #. module: l10n_it_bill_of_entry
 #: model_terms:ir.ui.view,arch_db:l10n_it_bill_of_entry.view_boe_config_settings
 msgid "Tax used in bill of entries generation, when product is not present"
-msgstr "Imposta usata nella generazione delle bolle doganali, quando il prodotto non è presente"
+msgstr ""
+"Imposta usata nella generazione delle bolle doganali, quando il prodotto non "
+"è presente"
 
 #. module: l10n_it_bill_of_entry
 #: model:ir.model.fields,help:l10n_it_bill_of_entry.field_res_config_settings__bill_of_entry_tax_id
@@ -256,8 +297,37 @@ msgid "Tax used in bill of entries, when product is not present"
 msgstr "Imposta usata nelle bolle doganali, quando il prodotto non è presente"
 
 #. module: l10n_it_bill_of_entry
-#: code:addons/l10n_it_bill_of_entry/models/account_invoice.py:230
+#: model:product.product,uom_name:l10n_it_bill_of_entry.product_product_adv_customs_expense
+#: model:product.product,uom_name:l10n_it_bill_of_entry.product_product_customs_expense
+#: model:product.product,uom_name:l10n_it_bill_of_entry.product_product_delivery
+#: model:product.product,uom_name:l10n_it_bill_of_entry.product_product_extraEU_purchase
+#: model:product.product,uom_name:l10n_it_bill_of_entry.product_product_stamp_duties
+#: model:product.template,uom_name:l10n_it_bill_of_entry.product_product_adv_customs_expense_product_template
+#: model:product.template,uom_name:l10n_it_bill_of_entry.product_product_customs_expense_product_template
+#: model:product.template,uom_name:l10n_it_bill_of_entry.product_product_delivery_product_template
+#: model:product.template,uom_name:l10n_it_bill_of_entry.product_product_extraEU_purchase_product_template
+#: model:product.template,uom_name:l10n_it_bill_of_entry.product_product_stamp_duties_product_template
+msgid "Unit(s)"
+msgstr ""
+
+#. module: l10n_it_bill_of_entry
+#: code:addons/l10n_it_bill_of_entry/models/account_invoice.py:241
 #, python-format
 msgid "You can generate bill of entry from extra UE supplier invoice only"
-msgstr "È possibile generare la bolla doganale solamente da una fattura fornitore extra UE"
-
+msgstr ""
+"È possibile generare la bolla doganale solamente da una fattura fornitore "
+"extra UE"
+
+#. module: l10n_it_bill_of_entry
+#: model:product.product,weight_uom_name:l10n_it_bill_of_entry.product_product_adv_customs_expense
+#: model:product.product,weight_uom_name:l10n_it_bill_of_entry.product_product_customs_expense
+#: model:product.product,weight_uom_name:l10n_it_bill_of_entry.product_product_delivery
+#: model:product.product,weight_uom_name:l10n_it_bill_of_entry.product_product_extraEU_purchase
+#: model:product.product,weight_uom_name:l10n_it_bill_of_entry.product_product_stamp_duties
+#: model:product.template,weight_uom_name:l10n_it_bill_of_entry.product_product_adv_customs_expense_product_template
+#: model:product.template,weight_uom_name:l10n_it_bill_of_entry.product_product_customs_expense_product_template
+#: model:product.template,weight_uom_name:l10n_it_bill_of_entry.product_product_delivery_product_template
+#: model:product.template,weight_uom_name:l10n_it_bill_of_entry.product_product_extraEU_purchase_product_template
+#: model:product.template,weight_uom_name:l10n_it_bill_of_entry.product_product_stamp_duties_product_template
+msgid "kg"
+msgstr ""
diff --git a/l10n_it_bill_of_entry/i18n/l10n_it_bill_of_entry.pot b/l10n_it_bill_of_entry/i18n/l10n_it_bill_of_entry.pot
new file mode 100644
index 000000000000..ff396a1b7d32
--- /dev/null
+++ b/l10n_it_bill_of_entry/i18n/l10n_it_bill_of_entry.pot
@@ -0,0 +1,319 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+#	* l10n_it_bill_of_entry
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: Odoo Server 12.0\n"
+"Report-Msgid-Bugs-To: \n"
+"Last-Translator: <>\n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Plural-Forms: \n"
+
+#. module: l10n_it_bill_of_entry
+#: model_terms:ir.ui.view,arch_db:l10n_it_bill_of_entry.view_boe_config_settings
+msgid "<span class=\"fa fa-lg fa-building-o\" title=\"Values set here are company-specific.\" aria-label=\"Values set here are company-specific.\" groups=\"base.group_multi_company\" role=\"img\"/>"
+msgstr ""
+
+#. module: l10n_it_bill_of_entry
+#: model:product.product,name:l10n_it_bill_of_entry.product_product_adv_customs_expense
+#: model:product.template,name:l10n_it_bill_of_entry.product_product_adv_customs_expense_product_template
+msgid "Advance Customs Expense"
+msgstr ""
+
+#. module: l10n_it_bill_of_entry
+#: model:ir.model.fields,field_description:l10n_it_bill_of_entry.field_account_invoice_line__advance_customs_vat
+msgid "Advance Customs Vat"
+msgstr ""
+
+#. module: l10n_it_bill_of_entry
+#: selection:account.invoice,customs_doc_type:0
+msgid "Bill of Entry"
+msgstr ""
+
+#. module: l10n_it_bill_of_entry
+#: model:ir.model.fields,field_description:l10n_it_bill_of_entry.field_account_invoice__bill_of_entry_storno_id
+msgid "Bill of Entry Storno"
+msgstr ""
+
+#. module: l10n_it_bill_of_entry
+#: model_terms:ir.ui.view,arch_db:l10n_it_bill_of_entry.invoice_supplier_boe_form
+#: model_terms:ir.ui.view,arch_db:l10n_it_bill_of_entry.view_boe_config_settings
+msgid "Bill of entries"
+msgstr ""
+
+#. module: l10n_it_bill_of_entry
+#: model:ir.model.fields,field_description:l10n_it_bill_of_entry.field_account_invoice__forwarder_bill_of_entries_count
+msgid "Bill of entries for forwarder"
+msgstr ""
+
+#. module: l10n_it_bill_of_entry
+#: model:ir.model.fields,field_description:l10n_it_bill_of_entry.field_account_invoice__bill_of_entries_count
+msgid "Bill of entries number"
+msgstr ""
+
+#. module: l10n_it_bill_of_entry
+#: code:addons/l10n_it_bill_of_entry/models/account_invoice.py:117
+#, python-format
+msgid "Bill of entry %s is in state %s"
+msgstr ""
+
+#. module: l10n_it_bill_of_entry
+#: model:ir.model.fields,field_description:l10n_it_bill_of_entry.field_res_company__bill_of_entry_journal_id
+#: model:ir.model.fields,field_description:l10n_it_bill_of_entry.field_res_config_settings__bill_of_entry_journal_id
+msgid "Bill of entry Storno journal"
+msgstr ""
+
+#. module: l10n_it_bill_of_entry
+#: model:ir.model.fields,field_description:l10n_it_bill_of_entry.field_res_company__bill_of_entry_partner_id
+#: model:ir.model.fields,field_description:l10n_it_bill_of_entry.field_res_config_settings__bill_of_entry_partner_id
+msgid "Bill of entry partner"
+msgstr ""
+
+#. module: l10n_it_bill_of_entry
+#: model:ir.model.fields,field_description:l10n_it_bill_of_entry.field_res_company__bill_of_entry_tax_id
+#: model:ir.model.fields,field_description:l10n_it_bill_of_entry.field_res_config_settings__bill_of_entry_tax_id
+msgid "Bill of entry tax"
+msgstr ""
+
+#. module: l10n_it_bill_of_entry
+#: model:ir.actions.act_window,name:l10n_it_bill_of_entry.action_bill_of_entry
+#: model:ir.ui.menu,name:l10n_it_bill_of_entry.menu_action_bill_of_entry
+msgid "Bills of entry"
+msgstr ""
+
+#. module: l10n_it_bill_of_entry
+#: code:addons/l10n_it_bill_of_entry/models/account_invoice.py:182
+#, python-format
+msgid "Can't handle more than 1 tax for line %s"
+msgstr ""
+
+#. module: l10n_it_bill_of_entry
+#: model:ir.model,name:l10n_it_bill_of_entry.model_res_company
+msgid "Companies"
+msgstr ""
+
+#. module: l10n_it_bill_of_entry
+#: model:ir.model,name:l10n_it_bill_of_entry.model_res_config_settings
+msgid "Config Settings"
+msgstr ""
+
+#. module: l10n_it_bill_of_entry
+#: model:ir.ui.menu,name:l10n_it_bill_of_entry.customs
+#: model_terms:ir.ui.view,arch_db:l10n_it_bill_of_entry.invoice_supplier_boe_form
+msgid "Customs"
+msgstr ""
+
+#. module: l10n_it_bill_of_entry
+#: model:ir.model.fields,field_description:l10n_it_bill_of_entry.field_account_invoice__customs_doc_type
+msgid "Customs Doc Type"
+msgstr ""
+
+#. module: l10n_it_bill_of_entry
+#: model:product.product,name:l10n_it_bill_of_entry.product_product_customs_expense
+#: model:product.template,name:l10n_it_bill_of_entry.product_product_customs_expense_product_template
+msgid "Customs Expense"
+msgstr ""
+
+#. module: l10n_it_bill_of_entry
+#: code:addons/l10n_it_bill_of_entry/models/account_invoice.py:160
+#, python-format
+msgid "Customs expenses"
+msgstr ""
+
+#. module: l10n_it_bill_of_entry
+#: code:addons/l10n_it_bill_of_entry/models/account_invoice.py:171
+#, python-format
+msgid "Customs supplier"
+msgstr ""
+
+#. module: l10n_it_bill_of_entry
+#: model:product.product,name:l10n_it_bill_of_entry.product_product_delivery
+#: model:product.template,name:l10n_it_bill_of_entry.product_product_delivery_product_template
+msgid "Delivery Expense"
+msgstr ""
+
+#. module: l10n_it_bill_of_entry
+#: code:addons/l10n_it_bill_of_entry/models/account_invoice.py:186
+#, python-format
+msgid "Extra UE expenses"
+msgstr ""
+
+#. module: l10n_it_bill_of_entry
+#: code:addons/l10n_it_bill_of_entry/models/account_invoice.py:236
+#, python-format
+msgid "Extra UE supplier invoice must have no taxes"
+msgstr ""
+
+#. module: l10n_it_bill_of_entry
+#: model_terms:ir.ui.view,arch_db:l10n_it_bill_of_entry.invoice_supplier_boe_form
+msgid "Extra invoices"
+msgstr ""
+
+#. module: l10n_it_bill_of_entry
+#: model:product.product,name:l10n_it_bill_of_entry.product_product_extraEU_purchase
+#: model:product.template,name:l10n_it_bill_of_entry.product_product_extraEU_purchase_product_template
+msgid "ExtraEU Goods Purchase"
+msgstr ""
+
+#. module: l10n_it_bill_of_entry
+#: model:ir.model.fields,field_description:l10n_it_bill_of_entry.field_account_invoice__forwarder_bill_of_entry_ids
+msgid "Forward Bill of Entries"
+msgstr ""
+
+#. module: l10n_it_bill_of_entry
+#: selection:account.invoice,customs_doc_type:0
+#: model:ir.model.fields,field_description:l10n_it_bill_of_entry.field_account_invoice__forwarder_invoice_id
+msgid "Forwarder Invoice"
+msgstr ""
+
+#. module: l10n_it_bill_of_entry
+#: code:addons/l10n_it_bill_of_entry/models/account_invoice.py:144
+#, python-format
+msgid "Forwarder invoice %s does not have lines with 'Advance Customs Vat'"
+msgstr ""
+
+#. module: l10n_it_bill_of_entry
+#: model:ir.actions.act_window,name:l10n_it_bill_of_entry.action_forwarder_invoice
+#: model:ir.ui.menu,name:l10n_it_bill_of_entry.menu_action_forwarder_invoice
+msgid "Forwarder invoices"
+msgstr ""
+
+#. module: l10n_it_bill_of_entry
+#: model_terms:ir.ui.view,arch_db:l10n_it_bill_of_entry.invoice_supplier_boe_form
+msgid "Generate bill of entry"
+msgstr ""
+
+#. module: l10n_it_bill_of_entry
+#: model:ir.model,name:l10n_it_bill_of_entry.model_account_invoice
+msgid "Invoice"
+msgstr ""
+
+#. module: l10n_it_bill_of_entry
+#: model:ir.model,name:l10n_it_bill_of_entry.model_account_invoice_line
+msgid "Invoice Line"
+msgstr ""
+
+#. module: l10n_it_bill_of_entry
+#: model:ir.model.fields,help:l10n_it_bill_of_entry.field_res_company__bill_of_entry_journal_id
+#: model:ir.model.fields,help:l10n_it_bill_of_entry.field_res_config_settings__bill_of_entry_journal_id
+#: model_terms:ir.ui.view,arch_db:l10n_it_bill_of_entry.view_boe_config_settings
+msgid "Journal used for reconciliation of bill of entries"
+msgstr ""
+
+#. module: l10n_it_bill_of_entry
+#: code:addons/l10n_it_bill_of_entry/models/account_invoice.py:149
+#, python-format
+msgid "No Bill of entry Storno journal configured"
+msgstr ""
+
+#. module: l10n_it_bill_of_entry
+#: code:addons/l10n_it_bill_of_entry/models/account_invoice.py:113
+#, python-format
+msgid "No bill of entries found for this invoice"
+msgstr ""
+
+#. module: l10n_it_bill_of_entry
+#: code:addons/l10n_it_bill_of_entry/models/account_invoice.py:247
+#, python-format
+msgid "Please set 'Bill of entry partner' in accounting configuration"
+msgstr ""
+
+#. module: l10n_it_bill_of_entry
+#: code:addons/l10n_it_bill_of_entry/models/account_invoice.py:244
+#, python-format
+msgid "Please set 'Bill of entry tax' in accounting configuration"
+msgstr ""
+
+#. module: l10n_it_bill_of_entry
+#: model:product.product,name:l10n_it_bill_of_entry.product_product_stamp_duties
+#: model:product.template,name:l10n_it_bill_of_entry.product_product_stamp_duties_product_template
+msgid "Stamp Duties"
+msgstr ""
+
+#. module: l10n_it_bill_of_entry
+#: model:ir.model.fields,field_description:l10n_it_bill_of_entry.field_account_invoice__supplier_bill_of_entry_ids
+msgid "Supplier Bill of Entries"
+msgstr ""
+
+#. module: l10n_it_bill_of_entry
+#: selection:account.invoice,customs_doc_type:0
+msgid "Supplier Invoice"
+msgstr ""
+
+#. module: l10n_it_bill_of_entry
+#: model:ir.model.fields,field_description:l10n_it_bill_of_entry.field_account_invoice__supplier_invoice_ids
+msgid "Supplier Invoices"
+msgstr ""
+
+#. module: l10n_it_bill_of_entry
+#: model:ir.actions.act_window,name:l10n_it_bill_of_entry.action_supplier_invoice
+#: model:ir.ui.menu,name:l10n_it_bill_of_entry.menu_action_supplier_invoice
+#: model_terms:ir.ui.view,arch_db:l10n_it_bill_of_entry.invoice_supplier_boe_form
+msgid "Supplier invoices"
+msgstr ""
+
+#. module: l10n_it_bill_of_entry
+#: model:ir.model.fields,field_description:l10n_it_bill_of_entry.field_account_invoice__extra_supplier_invoices_count
+msgid "Supplier invoices number"
+msgstr ""
+
+#. module: l10n_it_bill_of_entry
+#: model:ir.model.fields,help:l10n_it_bill_of_entry.field_res_company__bill_of_entry_partner_id
+#: model:ir.model.fields,help:l10n_it_bill_of_entry.field_res_config_settings__bill_of_entry_partner_id
+#: model_terms:ir.ui.view,arch_db:l10n_it_bill_of_entry.view_boe_config_settings
+msgid "Supplier used in bill of entries"
+msgstr ""
+
+#. module: l10n_it_bill_of_entry
+#: model:ir.model.fields,help:l10n_it_bill_of_entry.field_res_company__bill_of_entry_tax_id
+msgid "Tax used in bill of entries"
+msgstr ""
+
+#. module: l10n_it_bill_of_entry
+#: model_terms:ir.ui.view,arch_db:l10n_it_bill_of_entry.view_boe_config_settings
+msgid "Tax used in bill of entries generation, when product is not present"
+msgstr ""
+
+#. module: l10n_it_bill_of_entry
+#: model:ir.model.fields,help:l10n_it_bill_of_entry.field_res_config_settings__bill_of_entry_tax_id
+msgid "Tax used in bill of entries, when product is not present"
+msgstr ""
+
+#. module: l10n_it_bill_of_entry
+#: model:product.product,uom_name:l10n_it_bill_of_entry.product_product_adv_customs_expense
+#: model:product.product,uom_name:l10n_it_bill_of_entry.product_product_customs_expense
+#: model:product.product,uom_name:l10n_it_bill_of_entry.product_product_delivery
+#: model:product.product,uom_name:l10n_it_bill_of_entry.product_product_extraEU_purchase
+#: model:product.product,uom_name:l10n_it_bill_of_entry.product_product_stamp_duties
+#: model:product.template,uom_name:l10n_it_bill_of_entry.product_product_adv_customs_expense_product_template
+#: model:product.template,uom_name:l10n_it_bill_of_entry.product_product_customs_expense_product_template
+#: model:product.template,uom_name:l10n_it_bill_of_entry.product_product_delivery_product_template
+#: model:product.template,uom_name:l10n_it_bill_of_entry.product_product_extraEU_purchase_product_template
+#: model:product.template,uom_name:l10n_it_bill_of_entry.product_product_stamp_duties_product_template
+msgid "Unit(s)"
+msgstr ""
+
+#. module: l10n_it_bill_of_entry
+#: code:addons/l10n_it_bill_of_entry/models/account_invoice.py:241
+#, python-format
+msgid "You can generate bill of entry from extra UE supplier invoice only"
+msgstr ""
+
+#. module: l10n_it_bill_of_entry
+#: model:product.product,weight_uom_name:l10n_it_bill_of_entry.product_product_adv_customs_expense
+#: model:product.product,weight_uom_name:l10n_it_bill_of_entry.product_product_customs_expense
+#: model:product.product,weight_uom_name:l10n_it_bill_of_entry.product_product_delivery
+#: model:product.product,weight_uom_name:l10n_it_bill_of_entry.product_product_extraEU_purchase
+#: model:product.product,weight_uom_name:l10n_it_bill_of_entry.product_product_stamp_duties
+#: model:product.template,weight_uom_name:l10n_it_bill_of_entry.product_product_adv_customs_expense_product_template
+#: model:product.template,weight_uom_name:l10n_it_bill_of_entry.product_product_customs_expense_product_template
+#: model:product.template,weight_uom_name:l10n_it_bill_of_entry.product_product_delivery_product_template
+#: model:product.template,weight_uom_name:l10n_it_bill_of_entry.product_product_extraEU_purchase_product_template
+#: model:product.template,weight_uom_name:l10n_it_bill_of_entry.product_product_stamp_duties_product_template
+msgid "kg"
+msgstr ""
+

From e39dabee6e8658c1371c661840bcb73c450b437e Mon Sep 17 00:00:00 2001
From: OCA-git-bot <oca-git-bot@odoo-community.org>
Date: Wed, 20 Jul 2022 10:55:01 +0000
Subject: [PATCH 14/20] [UPD] README.rst

---
 l10n_it_bill_of_entry/README.rst              | 163 ++++++
 .../static/description/index.html             | 501 ++++++++++++++++++
 2 files changed, 664 insertions(+)
 create mode 100644 l10n_it_bill_of_entry/README.rst
 create mode 100644 l10n_it_bill_of_entry/static/description/index.html

diff --git a/l10n_it_bill_of_entry/README.rst b/l10n_it_bill_of_entry/README.rst
new file mode 100644
index 000000000000..521cc0cbe8b5
--- /dev/null
+++ b/l10n_it_bill_of_entry/README.rst
@@ -0,0 +1,163 @@
+====================
+ITA - Bolle doganali
+====================
+
+.. !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+   !! This file is generated by oca-gen-addon-readme !!
+   !! changes will be overwritten.                   !!
+   !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+
+.. |badge1| image:: https://img.shields.io/badge/maturity-Beta-yellow.png
+    :target: https://odoo-community.org/page/development-status
+    :alt: Beta
+.. |badge2| image:: https://img.shields.io/badge/licence-AGPL--3-blue.png
+    :target: http://www.gnu.org/licenses/agpl-3.0-standalone.html
+    :alt: License: AGPL-3
+.. |badge3| image:: https://img.shields.io/badge/github-OCA%2Fl10n--italy-lightgray.png?logo=github
+    :target: https://github.com/OCA/l10n-italy/tree/12.0/l10n_it_bill_of_entry
+    :alt: OCA/l10n-italy
+.. |badge4| image:: https://img.shields.io/badge/weblate-Translate%20me-F47D42.png
+    :target: https://translation.odoo-community.org/projects/l10n-italy-12-0/l10n-italy-12-0-l10n_it_bill_of_entry
+    :alt: Translate me on Weblate
+.. |badge5| image:: https://img.shields.io/badge/runbot-Try%20me-875A7B.png
+    :target: https://runbot.odoo-community.org/runbot/122/12.0
+    :alt: Try me on Runbot
+
+|badge1| |badge2| |badge3| |badge4| |badge5| 
+
+This module enables to manage extraUE import purchases, generating a bill of entry
+according to the supplier invoice.
+
+It involves three documents:
+
+* Supplier Invoice
+* Forwarder Invoice
+* Bill of Entry
+
+**Table of contents**
+
+.. contents::
+   :local:
+
+Configuration
+=============
+
+**English**
+
+Mandatory settings:
+
+* An account journal required by the closing transfer account move (e.g. "Bolle Doganali").
+* An account journal for extraUE supplier invoices, apart from
+  ordinary supplier invoices. In this way, extraUE supplier invoices don't appear in VAT registries;
+  in this way, VAT registries have no missing numbers.
+* Create the "Extra UE goods purchases" and add a tax mapping: purchase taxes (e.g. 22%) should be mapped to
+  to no one tax. In this way, every purchase invoice for extra UE fiscal position
+  don't show taxes in lines, according to law.
+* A virtual supplier (e.g. "Customs" or "Dogana") for the bill of entry.
+* The forwarder as a real supplier.
+
+Optional settings:
+
+* An expense account where recording the bill of entry net amount (e.g. "ACQUISTO MERCI ExtraUE").
+* An expense account where recording the bill of entry VAT amount,
+  paid in advance by the forwarder and declared in the forwarder invoice (e.g. "SPESE DOGANALI ANTICIPATE").
+* An account tax, with the same VAT rate as the ordinary one (i.e. 22% for Italy),
+  applied on the bill of entry net amount (e.g. "22% debito ExtraUE"). In this way,
+  bill of entries are highlighted in VAT registries due to this tax code.
+* An account for delivery expenses, recorded in the forwarder invoice (e.g. "SPESE DI TRASPORTO").
+* An account for customs duties, recorded in the forwarder invoice (e.g. "DIRITTI DOGANALI").
+* An account for stamp duties, recorded in the forwarder invoice (e.g. "IMPOSTE DI BOLLO").
+
+**Italiano**
+
+Impostazioni obbligatorie:
+
+* Un registro utilizzato per la registrazione di giroconto (ad es. "Bolle Doganali" o "Varie") da impostare in configurazione contabilità.
+* Un imposta con aliquota standard da applicare alla bolla doganale (ad es. "22% credito ExtraUE") da impostare in configurazione contabilità.
+  In questo modo questa imposta viene evidenziata nei registri IVA.
+* Un fornitore "Dogana" per le bolle doganali, da impostare in configurazione contabilità.
+* Un registro per le fatture dei fornitori extra UE, distinto da quello delle fatture passive ordinarie.
+  In questo modo, le fatture dei fornitori extra non appariranno nei registri IVA ed i registri IVA non avranno numeri mancanti.
+* Una posizione fiscale "Acquisti beni extra UE" e aggiungere la mappatura: l'imposta d'acquisto (ad es. 22%) deve essere mappata a nessuna imposta.
+  In questo modo, ogni fattura passive per questa posizione fiscale non avrà imposte sulle righe.
+* Il fornitore spedizioniere
+
+Impostazioni opzionali:
+
+* Un conto di costo dove registrare l'importo netto della bolla doganale (ad es. "ACQUISTO MERCI ExtraUE"),
+  da associare eventualmente ai prodotti acquistati extra UE
+* Un conto di costo dove registrare l'importo dell'IVA della bolla doganale,
+  pagata in anticipo dello spedizioniere e evidenziata nella fattura dello spedizioniere (ad es. "SPESE DOGANALI ANTICIPATE").
+* Un conto per le spese di consegna, registrate nella fattura spedizioniere (ad es. "SPESE DI TRASPORTO")
+* Un conto per i diritti doganali, registrati nella fattura spedizioniere (ad es. "DIRITTI DOGANALI")
+* Un conto per le imposte di bollo, registrate nella fattura spedizioniere (ad es. "IMPOSTE DI BOLLO")
+
+Usage
+=====
+
+**English**
+
+From supplier invoice it is possible to generate the bill of entry.
+
+The forwarder invoice requires one (or more) line(s) marked as the
+advance customs vat.
+
+At the forwarder invoice confirmation, it will be linked to the closing
+transfer account move, which closes and reconciles the bill of entry.
+
+**Italiano**
+
+Dalla fattura fornitore è possibile generare la bolla doganale.
+
+Nella fattura spedizioniere bisogna indicare quale (o quali) riga (righe)
+rappresenti(no) l'IVA anticipata alla dogana.
+
+Alla conferma della fattura spedizioniere, verrà generata la scrittura
+contabile di giroconto per chiudere la bolla doganale.
+
+Bug Tracker
+===========
+
+Bugs are tracked on `GitHub Issues <https://github.com/OCA/l10n-italy/issues>`_.
+In case of trouble, please check there if your issue has already been reported.
+If you spotted it first, help us smashing it by providing a detailed and welcomed
+`feedback <https://github.com/OCA/l10n-italy/issues/new?body=module:%20l10n_it_bill_of_entry%0Aversion:%2012.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**>`_.
+
+Do not contact contributors directly about support or help with technical issues.
+
+Credits
+=======
+
+Authors
+~~~~~~~
+
+* Agile Business Group
+* CQ Creativi Quadrati
+* TAKOBI
+
+Contributors
+~~~~~~~~~~~~
+
+* Alex Comba <alex.comba@agilebg.com>
+* `TAKOBI <https://takobi.online>`_:
+
+  * Lorenzo Battistini
+
+* Diego Bruselli <d.bruselli@creativiquadrati.it>
+
+Maintainers
+~~~~~~~~~~~
+
+This module is maintained by the OCA.
+
+.. image:: https://odoo-community.org/logo.png
+   :alt: Odoo Community Association
+   :target: https://odoo-community.org
+
+OCA, or the Odoo Community Association, is a nonprofit organization whose
+mission is to support the collaborative development of Odoo features and
+promote its widespread use.
+
+This module is part of the `OCA/l10n-italy <https://github.com/OCA/l10n-italy/tree/12.0/l10n_it_bill_of_entry>`_ project on GitHub.
+
+You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute.
diff --git a/l10n_it_bill_of_entry/static/description/index.html b/l10n_it_bill_of_entry/static/description/index.html
new file mode 100644
index 000000000000..ebf9fce78e26
--- /dev/null
+++ b/l10n_it_bill_of_entry/static/description/index.html
@@ -0,0 +1,501 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+<meta name="generator" content="Docutils 0.15.1: http://docutils.sourceforge.net/" />
+<title>ITA - Bolle doganali</title>
+<style type="text/css">
+
+/*
+:Author: David Goodger (goodger@python.org)
+:Id: $Id: html4css1.css 7952 2016-07-26 18:15:59Z milde $
+:Copyright: This stylesheet has been placed in the public domain.
+
+Default cascading style sheet for the HTML output of Docutils.
+
+See http://docutils.sf.net/docs/howto/html-stylesheets.html for how to
+customize this style sheet.
+*/
+
+/* used to remove borders from tables and images */
+.borderless, table.borderless td, table.borderless th {
+  border: 0 }
+
+table.borderless td, table.borderless th {
+  /* Override padding for "table.docutils td" with "! important".
+     The right padding separates the table cells. */
+  padding: 0 0.5em 0 0 ! important }
+
+.first {
+  /* Override more specific margin styles with "! important". */
+  margin-top: 0 ! important }
+
+.last, .with-subtitle {
+  margin-bottom: 0 ! important }
+
+.hidden {
+  display: none }
+
+.subscript {
+  vertical-align: sub;
+  font-size: smaller }
+
+.superscript {
+  vertical-align: super;
+  font-size: smaller }
+
+a.toc-backref {
+  text-decoration: none ;
+  color: black }
+
+blockquote.epigraph {
+  margin: 2em 5em ; }
+
+dl.docutils dd {
+  margin-bottom: 0.5em }
+
+object[type="image/svg+xml"], object[type="application/x-shockwave-flash"] {
+  overflow: hidden;
+}
+
+/* Uncomment (and remove this text!) to get bold-faced definition list terms
+dl.docutils dt {
+  font-weight: bold }
+*/
+
+div.abstract {
+  margin: 2em 5em }
+
+div.abstract p.topic-title {
+  font-weight: bold ;
+  text-align: center }
+
+div.admonition, div.attention, div.caution, div.danger, div.error,
+div.hint, div.important, div.note, div.tip, div.warning {
+  margin: 2em ;
+  border: medium outset ;
+  padding: 1em }
+
+div.admonition p.admonition-title, div.hint p.admonition-title,
+div.important p.admonition-title, div.note p.admonition-title,
+div.tip p.admonition-title {
+  font-weight: bold ;
+  font-family: sans-serif }
+
+div.attention p.admonition-title, div.caution p.admonition-title,
+div.danger p.admonition-title, div.error p.admonition-title,
+div.warning p.admonition-title, .code .error {
+  color: red ;
+  font-weight: bold ;
+  font-family: sans-serif }
+
+/* Uncomment (and remove this text!) to get reduced vertical space in
+   compound paragraphs.
+div.compound .compound-first, div.compound .compound-middle {
+  margin-bottom: 0.5em }
+
+div.compound .compound-last, div.compound .compound-middle {
+  margin-top: 0.5em }
+*/
+
+div.dedication {
+  margin: 2em 5em ;
+  text-align: center ;
+  font-style: italic }
+
+div.dedication p.topic-title {
+  font-weight: bold ;
+  font-style: normal }
+
+div.figure {
+  margin-left: 2em ;
+  margin-right: 2em }
+
+div.footer, div.header {
+  clear: both;
+  font-size: smaller }
+
+div.line-block {
+  display: block ;
+  margin-top: 1em ;
+  margin-bottom: 1em }
+
+div.line-block div.line-block {
+  margin-top: 0 ;
+  margin-bottom: 0 ;
+  margin-left: 1.5em }
+
+div.sidebar {
+  margin: 0 0 0.5em 1em ;
+  border: medium outset ;
+  padding: 1em ;
+  background-color: #ffffee ;
+  width: 40% ;
+  float: right ;
+  clear: right }
+
+div.sidebar p.rubric {
+  font-family: sans-serif ;
+  font-size: medium }
+
+div.system-messages {
+  margin: 5em }
+
+div.system-messages h1 {
+  color: red }
+
+div.system-message {
+  border: medium outset ;
+  padding: 1em }
+
+div.system-message p.system-message-title {
+  color: red ;
+  font-weight: bold }
+
+div.topic {
+  margin: 2em }
+
+h1.section-subtitle, h2.section-subtitle, h3.section-subtitle,
+h4.section-subtitle, h5.section-subtitle, h6.section-subtitle {
+  margin-top: 0.4em }
+
+h1.title {
+  text-align: center }
+
+h2.subtitle {
+  text-align: center }
+
+hr.docutils {
+  width: 75% }
+
+img.align-left, .figure.align-left, object.align-left, table.align-left {
+  clear: left ;
+  float: left ;
+  margin-right: 1em }
+
+img.align-right, .figure.align-right, object.align-right, table.align-right {
+  clear: right ;
+  float: right ;
+  margin-left: 1em }
+
+img.align-center, .figure.align-center, object.align-center {
+  display: block;
+  margin-left: auto;
+  margin-right: auto;
+}
+
+table.align-center {
+  margin-left: auto;
+  margin-right: auto;
+}
+
+.align-left {
+  text-align: left }
+
+.align-center {
+  clear: both ;
+  text-align: center }
+
+.align-right {
+  text-align: right }
+
+/* reset inner alignment in figures */
+div.align-right {
+  text-align: inherit }
+
+/* div.align-center * { */
+/*   text-align: left } */
+
+.align-top    {
+  vertical-align: top }
+
+.align-middle {
+  vertical-align: middle }
+
+.align-bottom {
+  vertical-align: bottom }
+
+ol.simple, ul.simple {
+  margin-bottom: 1em }
+
+ol.arabic {
+  list-style: decimal }
+
+ol.loweralpha {
+  list-style: lower-alpha }
+
+ol.upperalpha {
+  list-style: upper-alpha }
+
+ol.lowerroman {
+  list-style: lower-roman }
+
+ol.upperroman {
+  list-style: upper-roman }
+
+p.attribution {
+  text-align: right ;
+  margin-left: 50% }
+
+p.caption {
+  font-style: italic }
+
+p.credits {
+  font-style: italic ;
+  font-size: smaller }
+
+p.label {
+  white-space: nowrap }
+
+p.rubric {
+  font-weight: bold ;
+  font-size: larger ;
+  color: maroon ;
+  text-align: center }
+
+p.sidebar-title {
+  font-family: sans-serif ;
+  font-weight: bold ;
+  font-size: larger }
+
+p.sidebar-subtitle {
+  font-family: sans-serif ;
+  font-weight: bold }
+
+p.topic-title {
+  font-weight: bold }
+
+pre.address {
+  margin-bottom: 0 ;
+  margin-top: 0 ;
+  font: inherit }
+
+pre.literal-block, pre.doctest-block, pre.math, pre.code {
+  margin-left: 2em ;
+  margin-right: 2em }
+
+pre.code .ln { color: grey; } /* line numbers */
+pre.code, code { background-color: #eeeeee }
+pre.code .comment, code .comment { color: #5C6576 }
+pre.code .keyword, code .keyword { color: #3B0D06; font-weight: bold }
+pre.code .literal.string, code .literal.string { color: #0C5404 }
+pre.code .name.builtin, code .name.builtin { color: #352B84 }
+pre.code .deleted, code .deleted { background-color: #DEB0A1}
+pre.code .inserted, code .inserted { background-color: #A3D289}
+
+span.classifier {
+  font-family: sans-serif ;
+  font-style: oblique }
+
+span.classifier-delimiter {
+  font-family: sans-serif ;
+  font-weight: bold }
+
+span.interpreted {
+  font-family: sans-serif }
+
+span.option {
+  white-space: nowrap }
+
+span.pre {
+  white-space: pre }
+
+span.problematic {
+  color: red }
+
+span.section-subtitle {
+  /* font-size relative to parent (h1..h6 element) */
+  font-size: 80% }
+
+table.citation {
+  border-left: solid 1px gray;
+  margin-left: 1px }
+
+table.docinfo {
+  margin: 2em 4em }
+
+table.docutils {
+  margin-top: 0.5em ;
+  margin-bottom: 0.5em }
+
+table.footnote {
+  border-left: solid 1px black;
+  margin-left: 1px }
+
+table.docutils td, table.docutils th,
+table.docinfo td, table.docinfo th {
+  padding-left: 0.5em ;
+  padding-right: 0.5em ;
+  vertical-align: top }
+
+table.docutils th.field-name, table.docinfo th.docinfo-name {
+  font-weight: bold ;
+  text-align: left ;
+  white-space: nowrap ;
+  padding-left: 0 }
+
+/* "booktabs" style (no vertical lines) */
+table.docutils.booktabs {
+  border: 0px;
+  border-top: 2px solid;
+  border-bottom: 2px solid;
+  border-collapse: collapse;
+}
+table.docutils.booktabs * {
+  border: 0px;
+}
+table.docutils.booktabs th {
+  border-bottom: thin solid;
+  text-align: left;
+}
+
+h1 tt.docutils, h2 tt.docutils, h3 tt.docutils,
+h4 tt.docutils, h5 tt.docutils, h6 tt.docutils {
+  font-size: 100% }
+
+ul.auto-toc {
+  list-style-type: none }
+
+</style>
+</head>
+<body>
+<div class="document" id="ita-bolle-doganali">
+<h1 class="title">ITA - Bolle doganali</h1>
+
+<!-- !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+!! This file is generated by oca-gen-addon-readme !!
+!! changes will be overwritten.                   !!
+!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
+<p><a class="reference external" href="https://odoo-community.org/page/development-status"><img alt="Beta" src="https://img.shields.io/badge/maturity-Beta-yellow.png" /></a> <a class="reference external" href="http://www.gnu.org/licenses/agpl-3.0-standalone.html"><img alt="License: AGPL-3" src="https://img.shields.io/badge/licence-AGPL--3-blue.png" /></a> <a class="reference external" href="https://github.com/OCA/l10n-italy/tree/12.0/l10n_it_bill_of_entry"><img alt="OCA/l10n-italy" src="https://img.shields.io/badge/github-OCA%2Fl10n--italy-lightgray.png?logo=github" /></a> <a class="reference external" href="https://translation.odoo-community.org/projects/l10n-italy-12-0/l10n-italy-12-0-l10n_it_bill_of_entry"><img alt="Translate me on Weblate" src="https://img.shields.io/badge/weblate-Translate%20me-F47D42.png" /></a> <a class="reference external" href="https://runbot.odoo-community.org/runbot/122/12.0"><img alt="Try me on Runbot" src="https://img.shields.io/badge/runbot-Try%20me-875A7B.png" /></a></p>
+<p>This module enables to manage extraUE import purchases, generating a bill of entry
+according to the supplier invoice.</p>
+<p>It involves three documents:</p>
+<ul class="simple">
+<li>Supplier Invoice</li>
+<li>Forwarder Invoice</li>
+<li>Bill of Entry</li>
+</ul>
+<p><strong>Table of contents</strong></p>
+<div class="contents local topic" id="contents">
+<ul class="simple">
+<li><a class="reference internal" href="#configuration" id="id1">Configuration</a></li>
+<li><a class="reference internal" href="#usage" id="id2">Usage</a></li>
+<li><a class="reference internal" href="#bug-tracker" id="id3">Bug Tracker</a></li>
+<li><a class="reference internal" href="#credits" id="id4">Credits</a><ul>
+<li><a class="reference internal" href="#authors" id="id5">Authors</a></li>
+<li><a class="reference internal" href="#contributors" id="id6">Contributors</a></li>
+<li><a class="reference internal" href="#maintainers" id="id7">Maintainers</a></li>
+</ul>
+</li>
+</ul>
+</div>
+<div class="section" id="configuration">
+<h1><a class="toc-backref" href="#id1">Configuration</a></h1>
+<p><strong>English</strong></p>
+<p>Mandatory settings:</p>
+<ul class="simple">
+<li>An account journal required by the closing transfer account move (e.g. “Bolle Doganali”).</li>
+<li>An account journal for extraUE supplier invoices, apart from
+ordinary supplier invoices. In this way, extraUE supplier invoices don’t appear in VAT registries;
+in this way, VAT registries have no missing numbers.</li>
+<li>Create the “Extra UE goods purchases” and add a tax mapping: purchase taxes (e.g. 22%) should be mapped to
+to no one tax. In this way, every purchase invoice for extra UE fiscal position
+don’t show taxes in lines, according to law.</li>
+<li>A virtual supplier (e.g. “Customs” or “Dogana”) for the bill of entry.</li>
+<li>The forwarder as a real supplier.</li>
+</ul>
+<p>Optional settings:</p>
+<ul class="simple">
+<li>An expense account where recording the bill of entry net amount (e.g. “ACQUISTO MERCI ExtraUE”).</li>
+<li>An expense account where recording the bill of entry VAT amount,
+paid in advance by the forwarder and declared in the forwarder invoice (e.g. “SPESE DOGANALI ANTICIPATE”).</li>
+<li>An account tax, with the same VAT rate as the ordinary one (i.e. 22% for Italy),
+applied on the bill of entry net amount (e.g. “22% debito ExtraUE”). In this way,
+bill of entries are highlighted in VAT registries due to this tax code.</li>
+<li>An account for delivery expenses, recorded in the forwarder invoice (e.g. “SPESE DI TRASPORTO”).</li>
+<li>An account for customs duties, recorded in the forwarder invoice (e.g. “DIRITTI DOGANALI”).</li>
+<li>An account for stamp duties, recorded in the forwarder invoice (e.g. “IMPOSTE DI BOLLO”).</li>
+</ul>
+<p><strong>Italiano</strong></p>
+<p>Impostazioni obbligatorie:</p>
+<ul class="simple">
+<li>Un registro utilizzato per la registrazione di giroconto (ad es. “Bolle Doganali” o “Varie”) da impostare in configurazione contabilità.</li>
+<li>Un imposta con aliquota standard da applicare alla bolla doganale (ad es. “22% credito ExtraUE”) da impostare in configurazione contabilità.
+In questo modo questa imposta viene evidenziata nei registri IVA.</li>
+<li>Un fornitore “Dogana” per le bolle doganali, da impostare in configurazione contabilità.</li>
+<li>Un registro per le fatture dei fornitori extra UE, distinto da quello delle fatture passive ordinarie.
+In questo modo, le fatture dei fornitori extra non appariranno nei registri IVA ed i registri IVA non avranno numeri mancanti.</li>
+<li>Una posizione fiscale “Acquisti beni extra UE” e aggiungere la mappatura: l’imposta d’acquisto (ad es. 22%) deve essere mappata a nessuna imposta.
+In questo modo, ogni fattura passive per questa posizione fiscale non avrà imposte sulle righe.</li>
+<li>Il fornitore spedizioniere</li>
+</ul>
+<p>Impostazioni opzionali:</p>
+<ul class="simple">
+<li>Un conto di costo dove registrare l’importo netto della bolla doganale (ad es. “ACQUISTO MERCI ExtraUE”),
+da associare eventualmente ai prodotti acquistati extra UE</li>
+<li>Un conto di costo dove registrare l’importo dell’IVA della bolla doganale,
+pagata in anticipo dello spedizioniere e evidenziata nella fattura dello spedizioniere (ad es. “SPESE DOGANALI ANTICIPATE”).</li>
+<li>Un conto per le spese di consegna, registrate nella fattura spedizioniere (ad es. “SPESE DI TRASPORTO”)</li>
+<li>Un conto per i diritti doganali, registrati nella fattura spedizioniere (ad es. “DIRITTI DOGANALI”)</li>
+<li>Un conto per le imposte di bollo, registrate nella fattura spedizioniere (ad es. “IMPOSTE DI BOLLO”)</li>
+</ul>
+</div>
+<div class="section" id="usage">
+<h1><a class="toc-backref" href="#id2">Usage</a></h1>
+<p><strong>English</strong></p>
+<p>From supplier invoice it is possible to generate the bill of entry.</p>
+<p>The forwarder invoice requires one (or more) line(s) marked as the
+advance customs vat.</p>
+<p>At the forwarder invoice confirmation, it will be linked to the closing
+transfer account move, which closes and reconciles the bill of entry.</p>
+<p><strong>Italiano</strong></p>
+<p>Dalla fattura fornitore è possibile generare la bolla doganale.</p>
+<p>Nella fattura spedizioniere bisogna indicare quale (o quali) riga (righe)
+rappresenti(no) l’IVA anticipata alla dogana.</p>
+<p>Alla conferma della fattura spedizioniere, verrà generata la scrittura
+contabile di giroconto per chiudere la bolla doganale.</p>
+</div>
+<div class="section" id="bug-tracker">
+<h1><a class="toc-backref" href="#id3">Bug Tracker</a></h1>
+<p>Bugs are tracked on <a class="reference external" href="https://github.com/OCA/l10n-italy/issues">GitHub Issues</a>.
+In case of trouble, please check there if your issue has already been reported.
+If you spotted it first, help us smashing it by providing a detailed and welcomed
+<a class="reference external" href="https://github.com/OCA/l10n-italy/issues/new?body=module:%20l10n_it_bill_of_entry%0Aversion:%2012.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**">feedback</a>.</p>
+<p>Do not contact contributors directly about support or help with technical issues.</p>
+</div>
+<div class="section" id="credits">
+<h1><a class="toc-backref" href="#id4">Credits</a></h1>
+<div class="section" id="authors">
+<h2><a class="toc-backref" href="#id5">Authors</a></h2>
+<ul class="simple">
+<li>Agile Business Group</li>
+<li>CQ Creativi Quadrati</li>
+<li>TAKOBI</li>
+</ul>
+</div>
+<div class="section" id="contributors">
+<h2><a class="toc-backref" href="#id6">Contributors</a></h2>
+<ul class="simple">
+<li>Alex Comba &lt;<a class="reference external" href="mailto:alex.comba&#64;agilebg.com">alex.comba&#64;agilebg.com</a>&gt;</li>
+<li><a class="reference external" href="https://takobi.online">TAKOBI</a>:<ul>
+<li>Lorenzo Battistini</li>
+</ul>
+</li>
+<li>Diego Bruselli &lt;<a class="reference external" href="mailto:d.bruselli&#64;creativiquadrati.it">d.bruselli&#64;creativiquadrati.it</a>&gt;</li>
+</ul>
+</div>
+<div class="section" id="maintainers">
+<h2><a class="toc-backref" href="#id7">Maintainers</a></h2>
+<p>This module is maintained by the OCA.</p>
+<a class="reference external image-reference" href="https://odoo-community.org"><img alt="Odoo Community Association" src="https://odoo-community.org/logo.png" /></a>
+<p>OCA, or the Odoo Community Association, is a nonprofit organization whose
+mission is to support the collaborative development of Odoo features and
+promote its widespread use.</p>
+<p>This module is part of the <a class="reference external" href="https://github.com/OCA/l10n-italy/tree/12.0/l10n_it_bill_of_entry">OCA/l10n-italy</a> project on GitHub.</p>
+<p>You are welcome to contribute. To learn how please visit <a class="reference external" href="https://odoo-community.org/page/Contribute">https://odoo-community.org/page/Contribute</a>.</p>
+</div>
+</div>
+</div>
+</body>
+</html>

From c99bd8c6dc823f9268030ab927ab01fbd489b600 Mon Sep 17 00:00:00 2001
From: OCA-git-bot <oca-git-bot@odoo-community.org>
Date: Wed, 20 Jul 2022 10:55:02 +0000
Subject: [PATCH 15/20] [ADD] icon.png

---
 .../static/description/icon.png                  | Bin 0 -> 9455 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 l10n_it_bill_of_entry/static/description/icon.png

diff --git a/l10n_it_bill_of_entry/static/description/icon.png b/l10n_it_bill_of_entry/static/description/icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..3a0328b516c4980e8e44cdb63fd945757ddd132d
GIT binary patch
literal 9455
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
Xviia!U7SGha1wx#SCgwmn*{w2TRX*I

literal 0
HcmV?d00001


From a580889ae27b0178fe5169085ae083711b9ef745 Mon Sep 17 00:00:00 2001
From: Simone Rubino <sir@takobi.online>
Date: Fri, 5 Aug 2022 16:05:16 +0200
Subject: [PATCH 16/20] Manually fix manifest website key

---
 l10n_it_bill_of_entry/__manifest__.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/l10n_it_bill_of_entry/__manifest__.py b/l10n_it_bill_of_entry/__manifest__.py
index b44bf953bfdf..d9623f306ace 100644
--- a/l10n_it_bill_of_entry/__manifest__.py
+++ b/l10n_it_bill_of_entry/__manifest__.py
@@ -17,7 +17,8 @@
     'category': 'Localization/Italy',
     'author': "Agile Business Group, CQ Creativi Quadrati, TAKOBI, "
               "Odoo Community Association (OCA)",
-    'website': "https://github.com/OCA/l10n-italy",
+    'website': "https://github.com/OCA/l10n-italy"
+               "/tree/12.0/l10n_it_bill_of_entry",
     'license': 'AGPL-3',
     'depends': [
         'base',

From c498dd4b0c6b5d68b332bca59f0ae663fa2d2de2 Mon Sep 17 00:00:00 2001
From: eLBati <lb@takobi.online>
Date: Tue, 27 Sep 2022 17:40:10 +0200
Subject: [PATCH 17/20] FIX l10n_it_bill_of_entry : TypeError: exceptions must
 derive from BaseException

---
 l10n_it_bill_of_entry/models/account_invoice.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/l10n_it_bill_of_entry/models/account_invoice.py b/l10n_it_bill_of_entry/models/account_invoice.py
index 3dfa99ea0a05..72249cc4bfb5 100644
--- a/l10n_it_bill_of_entry/models/account_invoice.py
+++ b/l10n_it_bill_of_entry/models/account_invoice.py
@@ -233,7 +233,7 @@ def action_cancel(self):
     def _check_no_taxes(self):
         for line in self.invoice_line_ids:
             if line.invoice_line_tax_ids:
-                raise (_("Extra UE supplier invoice must have no taxes"))
+                raise UserError(_("Extra UE supplier invoice must have no taxes"))
 
     def generate_bill_of_entry(self):
         self.ensure_one()

From 4dcc54ba5c3d884cf4d844ef4fca8266f2f18a30 Mon Sep 17 00:00:00 2001
From: OCA-git-bot <oca-git-bot@odoo-community.org>
Date: Thu, 29 Sep 2022 11:19:10 +0000
Subject: [PATCH 18/20] l10n_it_bill_of_entry 12.0.1.0.1

---
 l10n_it_bill_of_entry/__manifest__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/l10n_it_bill_of_entry/__manifest__.py b/l10n_it_bill_of_entry/__manifest__.py
index d9623f306ace..feb1a0682e7a 100644
--- a/l10n_it_bill_of_entry/__manifest__.py
+++ b/l10n_it_bill_of_entry/__manifest__.py
@@ -13,7 +13,7 @@
 
 {
     'name': 'ITA - Bolle doganali',
-    'version': '12.0.1.0.0',
+    'version': '12.0.1.0.1',
     'category': 'Localization/Italy',
     'author': "Agile Business Group, CQ Creativi Quadrati, TAKOBI, "
               "Odoo Community Association (OCA)",

From c1b353c07e5ae8b942927fa4089dad8d160d6c57 Mon Sep 17 00:00:00 2001
From: Simone Rubino <sir@takobi.online>
Date: Wed, 26 Oct 2022 17:59:23 +0200
Subject: [PATCH 19/20] [IMP] l10n_it_bill_of_entry: pre-commit execution

---
 l10n_it_bill_of_entry/__manifest__.py         |  33 ++-
 .../demo/bill_of_entry_demo.xml               |  64 +++--
 .../models/account_invoice.py                 | 268 ++++++++++--------
 l10n_it_bill_of_entry/models/company.py       |  31 +-
 l10n_it_bill_of_entry/tests/__init__.py       |   1 -
 .../tests/test_bill_of_entry.py               | 236 +++++++--------
 .../views/account_invoice_view.xml            | 185 ++++++++----
 l10n_it_bill_of_entry/views/company_view.xml  |  54 +++-
 .../odoo/addons/l10n_it_bill_of_entry         |   1 +
 setup/l10n_it_bill_of_entry/setup.py          |   6 +
 10 files changed, 512 insertions(+), 367 deletions(-)
 create mode 120000 setup/l10n_it_bill_of_entry/odoo/addons/l10n_it_bill_of_entry
 create mode 100644 setup/l10n_it_bill_of_entry/setup.py

diff --git a/l10n_it_bill_of_entry/__manifest__.py b/l10n_it_bill_of_entry/__manifest__.py
index feb1a0682e7a..223f763718d0 100644
--- a/l10n_it_bill_of_entry/__manifest__.py
+++ b/l10n_it_bill_of_entry/__manifest__.py
@@ -12,24 +12,23 @@
 ##############################################################################
 
 {
-    'name': 'ITA - Bolle doganali',
-    'version': '12.0.1.0.1',
-    'category': 'Localization/Italy',
-    'author': "Agile Business Group, CQ Creativi Quadrati, TAKOBI, "
-              "Odoo Community Association (OCA)",
-    'website': "https://github.com/OCA/l10n-italy"
-               "/tree/12.0/l10n_it_bill_of_entry",
-    'license': 'AGPL-3',
-    'depends': [
-        'base',
-        'account',
+    "name": "ITA - Bolle doganali",
+    "version": "12.0.1.0.1",
+    "category": "Localization/Italy",
+    "author": "Agile Business Group, CQ Creativi Quadrati, TAKOBI, "
+    "Odoo Community Association (OCA)",
+    "website": "https://github.com/OCA/l10n-italy" "/tree/12.0/l10n_it_bill_of_entry",
+    "license": "AGPL-3",
+    "depends": [
+        "base",
+        "account",
     ],
-    'data': [
-        'views/company_view.xml',
-        'views/account_invoice_view.xml',
+    "data": [
+        "views/company_view.xml",
+        "views/account_invoice_view.xml",
     ],
-    'demo': [
-        'demo/bill_of_entry_demo.xml',
+    "demo": [
+        "demo/bill_of_entry_demo.xml",
     ],
-    'installable': True,
+    "installable": True,
 }
diff --git a/l10n_it_bill_of_entry/demo/bill_of_entry_demo.xml b/l10n_it_bill_of_entry/demo/bill_of_entry_demo.xml
index b00a71a20ed3..0238a7ecf280 100644
--- a/l10n_it_bill_of_entry/demo/bill_of_entry_demo.xml
+++ b/l10n_it_bill_of_entry/demo/bill_of_entry_demo.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8" ?>
 <odoo>
     <data>
 
@@ -6,29 +6,31 @@
         <record id="account_account_extraEU_purchase" model="account.account">
             <field name="code">280310</field>
             <field name="name">ExtraEU Goods Purchase</field>
-            <field name="user_type_id"
-                ref="account.data_account_type_current_liabilities"/>
+            <field
+                name="user_type_id"
+                ref="account.data_account_type_current_liabilities"
+            />
             <field name="reconcile">True</field>
         </record>
         <record id="account_account_adv_customs_expense" model="account.account">
             <field name="code">280320</field>
             <field name="name">Advanced Customs Expenses</field>
-            <field name="user_type_id"
-                ref="account.data_account_type_current_liabilities"/>
+            <field
+                name="user_type_id"
+                ref="account.data_account_type_current_liabilities"
+            />
             <field name="reconcile">True</field>
         </record>
         <record id="account_account_customs_expense" model="account.account">
             <field name="code">421500</field>
             <field name="name">Customs Expenses</field>
-            <field name="user_type_id"
-                ref="account.data_account_type_expenses"/>
+            <field name="user_type_id" ref="account.data_account_type_expenses" />
             <field name="reconcile">True</field>
         </record>
         <record id="account_account_stamp_duties" model="account.account">
             <field name="code">421400</field>
             <field name="name">Stamp Duties</field>
-            <field name="user_type_id"
-                ref="account.data_account_type_expenses"/>
+            <field name="user_type_id" ref="account.data_account_type_expenses" />
             <field name="reconcile">True</field>
         </record>
 
@@ -39,8 +41,7 @@
         <record id="account_account_delivery_expense" model="account.account">
             <field name="code">420101</field>
             <field name="name">Delivery Expenses</field>
-            <field name="user_type_id"
-                ref="account.data_account_type_expenses"/>
+            <field name="user_type_id" ref="account.data_account_type_expenses" />
             <field name="reconcile">True</field>
         </record>
 
@@ -55,7 +56,7 @@
             <field name="amount_type">percent</field>
             <field name="amount">22</field>
             <field name="description">22aExtraUE</field>
-            <field name="tax_group_id" ref="account.tax_group_taxes"/>
+            <field name="tax_group_id" ref="account.tax_group_taxes" />
             <field name="sequence">99</field>
         </record>
 
@@ -82,58 +83,59 @@
         <!-- Product product -->
         <record id="product_product_extraEU_purchase" model="product.product">
             <field name="name">ExtraEU Goods Purchase</field>
-            <field name="categ_id" ref="product.product_category_1"/>
+            <field name="categ_id" ref="product.product_category_1" />
             <field name="purchase_ok">True</field>
             <field name="standard_price">1.0</field>
             <field name="list_price">1.0</field>
             <field name="type">service</field>
-            <field name="uom_id" ref="uom.product_uom_unit"/>
-            <field name="uom_po_id" ref="uom.product_uom_unit"/>
+            <field name="uom_id" ref="uom.product_uom_unit" />
+            <field name="uom_po_id" ref="uom.product_uom_unit" />
         </record>
         <record id="product_product_adv_customs_expense" model="product.product">
             <field name="name">Advance Customs Expense</field>
-            <field name="categ_id" ref="product.product_category_1"/>
+            <field name="categ_id" ref="product.product_category_1" />
             <field name="purchase_ok">True</field>
             <field name="standard_price">1.0</field>
             <field name="list_price">1.0</field>
             <field name="type">service</field>
-            <field name="uom_id" ref="uom.product_uom_unit"/>
-            <field name="uom_po_id" ref="uom.product_uom_unit"/>
+            <field name="uom_id" ref="uom.product_uom_unit" />
+            <field name="uom_po_id" ref="uom.product_uom_unit" />
         </record>
         <record id="product_product_customs_expense" model="product.product">
             <field name="name">Customs Expense</field>
-            <field name="categ_id" ref="product.product_category_1"/>
+            <field name="categ_id" ref="product.product_category_1" />
             <field name="purchase_ok">True</field>
             <field name="standard_price">1.0</field>
             <field name="list_price">1.0</field>
             <field name="type">service</field>
-            <field name="uom_id" ref="uom.product_uom_unit"/>
-            <field name="uom_po_id" ref="uom.product_uom_unit"/>
+            <field name="uom_id" ref="uom.product_uom_unit" />
+            <field name="uom_po_id" ref="uom.product_uom_unit" />
         </record>
         <record id="product_product_delivery" model="product.product">
             <field name="name">Delivery Expense</field>
-            <field name="categ_id" ref="product.product_category_1"/>
+            <field name="categ_id" ref="product.product_category_1" />
             <field name="purchase_ok">True</field>
             <field name="standard_price">1.0</field>
             <field name="list_price">1.0</field>
             <field name="type">service</field>
-            <field name="uom_id" ref="uom.product_uom_unit"/>
-            <field name="uom_po_id" ref="uom.product_uom_unit"/>
+            <field name="uom_id" ref="uom.product_uom_unit" />
+            <field name="uom_po_id" ref="uom.product_uom_unit" />
             <!-- Usually this is standard VAT -->
-            <field name="supplier_taxes_id"
-                eval="[(6, 0, [ref('tax_22extraUE')])]"/>
+            <field name="supplier_taxes_id" eval="[(6, 0, [ref('tax_22extraUE')])]" />
         </record>
         <record id="product_product_stamp_duties" model="product.product">
             <field name="name">Stamp Duties</field>
-            <field name="categ_id" ref="product.product_category_1"/>
+            <field name="categ_id" ref="product.product_category_1" />
             <field name="purchase_ok">True</field>
             <field name="standard_price">1.0</field>
             <field name="list_price">1.0</field>
             <field name="type">service</field>
-            <field name="uom_id" ref="uom.product_uom_unit"/>
-            <field name="uom_po_id" ref="uom.product_uom_unit"/>
-            <field name="property_account_expense_id"
-                eval="[(6, 0, [ref('account_account_stamp_duties')])]"/>
+            <field name="uom_id" ref="uom.product_uom_unit" />
+            <field name="uom_po_id" ref="uom.product_uom_unit" />
+            <field
+                name="property_account_expense_id"
+                eval="[(6, 0, [ref('account_account_stamp_duties')])]"
+            />
         </record>
 
     </data>
diff --git a/l10n_it_bill_of_entry/models/account_invoice.py b/l10n_it_bill_of_entry/models/account_invoice.py
index 72249cc4bfb5..6989e69f1e15 100644
--- a/l10n_it_bill_of_entry/models/account_invoice.py
+++ b/l10n_it_bill_of_entry/models/account_invoice.py
@@ -1,36 +1,60 @@
-from odoo import fields, models, api
-from odoo.tools.translate import _
+from odoo import api, fields, models
 from odoo.exceptions import UserError
+from odoo.tools.translate import _
 
 
 class AccountInvoice(models.Model):
     _inherit = "account.invoice"
 
-    customs_doc_type = fields.Selection([
-        ('bill_of_entry', 'Bill of Entry'),
-        ('supplier_invoice', 'Supplier Invoice'),
-        ('forwarder_invoice', 'Forwarder Invoice'),
-    ], 'Customs Doc Type', readonly=True)
+    customs_doc_type = fields.Selection(
+        [
+            ("bill_of_entry", "Bill of Entry"),
+            ("supplier_invoice", "Supplier Invoice"),
+            ("forwarder_invoice", "Forwarder Invoice"),
+        ],
+        "Customs Doc Type",
+        readonly=True,
+    )
     supplier_bill_of_entry_ids = fields.Many2many(
-        'account.invoice', 'sboe_invoice_rel', 'sboe_id', 'invoice_id',
-        'Supplier Bill of Entries', readonly=True, copy=False)
+        "account.invoice",
+        "sboe_invoice_rel",
+        "sboe_id",
+        "invoice_id",
+        "Supplier Bill of Entries",
+        readonly=True,
+        copy=False,
+    )
     supplier_invoice_ids = fields.Many2many(
-        'account.invoice', 'sboe_invoice_rel', 'invoice_id', 'sboe_id',
-        'Supplier Invoices', copy=False)
+        "account.invoice",
+        "sboe_invoice_rel",
+        "invoice_id",
+        "sboe_id",
+        "Supplier Invoices",
+        copy=False,
+    )
     forwarder_invoice_id = fields.Many2one(
-        'account.invoice', 'Forwarder Invoice', copy=False)
+        "account.invoice", "Forwarder Invoice", copy=False
+    )
     forwarder_bill_of_entry_ids = fields.One2many(
-        'account.invoice', 'forwarder_invoice_id',
-        'Forward Bill of Entries', readonly=True, copy=False)
+        "account.invoice",
+        "forwarder_invoice_id",
+        "Forward Bill of Entries",
+        readonly=True,
+        copy=False,
+    )
     bill_of_entry_storno_id = fields.Many2one(
-        'account.move', 'Bill of Entry Storno', readonly=True, copy=False)
+        "account.move", "Bill of Entry Storno", readonly=True, copy=False
+    )
     bill_of_entries_count = fields.Integer(
-        "Bill of entries number", compute="_compute_bill_of_entries_count")
+        "Bill of entries number", compute="_compute_bill_of_entries_count"
+    )
     extra_supplier_invoices_count = fields.Integer(
-        "Supplier invoices number", compute="_compute_extra_supplier_invoices_count")
+        "Supplier invoices number", compute="_compute_extra_supplier_invoices_count"
+    )
     forwarder_bill_of_entries_count = fields.Integer(
         "Bill of entries for forwarder",
-        compute="_compute_forwarder_bill_of_entries_count")
+        compute="_compute_forwarder_bill_of_entries_count",
+    )
 
     @api.multi
     def _compute_bill_of_entries_count(self):
@@ -49,75 +73,76 @@ def _compute_forwarder_bill_of_entries_count(self):
 
     @api.multi
     def action_view_bill_of_entries(self):
-        boes = self.mapped('supplier_bill_of_entry_ids')
-        action = self.env.ref('account.action_vendor_bill_template').read()[0]
+        boes = self.mapped("supplier_bill_of_entry_ids")
+        action = self.env.ref("account.action_vendor_bill_template").read()[0]
         if len(boes) > 1:
-            action['domain'] = [('id', 'in', boes.ids)]
+            action["domain"] = [("id", "in", boes.ids)]
         elif len(boes) == 1:
-            form_view = [(self.env.ref('account.invoice_supplier_form').id, 'form')]
-            if 'views' in action:
-                action['views'] = form_view + [
-                    (state, view) for state, view in action['views'] if view != 'form']
+            form_view = [(self.env.ref("account.invoice_supplier_form").id, "form")]
+            if "views" in action:
+                action["views"] = form_view + [
+                    (state, view) for state, view in action["views"] if view != "form"
+                ]
             else:
-                action['views'] = form_view
-            action['res_id'] = boes.ids[0]
+                action["views"] = form_view
+            action["res_id"] = boes.ids[0]
         else:
-            action = {'type': 'ir.actions.act_window_close'}
+            action = {"type": "ir.actions.act_window_close"}
         return action
 
     @api.multi
     def action_view_extra_supplier_invoices(self):
-        invoices = self.mapped('supplier_invoice_ids')
-        action = self.env.ref('account.action_vendor_bill_template').read()[0]
+        invoices = self.mapped("supplier_invoice_ids")
+        action = self.env.ref("account.action_vendor_bill_template").read()[0]
         if len(invoices) > 1:
-            action['domain'] = [('id', 'in', invoices.ids)]
+            action["domain"] = [("id", "in", invoices.ids)]
         elif len(invoices) == 1:
-            form_view = [(self.env.ref('account.invoice_supplier_form').id, 'form')]
-            if 'views' in action:
-                action['views'] = form_view + [
-                    (state, view) for state, view in action['views'] if view != 'form']
+            form_view = [(self.env.ref("account.invoice_supplier_form").id, "form")]
+            if "views" in action:
+                action["views"] = form_view + [
+                    (state, view) for state, view in action["views"] if view != "form"
+                ]
             else:
-                action['views'] = form_view
-            action['res_id'] = invoices.ids[0]
+                action["views"] = form_view
+            action["res_id"] = invoices.ids[0]
         else:
-            action = {'type': 'ir.actions.act_window_close'}
+            action = {"type": "ir.actions.act_window_close"}
         return action
 
     @api.multi
     def action_view_forwarder_bill_of_entries(self):
-        boes = self.mapped('forwarder_bill_of_entry_ids')
-        action = self.env.ref('account.action_vendor_bill_template').read()[0]
+        boes = self.mapped("forwarder_bill_of_entry_ids")
+        action = self.env.ref("account.action_vendor_bill_template").read()[0]
         if len(boes) > 1:
-            action['domain'] = [('id', 'in', boes.ids)]
+            action["domain"] = [("id", "in", boes.ids)]
         elif len(boes) == 1:
-            form_view = [(self.env.ref('account.invoice_supplier_form').id, 'form')]
-            if 'views' in action:
-                action['views'] = form_view + [
-                    (state, view) for state, view in action['views'] if view != 'form']
+            form_view = [(self.env.ref("account.invoice_supplier_form").id, "form")]
+            if "views" in action:
+                action["views"] = form_view + [
+                    (state, view) for state, view in action["views"] if view != "form"
+                ]
             else:
-                action['views'] = form_view
-            action['res_id'] = boes.ids[0]
+                action["views"] = form_view
+            action["res_id"] = boes.ids[0]
         else:
-            action = {'type': 'ir.actions.act_window_close'}
+            action = {"type": "ir.actions.act_window_close"}
         return action
 
     @api.multi
     def action_move_create(self):
         res = super(AccountInvoice, self).action_move_create()
 
-        AccountMove = self.env['account.move']
-        AccountMoveLine = self.env['account.move.line']
+        AccountMove = self.env["account.move"]
+        AccountMoveLine = self.env["account.move.line"]
         for invoice in self:
-            if invoice.customs_doc_type == 'forwarder_invoice':
+            if invoice.customs_doc_type == "forwarder_invoice":
                 if not invoice.forwarder_bill_of_entry_ids:
                     raise UserError(_("No bill of entries found for this invoice"))
                 for bill_of_entry in invoice.forwarder_bill_of_entry_ids:
-                    if bill_of_entry.state not in ('open', 'paid'):
+                    if bill_of_entry.state not in ("open", "paid"):
                         raise UserError(
-                            _('Bill of entry %s is in state %s')
-                            % (
-                                bill_of_entry.partner_id.name,
-                                bill_of_entry.state)
+                            _("Bill of entry %s is in state %s")
+                            % (bill_of_entry.partner_id.name, bill_of_entry.state)
                         )
                 advance_customs_vat_line = False
                 for line in invoice.invoice_line_ids:
@@ -125,9 +150,9 @@ def action_move_create(self):
                         advance_customs_vat_line = True
                         break
                 boe_tax_rates = invoice.forwarder_bill_of_entry_ids.mapped(
-                    "invoice_line_ids.invoice_line_tax_ids.amount")
-                boe_amounts = invoice.forwarder_bill_of_entry_ids.mapped(
-                    "amount_total")
+                    "invoice_line_ids.invoice_line_tax_ids.amount"
+                )
+                boe_amounts = invoice.forwarder_bill_of_entry_ids.mapped("amount_total")
 
                 # In caso di dichiarazione d'intento inviata alla dogana,
                 # la dogana non addebita IVA.
@@ -136,81 +161,72 @@ def action_move_create(self):
                     # Nessuna registrazione di storno è necessaria
                     continue
 
-                if (
-                    not advance_customs_vat_line
-                    and list(set(boe_tax_rates)) != [0.0]
-                ):
-                    raise UserError(
-                        _("Forwarder invoice %s does not have lines with "
-                          "'Advance Customs Vat'")
-                        % invoice.number)
-                if not invoice.company_id.bill_of_entry_journal_id:
+                if not advance_customs_vat_line and list(set(boe_tax_rates)) != [0.0]:
                     raise UserError(
-                        _('No Bill of entry Storno journal configured')
+                        _(
+                            "Forwarder invoice %s does not have lines with "
+                            "'Advance Customs Vat'"
+                        )
+                        % invoice.number
                     )
+                if not invoice.company_id.bill_of_entry_journal_id:
+                    raise UserError(_("No Bill of entry Storno journal configured"))
                 move_vals = {
-                    'journal_id': (
-                        invoice.company_id.bill_of_entry_journal_id.id),
-                    'date': invoice.date_invoice,
+                    "journal_id": (invoice.company_id.bill_of_entry_journal_id.id),
+                    "date": invoice.date_invoice,
                 }
                 move_lines = []
                 for inv_line in invoice.invoice_line_ids:
                     if inv_line.advance_customs_vat:
                         line_vals = {
-                            'name': _("Customs expenses"),
-                            'account_id': inv_line.account_id.id,
-                            'debit': 0.0,
-                            'credit': inv_line.price_subtotal,
-                            'partner_id': inv_line.partner_id.id,
+                            "name": _("Customs expenses"),
+                            "account_id": inv_line.account_id.id,
+                            "debit": 0.0,
+                            "credit": inv_line.price_subtotal,
+                            "partner_id": inv_line.partner_id.id,
                         }
                         if inv_line.product_id:
-                            line_vals['product_id'] = inv_line.product_id.id
+                            line_vals["product_id"] = inv_line.product_id.id
                         move_lines.append((0, 0, line_vals))
                 for bill_of_entry in invoice.forwarder_bill_of_entry_ids:
                     line_vals = {
-                        'name': _("Customs supplier"),
-                        'account_id': bill_of_entry.account_id.id,
-                        'debit': bill_of_entry.amount_total,
-                        'credit': 0.0,
-                        'partner_id': bill_of_entry.partner_id.id,
+                        "name": _("Customs supplier"),
+                        "account_id": bill_of_entry.account_id.id,
+                        "debit": bill_of_entry.amount_total,
+                        "credit": 0.0,
+                        "partner_id": bill_of_entry.partner_id.id,
                     }
                     move_lines.append((0, 0, line_vals))
                     for boe_line in bill_of_entry.invoice_line_ids:
                         if boe_line.invoice_line_tax_ids:
                             if len(boe_line.invoice_line_tax_ids) > 1:
                                 raise UserError(
-                                    _("Can't handle more than 1 tax for line "
-                                      "%s") % boe_line.name)
+                                    _("Can't handle more than 1 tax for line " "%s")
+                                    % boe_line.name
+                                )
 
                         line_vals = {
-                            'name': _("Extra UE expenses"),
-                            'account_id': boe_line.account_id.id,
-                            'debit': 0.0,
-                            'credit': boe_line.price_subtotal,
-                            'partner_id': boe_line.partner_id.id,
+                            "name": _("Extra UE expenses"),
+                            "account_id": boe_line.account_id.id,
+                            "debit": 0.0,
+                            "credit": boe_line.price_subtotal,
+                            "partner_id": boe_line.partner_id.id,
                         }
                         if boe_line.product_id:
-                            line_vals['product_id'] = boe_line.product_id.id
+                            line_vals["product_id"] = boe_line.product_id.id
                         move_lines.append((0, 0, line_vals))
-                move_vals['line_ids'] = move_lines
+                move_vals["line_ids"] = move_lines
                 move = AccountMove.create(move_vals)
                 move.action_post()
-                invoice.write(
-                    {'bill_of_entry_storno_id': move.id})
+                invoice.write({"bill_of_entry_storno_id": move.id})
 
                 reconcile_ids = []
                 for move_line in move.line_ids:
                     for boe in invoice.forwarder_bill_of_entry_ids:
-                        if (
-                            move_line.account_id.id ==
-                            boe.account_id.id
-                        ):
+                        if move_line.account_id.id == boe.account_id.id:
                             reconcile_ids.append(move_line.id)
                             for boe_move_line in boe.move_id.line_ids:
-                                if (
-                                    boe_move_line.account_id.id ==
-                                    boe.account_id.id
-                                ):
+                                if boe_move_line.account_id.id == boe.account_id.id:
                                     reconcile_ids.append(boe_move_line.id)
 
                 AccountMoveLine.browse(reconcile_ids).reconcile()
@@ -221,9 +237,11 @@ def action_cancel(self):
         for invoice in self:
             for boe in invoice.forwarder_bill_of_entry_ids:
                 move = boe.move_id
-                rec_lines = move.mapped('line_ids').filtered(
-                    'full_reconcile_id'
-                ).mapped('full_reconcile_id.reconciled_line_ids')
+                rec_lines = (
+                    move.mapped("line_ids")
+                    .filtered("full_reconcile_id")
+                    .mapped("full_reconcile_id.reconciled_line_ids")
+                )
                 rec_lines.remove_move_reconcile()
             if invoice.bill_of_entry_storno_id:
                 invoice.bill_of_entry_storno_id.button_cancel()
@@ -238,19 +256,24 @@ def _check_no_taxes(self):
     def generate_bill_of_entry(self):
         self.ensure_one()
         if self.customs_doc_type != "supplier_invoice":
-            raise UserError(_(
-                "You can generate bill of entry from extra UE supplier invoice only"))
+            raise UserError(
+                _("You can generate bill of entry from extra UE supplier invoice only")
+            )
         if not self.company_id.bill_of_entry_tax_id:
-            raise UserError(_(
-                "Please set 'Bill of entry tax' in accounting configuration"))
+            raise UserError(
+                _("Please set 'Bill of entry tax' in accounting configuration")
+            )
         if not self.company_id.bill_of_entry_partner_id:
-            raise UserError(_(
-                "Please set 'Bill of entry partner' in accounting configuration"))
+            raise UserError(
+                _("Please set 'Bill of entry partner' in accounting configuration")
+            )
         self._check_no_taxes()
-        boe_inv = self.copy(default={
-            "partner_id": self.company_id.bill_of_entry_partner_id.id,
-            "customs_doc_type": "bill_of_entry",
-        })
+        boe_inv = self.copy(
+            default={
+                "partner_id": self.company_id.bill_of_entry_partner_id.id,
+                "customs_doc_type": "bill_of_entry",
+            }
+        )
         for line in boe_inv.invoice_line_ids:
             tax = self.company_id.bill_of_entry_tax_id
             if line.product_id.supplier_taxes_id:
@@ -258,14 +281,15 @@ def generate_bill_of_entry(self):
             line.invoice_line_tax_ids = [(6, 0, [tax.id])]
         boe_inv.supplier_invoice_ids = [(4, self.id)]
         boe_inv.compute_taxes()
-        action = self.env.ref('account.action_vendor_bill_template').read()[0]
-        form_view = [(self.env.ref('account.invoice_supplier_form').id, 'form')]
-        if 'views' in action:
-            action['views'] = form_view + [
-                (state, view) for state, view in action['views'] if view != 'form']
+        action = self.env.ref("account.action_vendor_bill_template").read()[0]
+        form_view = [(self.env.ref("account.invoice_supplier_form").id, "form")]
+        if "views" in action:
+            action["views"] = form_view + [
+                (state, view) for state, view in action["views"] if view != "form"
+            ]
         else:
-            action['views'] = form_view
-        action['res_id'] = boe_inv.ids[0]
+            action["views"] = form_view
+        action["res_id"] = boe_inv.ids[0]
         return action
 
 
diff --git a/l10n_it_bill_of_entry/models/company.py b/l10n_it_bill_of_entry/models/company.py
index 8630fce8d7e0..4bd34089612a 100644
--- a/l10n_it_bill_of_entry/models/company.py
+++ b/l10n_it_bill_of_entry/models/company.py
@@ -2,37 +2,46 @@
 
 
 class Company(models.Model):
-    _inherit = 'res.company'
+    _inherit = "res.company"
 
     bill_of_entry_journal_id = fields.Many2one(
-        'account.journal', 'Bill of entry Storno journal',
+        "account.journal",
+        "Bill of entry Storno journal",
         help="Journal used for reconciliation of bill of entries",
     )
     bill_of_entry_tax_id = fields.Many2one(
-        'account.tax', 'Bill of entry tax',
+        "account.tax",
+        "Bill of entry tax",
         help="Tax used in bill of entries",
     )
     bill_of_entry_partner_id = fields.Many2one(
-        'res.partner', 'Bill of entry partner',
+        "res.partner",
+        "Bill of entry partner",
         help="Supplier used in bill of entries",
     )
 
 
 class AccountConfigSettings(models.TransientModel):
-    _inherit = 'res.config.settings'
+    _inherit = "res.config.settings"
 
     bill_of_entry_journal_id = fields.Many2one(
-        'account.journal', related='company_id.bill_of_entry_journal_id',
-        string="Bill of entry Storno journal", readonly=False,
+        "account.journal",
+        related="company_id.bill_of_entry_journal_id",
+        string="Bill of entry Storno journal",
+        readonly=False,
         help="Journal used for reconciliation of bill of entries",
     )
     bill_of_entry_tax_id = fields.Many2one(
-        'account.tax', related='company_id.bill_of_entry_tax_id',
-        string="Bill of entry tax", readonly=False,
+        "account.tax",
+        related="company_id.bill_of_entry_tax_id",
+        string="Bill of entry tax",
+        readonly=False,
         help="Tax used in bill of entries, when product is not present",
     )
     bill_of_entry_partner_id = fields.Many2one(
-        'res.partner', related='company_id.bill_of_entry_partner_id',
-        string="Bill of entry partner", readonly=False,
+        "res.partner",
+        related="company_id.bill_of_entry_partner_id",
+        string="Bill of entry partner",
+        readonly=False,
         help="Supplier used in bill of entries",
     )
diff --git a/l10n_it_bill_of_entry/tests/__init__.py b/l10n_it_bill_of_entry/tests/__init__.py
index 0bdae6def7f2..705f4e03d7cc 100644
--- a/l10n_it_bill_of_entry/tests/__init__.py
+++ b/l10n_it_bill_of_entry/tests/__init__.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 ##############################################################################
 #
 #    Copyright (C) 2017 CQ Creativi Quadrati (http://www.creativiquadrati.it)
diff --git a/l10n_it_bill_of_entry/tests/test_bill_of_entry.py b/l10n_it_bill_of_entry/tests/test_bill_of_entry.py
index 15578998cabe..20405fedaae3 100644
--- a/l10n_it_bill_of_entry/tests/test_bill_of_entry.py
+++ b/l10n_it_bill_of_entry/tests/test_bill_of_entry.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 ##############################################################################
 #
 #    Copyright (C) 2017 CQ Creativi Quadrati (http://www.creativiquadrati.it)
@@ -12,25 +11,24 @@
 
 
 class TestBillOfEntry(TransactionCase):
-
-    def _get_invline_vals(self, product, quantity=1., price_unit=1.):
+    def _get_invline_vals(self, product, quantity=1.0, price_unit=1.0):
         vals = {
-            'product_id': product.id,
-            'quantity': quantity,
-            'price_unit': price_unit,
+            "product_id": product.id,
+            "quantity": quantity,
+            "price_unit": price_unit,
         }
         return vals
 
     def _create_invoice(self, partner, customs_doc_type, journal):
         vals = {
-            'type': 'in_invoice',
-            'partner_id': partner.id,
+            "type": "in_invoice",
+            "partner_id": partner.id,
         }
         if customs_doc_type:
-            vals['customs_doc_type'] = customs_doc_type
+            vals["customs_doc_type"] = customs_doc_type
         if journal:
-            vals['journal_id'] = journal.id
-        invoice = self.env['account.invoice'].create(vals)
+            vals["journal_id"] = journal.id
+        invoice = self.env["account.invoice"].create(vals)
         invoice._onchange_partner_id()
         invoice._onchange_journal_id()
         invoice._convert_to_write(invoice._cache)
@@ -38,12 +36,12 @@ def _create_invoice(self, partner, customs_doc_type, journal):
 
     def _create_invoice_line(self, invoice, vals):
         new_vals = {
-            'invoice_id': invoice.id,
-            'account_id': self.account_revenue.id,
-            'name': 'something in',
+            "invoice_id": invoice.id,
+            "account_id": self.account_revenue.id,
+            "name": "something in",
         }
         vals.update(new_vals)
-        line = self.env['account.invoice.line'].create(vals)
+        line = self.env["account.invoice.line"].create(vals)
         line._onchange_product_id()
         line._convert_to_write(line._cache)
         return line
@@ -51,95 +49,105 @@ def _create_invoice_line(self, invoice, vals):
     def setUp(self):
         super(TestBillOfEntry, self).setUp()
 
-        self.account_model = self.env['account.account']
-        self.tax_model = self.env['account.tax']
-        self.journal_model = self.env['account.journal']
-        self.invoice_model = self.env['account.invoice']
-        self.inv_line_model = self.env['account.invoice.line']
-        self.move_line_model = self.env['account.move.line']
-        self.fp_model = self.env['account.fiscal.position']
-        self.fp_tax_model = self.env['account.fiscal.position.tax']
+        self.account_model = self.env["account.account"]
+        self.tax_model = self.env["account.tax"]
+        self.journal_model = self.env["account.journal"]
+        self.invoice_model = self.env["account.invoice"]
+        self.inv_line_model = self.env["account.invoice.line"]
+        self.move_line_model = self.env["account.move.line"]
+        self.fp_model = self.env["account.fiscal.position"]
+        self.fp_tax_model = self.env["account.fiscal.position.tax"]
 
         # Default accounts for invoice line account_id
-        revenue_acctype_id = self.env.ref(
-            'account.data_account_type_revenue'
-        ).id
+        revenue_acctype_id = self.env.ref("account.data_account_type_revenue").id
         self.account_revenue = self.account_model.search(
-            [('user_type_id', '=', revenue_acctype_id)], limit=1
+            [("user_type_id", "=", revenue_acctype_id)], limit=1
         )
         # Default purchase journal
-        self.journal = self.journal_model.search(
-            [('type', '=', 'purchase')], limit=1
-        )
+        self.journal = self.journal_model.search([("type", "=", "purchase")], limit=1)
         self.journal.update_posted = True
         # Extra EU purchase journal for differentiate
         # extra EU purchase invoices from ordinary ones
         self.extra_journal = self.env.ref(
-            'l10n_it_bill_of_entry.account_journal_purchase_extraEU'
+            "l10n_it_bill_of_entry.account_journal_purchase_extraEU"
         )
         # Bill of entry storno journal
-        self.company = self.env.ref('base.main_company')
-        self.bill_of_entry_journal = self.journal_model.create({
-            'name': 'bill_of_entry_journal',
-            'type': 'general',
-            'code': 'BOE',
-            'update_posted': True
-        })
+        self.company = self.env.ref("base.main_company")
+        self.bill_of_entry_journal = self.journal_model.create(
+            {
+                "name": "bill_of_entry_journal",
+                "type": "general",
+                "code": "BOE",
+                "update_posted": True,
+            }
+        )
         self.company.bill_of_entry_journal_id = self.bill_of_entry_journal.id
 
         # Extra EU fiscal position tax correspondence
-        self.tax22 = self.tax_model.create({
-            'name': '22%',
-            'amount': 22,
-            'amount_type': 'percent',
-            'type_tax_use': 'purchase',
-            'tax_group_id': self.env.ref('account.tax_group_taxes').id
-        })
+        self.tax22 = self.tax_model.create(
+            {
+                "name": "22%",
+                "amount": 22,
+                "amount_type": "percent",
+                "type_tax_use": "purchase",
+                "tax_group_id": self.env.ref("account.tax_group_taxes").id,
+            }
+        )
         self.fiscpos_extra = self.env.ref(
-            'l10n_it_bill_of_entry.fiscal_position_extraEU'
+            "l10n_it_bill_of_entry.fiscal_position_extraEU"
+        )
+        self.fp_tax_model.create(
+            {
+                "position_id": self.fiscpos_extra.id,
+                "tax_src_id": self.tax22.id,
+            }
         )
-        self.fp_tax_model.create({
-            'position_id': self.fiscpos_extra.id,
-            'tax_src_id': self.tax22.id,
-        })
 
         # Delivery Expense account
-        self.account_delivery_expense = \
-            self.env.ref('l10n_it_bill_of_entry.account_account_delivery_expense')
+        self.account_delivery_expense = self.env.ref(
+            "l10n_it_bill_of_entry.account_account_delivery_expense"
+        )
 
         # Extra EU purchase journal
-        self.journal_extra = \
-            self.env.ref('l10n_it_bill_of_entry.account_journal_purchase_extraEU')
+        self.journal_extra = self.env.ref(
+            "l10n_it_bill_of_entry.account_journal_purchase_extraEU"
+        )
 
         # Products
-        self.product1 = self.env.ref('product.product_delivery_01')
-        self.product1.write({
-            'supplier_taxes_id': [(6, 0, [self.tax22.id])],
-        })
-        self.tax_22extraUE = self.env.ref('l10n_it_bill_of_entry.tax_22extraUE')
-        self.product_extra = \
-            self.env.ref('l10n_it_bill_of_entry.product_product_extraEU_purchase')
+        self.product1 = self.env.ref("product.product_delivery_01")
+        self.product1.write(
+            {
+                "supplier_taxes_id": [(6, 0, [self.tax22.id])],
+            }
+        )
+        self.tax_22extraUE = self.env.ref("l10n_it_bill_of_entry.tax_22extraUE")
+        self.product_extra = self.env.ref(
+            "l10n_it_bill_of_entry.product_product_extraEU_purchase"
+        )
         self.product_extra.supplier_taxes_id = [(6, 0, self.tax_22extraUE.ids)]
-        self.adv_customs_expense = \
-            self.env.ref('l10n_it_bill_of_entry.product_product_adv_customs_expense')
-        self.customs_expense = \
-            self.env.ref('l10n_it_bill_of_entry.product_product_customs_expense')
-        self.product_delivery = \
-            self.env.ref('l10n_it_bill_of_entry.product_product_delivery')
+        self.adv_customs_expense = self.env.ref(
+            "l10n_it_bill_of_entry.product_product_adv_customs_expense"
+        )
+        self.customs_expense = self.env.ref(
+            "l10n_it_bill_of_entry.product_product_customs_expense"
+        )
+        self.product_delivery = self.env.ref(
+            "l10n_it_bill_of_entry.product_product_delivery"
+        )
         self.product_delivery.supplier_taxes_id = [(6, 0, [self.tax22.id])]
-        self.product_stamp = \
-            self.env.ref('l10n_it_bill_of_entry.product_product_stamp_duties')
+        self.product_stamp = self.env.ref(
+            "l10n_it_bill_of_entry.product_product_stamp_duties"
+        )
 
         # Partners
-        self.customs = self.env.ref('l10n_it_bill_of_entry.partner_customs')
-        self.supplier = self.env.ref('base.res_partner_1')
-        self.supplier.property_account_position_id = \
-            self.fiscpos_extra.id
-        self.forwarder = self.env.ref('base.res_partner_12')
+        self.customs = self.env.ref("l10n_it_bill_of_entry.partner_customs")
+        self.supplier = self.env.ref("base.res_partner_1")
+        self.supplier.property_account_position_id = self.fiscpos_extra.id
+        self.forwarder = self.env.ref("base.res_partner_12")
 
         # Extra EU supplier invoice - draft state
         self.supplier_invoice = self._create_invoice(
-            self.supplier, 'supplier_invoice', self.journal_extra
+            self.supplier, "supplier_invoice", self.journal_extra
         )
         line_vals = self._get_invline_vals(self.product1, 1, 2500)
         self._create_invoice_line(self.supplier_invoice, line_vals)
@@ -148,34 +156,34 @@ def setUp(self):
 
         # Bill of Entry - draft state
         self.bill_of_entry = self._create_invoice(
-            self.customs, 'bill_of_entry', self.journal
+            self.customs, "bill_of_entry", self.journal
         )
         line_vals = self._get_invline_vals(self.product_extra, 1, 2500)
         self._create_invoice_line(self.bill_of_entry, line_vals)
         self.bill_of_entry.compute_taxes()
-        self.bill_of_entry.write({
-            'supplier_invoice_ids': [(6, 0, [self.supplier_invoice.id])]
-        })
+        self.bill_of_entry.write(
+            {"supplier_invoice_ids": [(6, 0, [self.supplier_invoice.id])]}
+        )
         # self.bill_of_entry.action_invoice_open()
 
         # Forwarder Invoice - draft state
         self.forwarder_invoice = self._create_invoice(
-            self.forwarder, 'forwarder_invoice', self.journal
+            self.forwarder, "forwarder_invoice", self.journal
         )
         line_vals = self._get_invline_vals(self.product_delivery, 1, 300)
         self._create_invoice_line(self.forwarder_invoice, line_vals)
-        line_vals = self._get_invline_vals(
-            self.adv_customs_expense, 1, 550
-        )
+        line_vals = self._get_invline_vals(self.adv_customs_expense, 1, 550)
         self.adv_customs_expense_line = self._create_invoice_line(
             self.forwarder_invoice, line_vals
         )
         self.adv_customs_expense_line.advance_customs_vat = True
         self.adv_customs_expense_line.invoice_line_tax_ids = [(6, 0, [])]
         self.forwarder_invoice.compute_taxes()
-        self.forwarder_invoice.write({
-            'forwarder_bill_of_entry_ids': [(4, self.bill_of_entry.id)],
-        })
+        self.forwarder_invoice.write(
+            {
+                "forwarder_bill_of_entry_ids": [(4, self.bill_of_entry.id)],
+            }
+        )
 
     def test_storno_create(self):
 
@@ -192,48 +200,46 @@ def test_storno_create(self):
 
         # Advance Customs Expense account.move.line
         move_line_domain = [
-            ('account_id', '=', self.adv_customs_expense_line.account_id.id),
-            ('debit', '=', 0.),
-            ('credit', '=', self.adv_customs_expense_line.price_subtotal),
-            ('partner_id', '=', self.adv_customs_expense_line.partner_id.id),
-            ('product_id', '=', self.adv_customs_expense_line.product_id.id)
+            ("account_id", "=", self.adv_customs_expense_line.account_id.id),
+            ("debit", "=", 0.0),
+            ("credit", "=", self.adv_customs_expense_line.price_subtotal),
+            ("partner_id", "=", self.adv_customs_expense_line.partner_id.id),
+            ("product_id", "=", self.adv_customs_expense_line.product_id.id),
         ]
-        adv_customs_expense_moveline = \
-            self.move_line_model.search(move_line_domain)
+        adv_customs_expense_moveline = self.move_line_model.search(move_line_domain)
         self.assertEqual(len(adv_customs_expense_moveline), 1)
 
         # Customs Expense account.move.lines
         move_line_domain = [
-            ('account_id', '=', self.bill_of_entry.account_id.id),
-            ('debit', '=', self.bill_of_entry.amount_total),
-            ('credit', '=', 0.),
-            ('partner_id', '=', self.bill_of_entry.partner_id.id)
+            ("account_id", "=", self.bill_of_entry.account_id.id),
+            ("debit", "=", self.bill_of_entry.amount_total),
+            ("credit", "=", 0.0),
+            ("partner_id", "=", self.bill_of_entry.partner_id.id),
         ]
-        customs_expense_moveline = \
-            self.move_line_model.search(move_line_domain)
+        customs_expense_moveline = self.move_line_model.search(move_line_domain)
         self.assertEqual(len(customs_expense_moveline), 1)
 
         # Extra EU goods purchase account.move.lines
         for boe_line in self.bill_of_entry.invoice_line_ids:
             move_line_domain = [
-                ('account_id', '=', boe_line.account_id.id),
-                ('debit', '=', 0.),
-                ('credit', '=', boe_line.price_subtotal),
-                ('partner_id', '=', boe_line.partner_id.id),
-                ('product_id', '=', boe_line.product_id.id)
+                ("account_id", "=", boe_line.account_id.id),
+                ("debit", "=", 0.0),
+                ("credit", "=", boe_line.price_subtotal),
+                ("partner_id", "=", boe_line.partner_id.id),
+                ("product_id", "=", boe_line.product_id.id),
             ]
-            extraeu_expense_moveline = \
-                self.move_line_model.search(move_line_domain)
+            extraeu_expense_moveline = self.move_line_model.search(move_line_domain)
             self.assertEqual(len(extraeu_expense_moveline), 1)
 
         # Storno - BoE reconciliation (supplier debit account)
-        storno_reconcile_ids = storno.line_ids.filtered(
-            lambda l: l.full_reconcile_id
-        ).mapped('full_reconcile_id').ids
-        boe_reconcile_ids = self.bill_of_entry.move_id.line_ids.filtered(
-            lambda l: l.full_reconcile_id
-        ).mapped('full_reconcile_id').ids
-        self.assertEqual(
-            sorted(storno_reconcile_ids),
-            sorted(boe_reconcile_ids)
+        storno_reconcile_ids = (
+            storno.line_ids.filtered(lambda l: l.full_reconcile_id)
+            .mapped("full_reconcile_id")
+            .ids
+        )
+        boe_reconcile_ids = (
+            self.bill_of_entry.move_id.line_ids.filtered(lambda l: l.full_reconcile_id)
+            .mapped("full_reconcile_id")
+            .ids
         )
+        self.assertEqual(sorted(storno_reconcile_ids), sorted(boe_reconcile_ids))
diff --git a/l10n_it_bill_of_entry/views/account_invoice_view.xml b/l10n_it_bill_of_entry/views/account_invoice_view.xml
index 942bec9a9a64..80b5f771afd8 100644
--- a/l10n_it_bill_of_entry/views/account_invoice_view.xml
+++ b/l10n_it_bill_of_entry/views/account_invoice_view.xml
@@ -1,138 +1,211 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8" ?>
 <odoo>
 
     <record model="ir.ui.view" id="invoice_supplier_boe_form">
         <field name="name">invoice.supplier.boe.form</field>
         <field name="model">account.invoice</field>
-        <field name="inherit_id" ref="account.invoice_supplier_form"/>
+        <field name="inherit_id" ref="account.invoice_supplier_form" />
         <field name="arch" type="xml">
             <xpath expr="//sheet/div[1]" position="before">
                 <div class="oe_button_box" name="button_box">
-                    <button name="action_view_bill_of_entries"
+                    <button
+                        name="action_view_bill_of_entries"
                         type="object"
                         class="oe_stat_button"
                         icon="fa-pencil-square-o"
-                        attrs="{'invisible': [('bill_of_entries_count', '=', 0)]}">
-                        <field name="bill_of_entries_count" widget="statinfo" string="Bill of entries"/>
+                        attrs="{'invisible': [('bill_of_entries_count', '=', 0)]}"
+                    >
+                        <field
+                            name="bill_of_entries_count"
+                            widget="statinfo"
+                            string="Bill of entries"
+                        />
                     </button>
-                    <button name="action_view_extra_supplier_invoices"
+                    <button
+                        name="action_view_extra_supplier_invoices"
                         type="object"
                         class="oe_stat_button"
                         icon="fa-pencil-square-o"
-                        attrs="{'invisible': [('extra_supplier_invoices_count', '=', 0)]}">
-                        <field name="extra_supplier_invoices_count" widget="statinfo" string="Extra invoices"/>
+                        attrs="{'invisible': [('extra_supplier_invoices_count', '=', 0)]}"
+                    >
+                        <field
+                            name="extra_supplier_invoices_count"
+                            widget="statinfo"
+                            string="Extra invoices"
+                        />
                     </button>
-                    <button name="action_view_forwarder_bill_of_entries"
+                    <button
+                        name="action_view_forwarder_bill_of_entries"
                         type="object"
                         class="oe_stat_button"
                         icon="fa-pencil-square-o"
-                        attrs="{'invisible': [('forwarder_bill_of_entries_count', '=', 0)]}">
-                        <field name="forwarder_bill_of_entries_count" widget="statinfo" string="Bill of entries"/>
+                        attrs="{'invisible': [('forwarder_bill_of_entries_count', '=', 0)]}"
+                    >
+                        <field
+                            name="forwarder_bill_of_entries_count"
+                            widget="statinfo"
+                            string="Bill of entries"
+                        />
                     </button>
                 </div>
             </xpath>
             <xpath expr="//button[@name='action_invoice_draft']" position="after">
-                <button name="generate_bill_of_entry" class="oe_highlight"
-                        attrs="{'invisible': ['|', ('customs_doc_type', '!=', 'supplier_invoice'), ('bill_of_entries_count', '!=', 0)]}"
-                        string="Generate bill of entry" type="object" groups="account.group_account_invoice"/>
+                <button
+                    name="generate_bill_of_entry"
+                    class="oe_highlight"
+                    attrs="{'invisible': ['|', ('customs_doc_type', '!=', 'supplier_invoice'), ('bill_of_entries_count', '!=', 0)]}"
+                    string="Generate bill of entry"
+                    type="object"
+                    groups="account.group_account_invoice"
+                />
             </xpath>
             <xpath expr="//field[@name='move_name']" position="after">
-                <field name="customs_doc_type"
-                    attrs="{'readonly': ['|',('state', '!=', 'draft'), ('forwarder_bill_of_entries_count', '!=', 0)]}"/>
+                <field
+                    name="customs_doc_type"
+                    attrs="{'readonly': ['|',('state', '!=', 'draft'), ('forwarder_bill_of_entries_count', '!=', 0)]}"
+                />
             </xpath>
             <xpath expr="//notebook/page[2]" position="after">
-                <page string="Customs" name="customs" attrs="{'invisible': [('customs_doc_type','not in', ['bill_of_entry', 'forwarder_invoice'])]}">
-                    <separator string="Supplier invoices" name="supplier_invoices" colspan="4"
-                        attrs="{'invisible': [('customs_doc_type','!=', 'bill_of_entry')]}"/>
-                    <field name="supplier_invoice_ids"
+                <page
+                    string="Customs"
+                    name="customs"
+                    attrs="{'invisible': [('customs_doc_type','not in', ['bill_of_entry', 'forwarder_invoice'])]}"
+                >
+                    <separator
+                        string="Supplier invoices"
+                        name="supplier_invoices"
+                        colspan="4"
+                        attrs="{'invisible': [('customs_doc_type','!=', 'bill_of_entry')]}"
+                    />
+                    <field
+                        name="supplier_invoice_ids"
                         attrs="{'invisible': [('customs_doc_type','!=', 'bill_of_entry')]}"
                         domain="[('customs_doc_type', '=', 'supplier_invoice')]"
-                        context="{'default_customs_doc_type': 'supplier_invoice'}"/>
+                        context="{'default_customs_doc_type': 'supplier_invoice'}"
+                    />
                     <group name="forwarder_invoice">
-                        <field name="forwarder_invoice_id"
+                        <field
+                            name="forwarder_invoice_id"
                             attrs="{'invisible': [('customs_doc_type','!=', 'bill_of_entry')]}"
                             domain="[('customs_doc_type','=', 'forwarder_invoice'), ('state', '=', 'draft')]"
-                            context="{'default_customs_doc_type': 'forwarder_invoice'}"/>
+                            context="{'default_customs_doc_type': 'forwarder_invoice'}"
+                        />
                     </group>
                     <group name="storno">
-                        <field name="bill_of_entry_storno_id"
-                            attrs="{'invisible': [('customs_doc_type','!=', 'forwarder_invoice')]}"/>
+                        <field
+                            name="bill_of_entry_storno_id"
+                            attrs="{'invisible': [('customs_doc_type','!=', 'forwarder_invoice')]}"
+                        />
                     </group>
                 </page>
             </xpath>
-            <xpath expr="//notebook/page[1]/field[@name='invoice_line_ids']/tree/field[@name='price_subtotal']" position="after">
-                <field name="advance_customs_vat" attrs="{'column_invisible': [('parent.customs_doc_type', '!=', 'forwarder_invoice')]}"/>
+            <xpath
+                expr="//notebook/page[1]/field[@name='invoice_line_ids']/tree/field[@name='price_subtotal']"
+                position="after"
+            >
+                <field
+                    name="advance_customs_vat"
+                    attrs="{'column_invisible': [('parent.customs_doc_type', '!=', 'forwarder_invoice')]}"
+                />
             </xpath>
         </field>
     </record>
 
-    <menuitem id="customs" name="Customs"
-          sequence="99" parent="account.menu_finance_payables"/>
+    <menuitem
+        id="customs"
+        name="Customs"
+        sequence="99"
+        parent="account.menu_finance_payables"
+    />
 
     <record id="action_supplier_invoice" model="ir.actions.act_window">
         <field name="name">Supplier invoices</field>
         <field name="res_model">account.invoice</field>
         <field name="view_type">form</field>
         <field name="view_mode">tree,kanban,form,calendar,pivot,graph,activity</field>
-        <field name="domain">[('type','=','in_invoice'), ('customs_doc_type', '=', 'supplier_invoice')]</field>
-        <field name="context">{'default_type': 'in_invoice', 'type': 'in_invoice', 'journal_type': 'purchase', 'default_customs_doc_type': 'supplier_invoice'}</field>
+        <field
+            name="domain"
+        >[('type','=','in_invoice'), ('customs_doc_type', '=', 'supplier_invoice')]</field>
+        <field
+            name="context"
+        >{'default_type': 'in_invoice', 'type': 'in_invoice', 'journal_type': 'purchase', 'default_customs_doc_type': 'supplier_invoice'}</field>
     </record>
     <record id="action_supplier_invoice_view1" model="ir.actions.act_window.view">
-        <field eval="1" name="sequence"/>
+        <field eval="1" name="sequence" />
         <field name="view_mode">tree</field>
-        <field name="view_id" ref="account.invoice_supplier_tree"/>
-        <field name="act_window_id" ref="action_supplier_invoice"/>
+        <field name="view_id" ref="account.invoice_supplier_tree" />
+        <field name="act_window_id" ref="action_supplier_invoice" />
     </record>
     <record id="action_supplier_invoice_view2" model="ir.actions.act_window.view">
-        <field eval="2" name="sequence"/>
+        <field eval="2" name="sequence" />
         <field name="view_mode">form</field>
-        <field name="view_id" ref="account.invoice_supplier_form"/>
-        <field name="act_window_id" ref="action_supplier_invoice"/>
+        <field name="view_id" ref="account.invoice_supplier_form" />
+        <field name="act_window_id" ref="action_supplier_invoice" />
     </record>
-    <menuitem action="action_supplier_invoice" id="menu_action_supplier_invoice" parent="customs"/>
+    <menuitem
+        action="action_supplier_invoice"
+        id="menu_action_supplier_invoice"
+        parent="customs"
+    />
 
     <record id="action_bill_of_entry" model="ir.actions.act_window">
         <field name="name">Bills of entry</field>
         <field name="res_model">account.invoice</field>
         <field name="view_type">form</field>
         <field name="view_mode">tree,kanban,form,calendar,pivot,graph,activity</field>
-        <field name="domain">[('type','=','in_invoice'), ('customs_doc_type', '=', 'bill_of_entry')]</field>
-        <field name="context">{'default_type': 'in_invoice', 'type': 'in_invoice', 'journal_type': 'purchase', 'default_customs_doc_type': 'bill_of_entry'}</field>
+        <field
+            name="domain"
+        >[('type','=','in_invoice'), ('customs_doc_type', '=', 'bill_of_entry')]</field>
+        <field
+            name="context"
+        >{'default_type': 'in_invoice', 'type': 'in_invoice', 'journal_type': 'purchase', 'default_customs_doc_type': 'bill_of_entry'}</field>
     </record>
     <record id="action_bill_of_entry_view1" model="ir.actions.act_window.view">
-        <field eval="1" name="sequence"/>
+        <field eval="1" name="sequence" />
         <field name="view_mode">tree</field>
-        <field name="view_id" ref="account.invoice_supplier_tree"/>
-        <field name="act_window_id" ref="action_bill_of_entry"/>
+        <field name="view_id" ref="account.invoice_supplier_tree" />
+        <field name="act_window_id" ref="action_bill_of_entry" />
     </record>
     <record id="action_bill_of_entry_view2" model="ir.actions.act_window.view">
-        <field eval="2" name="sequence"/>
+        <field eval="2" name="sequence" />
         <field name="view_mode">form</field>
-        <field name="view_id" ref="account.invoice_supplier_form"/>
-        <field name="act_window_id" ref="action_bill_of_entry"/>
+        <field name="view_id" ref="account.invoice_supplier_form" />
+        <field name="act_window_id" ref="action_bill_of_entry" />
     </record>
-    <menuitem action="action_bill_of_entry" id="menu_action_bill_of_entry" parent="customs"/>
+    <menuitem
+        action="action_bill_of_entry"
+        id="menu_action_bill_of_entry"
+        parent="customs"
+    />
 
     <record id="action_forwarder_invoice" model="ir.actions.act_window">
         <field name="name">Forwarder invoices</field>
         <field name="res_model">account.invoice</field>
         <field name="view_type">form</field>
         <field name="view_mode">tree,kanban,form,calendar,pivot,graph,activity</field>
-        <field name="domain">[('type','=','in_invoice'), ('customs_doc_type', '=', 'forwarder_invoice')]</field>
-        <field name="context">{'default_type': 'in_invoice', 'type': 'in_invoice', 'journal_type': 'purchase', 'default_customs_doc_type': 'forwarder_invoice'}</field>
+        <field
+            name="domain"
+        >[('type','=','in_invoice'), ('customs_doc_type', '=', 'forwarder_invoice')]</field>
+        <field
+            name="context"
+        >{'default_type': 'in_invoice', 'type': 'in_invoice', 'journal_type': 'purchase', 'default_customs_doc_type': 'forwarder_invoice'}</field>
     </record>
     <record id="action_forwarder_invoice_view1" model="ir.actions.act_window.view">
-        <field eval="1" name="sequence"/>
+        <field eval="1" name="sequence" />
         <field name="view_mode">tree</field>
-        <field name="view_id" ref="account.invoice_supplier_tree"/>
-        <field name="act_window_id" ref="action_forwarder_invoice"/>
+        <field name="view_id" ref="account.invoice_supplier_tree" />
+        <field name="act_window_id" ref="action_forwarder_invoice" />
     </record>
     <record id="action_forwarder_invoice_view2" model="ir.actions.act_window.view">
-        <field eval="2" name="sequence"/>
+        <field eval="2" name="sequence" />
         <field name="view_mode">form</field>
-        <field name="view_id" ref="account.invoice_supplier_form"/>
-        <field name="act_window_id" ref="action_forwarder_invoice"/>
+        <field name="view_id" ref="account.invoice_supplier_form" />
+        <field name="act_window_id" ref="action_forwarder_invoice" />
     </record>
-    <menuitem action="action_forwarder_invoice" id="menu_action_forwarder_invoice" parent="customs"/>
+    <menuitem
+        action="action_forwarder_invoice"
+        id="menu_action_forwarder_invoice"
+        parent="customs"
+    />
 
 </odoo>
diff --git a/l10n_it_bill_of_entry/views/company_view.xml b/l10n_it_bill_of_entry/views/company_view.xml
index 5d2d2440af3f..f2d2dfffcccc 100644
--- a/l10n_it_bill_of_entry/views/company_view.xml
+++ b/l10n_it_bill_of_entry/views/company_view.xml
@@ -1,33 +1,59 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8" ?>
 <odoo>
 
     <record id="view_boe_config_settings" model="ir.ui.view">
         <field name="name">view.boe.config.setting</field>
         <field name="model">res.config.settings</field>
-        <field name="inherit_id" ref="account.res_config_settings_view_form"/>
+        <field name="inherit_id" ref="account.res_config_settings_view_form" />
         <field name="arch" type="xml">
             <xpath expr="//div[@id='analytic']" position="after">
             <h2>Bill of entries</h2>
-                <div class="row mt16 o_settings_container" id="bill_of_entries_settings">
+                <div
+                    class="row mt16 o_settings_container"
+                    id="bill_of_entries_settings"
+                >
                     <div class="col-12 col-lg-6 o_setting_box">
-                        <div class="o_setting_left_pane"/>
+                        <div class="o_setting_left_pane" />
                         <div class="o_setting_right_pane">
-                            <span class="fa fa-lg fa-building-o" title="Values set here are company-specific." aria-label="Values set here are company-specific." groups="base.group_multi_company" role="img"/>
+                            <span
+                                class="fa fa-lg fa-building-o"
+                                title="Values set here are company-specific."
+                                aria-label="Values set here are company-specific."
+                                groups="base.group_multi_company"
+                                role="img"
+                            />
                             <div class="content-group">
                                 <div>
-                                    <label for="bill_of_entry_journal_id"/>
-                                    <div class="text-muted">Journal used for reconciliation of bill of entries</div>
-                                    <field name="bill_of_entry_journal_id" class="o_light_label" options="{'no_create': True}"/>
+                                    <label for="bill_of_entry_journal_id" />
+                                    <div
+                                        class="text-muted"
+                                    >Journal used for reconciliation of bill of entries</div>
+                                    <field
+                                        name="bill_of_entry_journal_id"
+                                        class="o_light_label"
+                                        options="{'no_create': True}"
+                                    />
                                 </div>
                                 <div>
-                                    <label for="bill_of_entry_tax_id"/>
-                                    <div class="text-muted">Tax used in bill of entries generation, when product is not present</div>
-                                    <field name="bill_of_entry_tax_id" class="o_light_label" options="{'no_create': True}"/>
+                                    <label for="bill_of_entry_tax_id" />
+                                    <div
+                                        class="text-muted"
+                                    >Tax used in bill of entries generation, when product is not present</div>
+                                    <field
+                                        name="bill_of_entry_tax_id"
+                                        class="o_light_label"
+                                        options="{'no_create': True}"
+                                    />
                                 </div>
                                 <div>
-                                    <label for="bill_of_entry_partner_id"/>
-                                    <div class="text-muted">Supplier used in bill of entries</div>
-                                    <field name="bill_of_entry_partner_id" class="o_light_label"/>
+                                    <label for="bill_of_entry_partner_id" />
+                                    <div
+                                        class="text-muted"
+                                    >Supplier used in bill of entries</div>
+                                    <field
+                                        name="bill_of_entry_partner_id"
+                                        class="o_light_label"
+                                    />
                                 </div>
                             </div>
                         </div>
diff --git a/setup/l10n_it_bill_of_entry/odoo/addons/l10n_it_bill_of_entry b/setup/l10n_it_bill_of_entry/odoo/addons/l10n_it_bill_of_entry
new file mode 120000
index 000000000000..3bd90230d238
--- /dev/null
+++ b/setup/l10n_it_bill_of_entry/odoo/addons/l10n_it_bill_of_entry
@@ -0,0 +1 @@
+../../../../l10n_it_bill_of_entry
\ No newline at end of file
diff --git a/setup/l10n_it_bill_of_entry/setup.py b/setup/l10n_it_bill_of_entry/setup.py
new file mode 100644
index 000000000000..28c57bb64031
--- /dev/null
+++ b/setup/l10n_it_bill_of_entry/setup.py
@@ -0,0 +1,6 @@
+import setuptools
+
+setuptools.setup(
+    setup_requires=['setuptools-odoo'],
+    odoo_addon=True,
+)

From 9e6e9f750900e9b53f1f7675673e9ba2aac6031e Mon Sep 17 00:00:00 2001
From: Simone Rubino <sir@takobi.online>
Date: Wed, 26 Oct 2022 17:59:23 +0200
Subject: [PATCH 20/20] [MIG] l10n_it_bill_of_entry: Migration to 14.0

---
 l10n_it_bill_of_entry/__init__.py             |   2 +
 l10n_it_bill_of_entry/__manifest__.py         |  21 +-
 .../demo/bill_of_entry_demo.xml               | 258 ++++++++-------
 l10n_it_bill_of_entry/i18n/it.po              | 197 ++++++------
 .../i18n/l10n_it_bill_of_entry.pot            | 184 ++++++-----
 .../migrations/13.0.1.0.0/post-migration.py   |  98 ++++++
 .../migrations/13.0.1.0.0/pre-migration.py    |  13 +
 l10n_it_bill_of_entry/models/__init__.py      |   4 +-
 .../models/account_invoice.py                 | 299 ------------------
 l10n_it_bill_of_entry/models/account_move.py  | 295 +++++++++++++++++
 l10n_it_bill_of_entry/models/company.py       |   9 +-
 l10n_it_bill_of_entry/readme/CONTRIBUTORS.rst |   2 +-
 l10n_it_bill_of_entry/tests/__init__.py       |   9 +-
 .../tests/test_bill_of_entry.py               | 198 +++++++-----
 .../views/account_invoice_view.xml            | 200 +++++++-----
 l10n_it_bill_of_entry/views/company_view.xml  |   4 +
 16 files changed, 982 insertions(+), 811 deletions(-)
 create mode 100644 l10n_it_bill_of_entry/migrations/13.0.1.0.0/post-migration.py
 create mode 100644 l10n_it_bill_of_entry/migrations/13.0.1.0.0/pre-migration.py
 delete mode 100644 l10n_it_bill_of_entry/models/account_invoice.py
 create mode 100644 l10n_it_bill_of_entry/models/account_move.py

diff --git a/l10n_it_bill_of_entry/__init__.py b/l10n_it_bill_of_entry/__init__.py
index 0ee8b5073e26..c7818ff10d29 100644
--- a/l10n_it_bill_of_entry/__init__.py
+++ b/l10n_it_bill_of_entry/__init__.py
@@ -1,2 +1,4 @@
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl).
+
 from . import models
 from . import tests
diff --git a/l10n_it_bill_of_entry/__manifest__.py b/l10n_it_bill_of_entry/__manifest__.py
index 223f763718d0..93b10284f9f5 100644
--- a/l10n_it_bill_of_entry/__manifest__.py
+++ b/l10n_it_bill_of_entry/__manifest__.py
@@ -1,19 +1,14 @@
-##############################################################################
-#
-#    Copyright (C) 2013-2017 Agile Business Group sagl (http://www.agilebg.com)
-#    @author Alex Comba <alex.comba@agilebg.com>
-#    @author Lorenzo Battistini <https://github.com/eLBati>
-#    Copyright (C) 2017 CQ Creativi Quadrati (http://www.creativiquadrati.it)
-#    @author Diego Bruselli <d.bruselli@creativiquadrati.it>
-#    Copyright (C) 2013
-#
-#    License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
-#
-##############################################################################
+# Copyright 2013-2017 Agile Business Group sagl (http://www.agilebg.com)
+# Copyright 2013-2017 Alex Comba <alex.comba@agilebg.com>
+# Copyright 2013-2017 Lorenzo Battistini <https://github.com/eLBati>
+# Copyright 2017 CQ Creativi Quadrati (http://www.creativiquadrati.it)
+# Copyright 2017 Diego Bruselli <d.bruselli@creativiquadrati.it>
+# Copyright 2022 Simone Rubino - TAKOBI
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl).
 
 {
     "name": "ITA - Bolle doganali",
-    "version": "12.0.1.0.1",
+    "version": "14.0.1.0.0",
     "category": "Localization/Italy",
     "author": "Agile Business Group, CQ Creativi Quadrati, TAKOBI, "
     "Odoo Community Association (OCA)",
diff --git a/l10n_it_bill_of_entry/demo/bill_of_entry_demo.xml b/l10n_it_bill_of_entry/demo/bill_of_entry_demo.xml
index 0238a7ecf280..0d47029538b8 100644
--- a/l10n_it_bill_of_entry/demo/bill_of_entry_demo.xml
+++ b/l10n_it_bill_of_entry/demo/bill_of_entry_demo.xml
@@ -1,142 +1,138 @@
 <?xml version="1.0" encoding="utf-8" ?>
+<!--
+  ~ Copyright 2022 Simone Rubino - TAKOBI
+  ~ License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl).
+  -->
 <odoo>
-    <data>
-
-        <!-- Account account -->
-        <record id="account_account_extraEU_purchase" model="account.account">
-            <field name="code">280310</field>
-            <field name="name">ExtraEU Goods Purchase</field>
-            <field
-                name="user_type_id"
-                ref="account.data_account_type_current_liabilities"
-            />
-            <field name="reconcile">True</field>
-        </record>
-        <record id="account_account_adv_customs_expense" model="account.account">
-            <field name="code">280320</field>
-            <field name="name">Advanced Customs Expenses</field>
-            <field
-                name="user_type_id"
-                ref="account.data_account_type_current_liabilities"
-            />
-            <field name="reconcile">True</field>
-        </record>
-        <record id="account_account_customs_expense" model="account.account">
-            <field name="code">421500</field>
-            <field name="name">Customs Expenses</field>
-            <field name="user_type_id" ref="account.data_account_type_expenses" />
-            <field name="reconcile">True</field>
-        </record>
-        <record id="account_account_stamp_duties" model="account.account">
-            <field name="code">421400</field>
-            <field name="name">Stamp Duties</field>
-            <field name="user_type_id" ref="account.data_account_type_expenses" />
-            <field name="reconcile">True</field>
-        </record>
+    <!-- Account account -->
+    <record id="account_account_extraEU_purchase" model="account.account">
+        <field name="code">280310</field>
+        <field name="name">ExtraEU Goods Purchase</field>
+        <field
+            name="user_type_id"
+            ref="account.data_account_type_current_liabilities"
+        />
+        <field name="reconcile">True</field>
+    </record>
+    <record id="account_account_adv_customs_expense" model="account.account">
+        <field name="code">280320</field>
+        <field name="name">Advanced Customs Expenses</field>
+        <field
+            name="user_type_id"
+            ref="account.data_account_type_current_liabilities"
+        />
+        <field name="reconcile">True</field>
+    </record>
+    <record id="account_account_customs_expense" model="account.account">
+        <field name="code">421500</field>
+        <field name="name">Customs Expenses</field>
+        <field name="user_type_id" ref="account.data_account_type_expenses" />
+        <field name="reconcile">True</field>
+    </record>
+    <record id="account_account_stamp_duties" model="account.account">
+        <field name="code">421400</field>
+        <field name="name">Stamp Duties</field>
+        <field name="user_type_id" ref="account.data_account_type_expenses" />
+        <field name="reconcile">True</field>
+    </record>
 
 <!--
-            When l10n_it is installed, it creates the l10n_it.1_4201 account
-            (420100 costi di trasporto)
+        When l10n_it is installed, it creates the l10n_it.1_4201 account
+        (420100 costi di trasporto)
 -->
-        <record id="account_account_delivery_expense" model="account.account">
-            <field name="code">420101</field>
-            <field name="name">Delivery Expenses</field>
-            <field name="user_type_id" ref="account.data_account_type_expenses" />
-            <field name="reconcile">True</field>
-        </record>
-
-        <!-- Account Tax -->
-        <record id="tax_tag_22extraUE" model="account.account.tag">
-            <field name="name">22aExtraUE</field>
-            <field name="applicability">taxes</field>
-        </record>
-        <record id="tax_22extraUE" model="account.tax">
-            <field name="name">Iva al 22% ExtraUE (credito)</field>
-            <field name="type_tax_use">purchase</field>
-            <field name="amount_type">percent</field>
-            <field name="amount">22</field>
-            <field name="description">22aExtraUE</field>
-            <field name="tax_group_id" ref="account.tax_group_taxes" />
-            <field name="sequence">99</field>
-        </record>
+    <record id="account_account_delivery_expense" model="account.account">
+        <field name="code">420101</field>
+        <field name="name">Delivery Expenses</field>
+        <field name="user_type_id" ref="account.data_account_type_expenses" />
+        <field name="reconcile">True</field>
+    </record>
 
-        <!-- Partner -->
-        <record id="partner_customs" model="res.partner">
-            <field name="name">Customs</field>
-            <field name="supplier">True</field>
-            <field name="is_company">True</field>
-        </record>
+    <!-- Account Tax -->
+    <record id="tax_tag_22extraUE" model="account.account.tag">
+        <field name="name">22aExtraUE</field>
+        <field name="applicability">taxes</field>
+        <field name="country_id" ref="base.it" />
+    </record>
+    <record id="tax_22extraUE" model="account.tax">
+        <field name="name">Iva al 22% ExtraUE (credito)</field>
+        <field name="type_tax_use">purchase</field>
+        <field name="amount_type">percent</field>
+        <field name="amount">22</field>
+        <field name="description">22aExtraUE</field>
+        <field name="tax_group_id" ref="account.tax_group_taxes" />
+        <field name="sequence">99</field>
+    </record>
 
-        <!-- Account Fiscal Position -->
-        <record id="fiscal_position_extraEU" model="account.fiscal.position">
-            <field name="name">Extra EU</field>
-         </record>
+    <!-- Partner -->
+    <record id="partner_customs" model="res.partner">
+        <field name="name">Customs</field>
+        <field name="is_company">True</field>
+    </record>
 
-        <!-- Account Journal -->
-        <record id="account_journal_purchase_extraEU" model="account.journal">
-            <field name="name">Supplier Invoices ExtraUE</field>
-            <field name="type">purchase</field>
-            <field name="code">NOUE</field>
-            <field name="update_posted">True</field>
-         </record>
+    <!-- Account Fiscal Position -->
+    <record id="fiscal_position_extraEU" model="account.fiscal.position">
+        <field name="name">Extra EU</field>
+     </record>
 
-        <!-- Product product -->
-        <record id="product_product_extraEU_purchase" model="product.product">
-            <field name="name">ExtraEU Goods Purchase</field>
-            <field name="categ_id" ref="product.product_category_1" />
-            <field name="purchase_ok">True</field>
-            <field name="standard_price">1.0</field>
-            <field name="list_price">1.0</field>
-            <field name="type">service</field>
-            <field name="uom_id" ref="uom.product_uom_unit" />
-            <field name="uom_po_id" ref="uom.product_uom_unit" />
-        </record>
-        <record id="product_product_adv_customs_expense" model="product.product">
-            <field name="name">Advance Customs Expense</field>
-            <field name="categ_id" ref="product.product_category_1" />
-            <field name="purchase_ok">True</field>
-            <field name="standard_price">1.0</field>
-            <field name="list_price">1.0</field>
-            <field name="type">service</field>
-            <field name="uom_id" ref="uom.product_uom_unit" />
-            <field name="uom_po_id" ref="uom.product_uom_unit" />
-        </record>
-        <record id="product_product_customs_expense" model="product.product">
-            <field name="name">Customs Expense</field>
-            <field name="categ_id" ref="product.product_category_1" />
-            <field name="purchase_ok">True</field>
-            <field name="standard_price">1.0</field>
-            <field name="list_price">1.0</field>
-            <field name="type">service</field>
-            <field name="uom_id" ref="uom.product_uom_unit" />
-            <field name="uom_po_id" ref="uom.product_uom_unit" />
-        </record>
-        <record id="product_product_delivery" model="product.product">
-            <field name="name">Delivery Expense</field>
-            <field name="categ_id" ref="product.product_category_1" />
-            <field name="purchase_ok">True</field>
-            <field name="standard_price">1.0</field>
-            <field name="list_price">1.0</field>
-            <field name="type">service</field>
-            <field name="uom_id" ref="uom.product_uom_unit" />
-            <field name="uom_po_id" ref="uom.product_uom_unit" />
-            <!-- Usually this is standard VAT -->
-            <field name="supplier_taxes_id" eval="[(6, 0, [ref('tax_22extraUE')])]" />
-        </record>
-        <record id="product_product_stamp_duties" model="product.product">
-            <field name="name">Stamp Duties</field>
-            <field name="categ_id" ref="product.product_category_1" />
-            <field name="purchase_ok">True</field>
-            <field name="standard_price">1.0</field>
-            <field name="list_price">1.0</field>
-            <field name="type">service</field>
-            <field name="uom_id" ref="uom.product_uom_unit" />
-            <field name="uom_po_id" ref="uom.product_uom_unit" />
-            <field
-                name="property_account_expense_id"
-                eval="[(6, 0, [ref('account_account_stamp_duties')])]"
-            />
-        </record>
+    <!-- Account Journal -->
+    <record id="account_journal_purchase_extraEU" model="account.journal">
+        <field name="name">Supplier Invoices ExtraUE</field>
+        <field name="type">purchase</field>
+        <field name="code">NOUE</field>
+     </record>
 
-    </data>
+    <!-- Product product -->
+    <record id="product_product_extraEU_purchase" model="product.product">
+        <field name="name">ExtraEU Goods Purchase</field>
+        <field name="categ_id" ref="product.product_category_1" />
+        <field name="purchase_ok">True</field>
+        <field name="standard_price">1.0</field>
+        <field name="list_price">1.0</field>
+        <field name="type">service</field>
+        <field name="uom_id" ref="uom.product_uom_unit" />
+        <field name="uom_po_id" ref="uom.product_uom_unit" />
+    </record>
+    <record id="product_product_adv_customs_expense" model="product.product">
+        <field name="name">Advance Customs Expense</field>
+        <field name="categ_id" ref="product.product_category_1" />
+        <field name="purchase_ok">True</field>
+        <field name="standard_price">1.0</field>
+        <field name="list_price">1.0</field>
+        <field name="type">service</field>
+        <field name="uom_id" ref="uom.product_uom_unit" />
+        <field name="uom_po_id" ref="uom.product_uom_unit" />
+    </record>
+    <record id="product_product_customs_expense" model="product.product">
+        <field name="name">Customs Expense</field>
+        <field name="categ_id" ref="product.product_category_1" />
+        <field name="purchase_ok">True</field>
+        <field name="standard_price">1.0</field>
+        <field name="list_price">1.0</field>
+        <field name="type">service</field>
+        <field name="uom_id" ref="uom.product_uom_unit" />
+        <field name="uom_po_id" ref="uom.product_uom_unit" />
+    </record>
+    <record id="product_product_delivery" model="product.product">
+        <field name="name">Delivery Expense</field>
+        <field name="categ_id" ref="product.product_category_1" />
+        <field name="purchase_ok">True</field>
+        <field name="standard_price">1.0</field>
+        <field name="list_price">1.0</field>
+        <field name="type">service</field>
+        <field name="uom_id" ref="uom.product_uom_unit" />
+        <field name="uom_po_id" ref="uom.product_uom_unit" />
+        <!-- Usually this is standard VAT -->
+        <field name="supplier_taxes_id" eval="[(6, 0, [ref('tax_22extraUE')])]" />
+    </record>
+    <record id="product_product_stamp_duties" model="product.product">
+        <field name="name">Stamp Duties</field>
+        <field name="categ_id" ref="product.product_category_1" />
+        <field name="purchase_ok">True</field>
+        <field name="standard_price">1.0</field>
+        <field name="list_price">1.0</field>
+        <field name="type">service</field>
+        <field name="uom_id" ref="uom.product_uom_unit" />
+        <field name="uom_po_id" ref="uom.product_uom_unit" />
+        <field name="property_account_expense_id" ref="account_account_stamp_duties" />
+    </record>
 </odoo>
diff --git a/l10n_it_bill_of_entry/i18n/it.po b/l10n_it_bill_of_entry/i18n/it.po
index b451b025131f..33729f085fc7 100644
--- a/l10n_it_bill_of_entry/i18n/it.po
+++ b/l10n_it_bill_of_entry/i18n/it.po
@@ -4,13 +4,12 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Server 12.0\n"
+"Project-Id-Version: Odoo Server 14.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-02-03 10:17+0000\n"
-"PO-Revision-Date: 2022-02-03 10:17+0000\n"
-"Last-Translator: <>\n"
+"POT-Creation-Date: 2022-10-31 11:08+0000\n"
+"PO-Revision-Date: 2022-10-31 11:08+0000\n"
+"Last-Translator: Simone Rubino <sir@takobi.online>\n"
 "Language-Team: \n"
-"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: \n"
@@ -20,32 +19,27 @@ msgstr ""
 #: model_terms:ir.ui.view,arch_db:l10n_it_bill_of_entry.view_boe_config_settings
 msgid ""
 "<span class=\"fa fa-lg fa-building-o\" title=\"Values set here are company-"
-"specific.\" aria-label=\"Values set here are company-specific.\" groups="
-"\"base.group_multi_company\" role=\"img\"/>"
+"specific.\" aria-label=\"Values set here are company-specific.\" "
+"groups=\"base.group_multi_company\" role=\"img\"/>"
 msgstr ""
 "<span class=\"fa fa-lg fa-building-o\" title=\"I valori impostati qui sono "
 "specifici per azienda.\" aria-label=\"I valori impostati qui sono specifici "
 "per azienda.\" groups=\"base.group_multi_company\" role=\"img\"/>"
 
 #. module: l10n_it_bill_of_entry
-#: model:product.product,name:l10n_it_bill_of_entry.product_product_adv_customs_expense
-#: model:product.template,name:l10n_it_bill_of_entry.product_product_adv_customs_expense_product_template
-#, fuzzy
-msgid "Advance Customs Expense"
-msgstr "IVA dogana anticipata"
-
-#. module: l10n_it_bill_of_entry
-#: model:ir.model.fields,field_description:l10n_it_bill_of_entry.field_account_invoice_line__advance_customs_vat
+#: model:ir.model.fields,field_description:l10n_it_bill_of_entry.field_account_move_line__advance_customs_vat
 msgid "Advance Customs Vat"
 msgstr "IVA dogana anticipata"
 
 #. module: l10n_it_bill_of_entry
-#: selection:account.invoice,customs_doc_type:0
+#: model:ir.model.fields.selection,name:l10n_it_bill_of_entry.selection__account_move__customs_doc_type__bill_of_entry
 msgid "Bill of Entry"
 msgstr "Bolla doganale"
 
 #. module: l10n_it_bill_of_entry
-#: model:ir.model.fields,field_description:l10n_it_bill_of_entry.field_account_invoice__bill_of_entry_storno_id
+#: model:ir.model.fields,field_description:l10n_it_bill_of_entry.field_account_bank_statement_line__bill_of_entry_storno_id
+#: model:ir.model.fields,field_description:l10n_it_bill_of_entry.field_account_move__bill_of_entry_storno_id
+#: model:ir.model.fields,field_description:l10n_it_bill_of_entry.field_account_payment__bill_of_entry_storno_id
 msgid "Bill of Entry Storno"
 msgstr "Storno bolla doganale"
 
@@ -56,17 +50,22 @@ msgid "Bill of entries"
 msgstr "Bolle doganali"
 
 #. module: l10n_it_bill_of_entry
-#: model:ir.model.fields,field_description:l10n_it_bill_of_entry.field_account_invoice__forwarder_bill_of_entries_count
+#: model:ir.model.fields,field_description:l10n_it_bill_of_entry.field_account_bank_statement_line__forwarder_bill_of_entries_count
+#: model:ir.model.fields,field_description:l10n_it_bill_of_entry.field_account_move__forwarder_bill_of_entries_count
+#: model:ir.model.fields,field_description:l10n_it_bill_of_entry.field_account_payment__forwarder_bill_of_entries_count
 msgid "Bill of entries for forwarder"
 msgstr "Bolle doganali per spedizioniere"
 
 #. module: l10n_it_bill_of_entry
-#: model:ir.model.fields,field_description:l10n_it_bill_of_entry.field_account_invoice__bill_of_entries_count
+#: model:ir.model.fields,field_description:l10n_it_bill_of_entry.field_account_bank_statement_line__bill_of_entries_count
+#: model:ir.model.fields,field_description:l10n_it_bill_of_entry.field_account_move__bill_of_entries_count
+#: model:ir.model.fields,field_description:l10n_it_bill_of_entry.field_account_payment__bill_of_entries_count
 msgid "Bill of entries number"
 msgstr "Numero bolle doganali"
 
 #. module: l10n_it_bill_of_entry
-#: code:addons/l10n_it_bill_of_entry/models/account_invoice.py:117
+#: code:addons/l10n-italy/l10n_it_bill_of_entry/models/account_move.py:0
+#: code:addons/l10n_it_bill_of_entry/models/account_move.py:0
 #, python-format
 msgid "Bill of entry %s is in state %s"
 msgstr "La bolla doganale %s è nello stato %s"
@@ -96,7 +95,8 @@ msgid "Bills of entry"
 msgstr "Bolle doganali"
 
 #. module: l10n_it_bill_of_entry
-#: code:addons/l10n_it_bill_of_entry/models/account_invoice.py:182
+#: code:addons/l10n-italy/l10n_it_bill_of_entry/models/account_move.py:0
+#: code:addons/l10n_it_bill_of_entry/models/account_move.py:0
 #, python-format
 msgid "Can't handle more than 1 tax for line %s"
 msgstr "Impossibile gestire più di 1 imposta per la riga %s"
@@ -118,43 +118,44 @@ msgid "Customs"
 msgstr "Dogana"
 
 #. module: l10n_it_bill_of_entry
-#: model:ir.model.fields,field_description:l10n_it_bill_of_entry.field_account_invoice__customs_doc_type
+#: model:ir.model.fields,field_description:l10n_it_bill_of_entry.field_account_bank_statement_line__customs_doc_type
+#: model:ir.model.fields,field_description:l10n_it_bill_of_entry.field_account_move__customs_doc_type
+#: model:ir.model.fields,field_description:l10n_it_bill_of_entry.field_account_payment__customs_doc_type
 msgid "Customs Doc Type"
 msgstr "Tipo doc Dogana"
 
 #. module: l10n_it_bill_of_entry
-#: model:product.product,name:l10n_it_bill_of_entry.product_product_customs_expense
-#: model:product.template,name:l10n_it_bill_of_entry.product_product_customs_expense_product_template
-#, fuzzy
-msgid "Customs Expense"
-msgstr "Spese dogana"
-
-#. module: l10n_it_bill_of_entry
-#: code:addons/l10n_it_bill_of_entry/models/account_invoice.py:160
+#: code:addons/l10n-italy/l10n_it_bill_of_entry/models/account_move.py:0
+#: code:addons/l10n_it_bill_of_entry/models/account_move.py:0
 #, python-format
 msgid "Customs expenses"
 msgstr "Spese dogana"
 
 #. module: l10n_it_bill_of_entry
-#: code:addons/l10n_it_bill_of_entry/models/account_invoice.py:171
+#: code:addons/l10n-italy/l10n_it_bill_of_entry/models/account_move.py:0
+#: code:addons/l10n_it_bill_of_entry/models/account_move.py:0
 #, python-format
 msgid "Customs supplier"
 msgstr "Fornitore dogana"
 
 #. module: l10n_it_bill_of_entry
-#: model:product.product,name:l10n_it_bill_of_entry.product_product_delivery
-#: model:product.template,name:l10n_it_bill_of_entry.product_product_delivery_product_template
-msgid "Delivery Expense"
-msgstr ""
+#: model:ir.model.fields,field_description:l10n_it_bill_of_entry.field_account_move__display_name
+#: model:ir.model.fields,field_description:l10n_it_bill_of_entry.field_account_move_line__display_name
+#: model:ir.model.fields,field_description:l10n_it_bill_of_entry.field_res_company__display_name
+#: model:ir.model.fields,field_description:l10n_it_bill_of_entry.field_res_config_settings__display_name
+msgid "Display Name"
+msgstr "Nome visualizzato"
 
 #. module: l10n_it_bill_of_entry
-#: code:addons/l10n_it_bill_of_entry/models/account_invoice.py:186
+#: code:addons/l10n-italy/l10n_it_bill_of_entry/models/account_move.py:0
+#: code:addons/l10n_it_bill_of_entry/models/account_move.py:0
 #, python-format
 msgid "Extra UE expenses"
 msgstr "Spese extra UE"
 
 #. module: l10n_it_bill_of_entry
-#: code:addons/l10n_it_bill_of_entry/models/account_invoice.py:236
+#: code:addons/l10n-italy/l10n_it_bill_of_entry/models/account_move.py:0
+#: code:addons/l10n_it_bill_of_entry/models/account_move.py:0
 #, python-format
 msgid "Extra UE supplier invoice must have no taxes"
 msgstr "La fattura del fornitore extra UE non deve avere imposte"
@@ -165,24 +166,23 @@ msgid "Extra invoices"
 msgstr "Fatture extra"
 
 #. module: l10n_it_bill_of_entry
-#: model:product.product,name:l10n_it_bill_of_entry.product_product_extraEU_purchase
-#: model:product.template,name:l10n_it_bill_of_entry.product_product_extraEU_purchase_product_template
-msgid "ExtraEU Goods Purchase"
-msgstr ""
-
-#. module: l10n_it_bill_of_entry
-#: model:ir.model.fields,field_description:l10n_it_bill_of_entry.field_account_invoice__forwarder_bill_of_entry_ids
+#: model:ir.model.fields,field_description:l10n_it_bill_of_entry.field_account_bank_statement_line__forwarder_bill_of_entry_ids
+#: model:ir.model.fields,field_description:l10n_it_bill_of_entry.field_account_move__forwarder_bill_of_entry_ids
+#: model:ir.model.fields,field_description:l10n_it_bill_of_entry.field_account_payment__forwarder_bill_of_entry_ids
 msgid "Forward Bill of Entries"
 msgstr "Bolle doganali spedizioniere"
 
 #. module: l10n_it_bill_of_entry
-#: selection:account.invoice,customs_doc_type:0
-#: model:ir.model.fields,field_description:l10n_it_bill_of_entry.field_account_invoice__forwarder_invoice_id
+#: model:ir.model.fields,field_description:l10n_it_bill_of_entry.field_account_bank_statement_line__forwarder_invoice_id
+#: model:ir.model.fields,field_description:l10n_it_bill_of_entry.field_account_move__forwarder_invoice_id
+#: model:ir.model.fields,field_description:l10n_it_bill_of_entry.field_account_payment__forwarder_invoice_id
+#: model:ir.model.fields.selection,name:l10n_it_bill_of_entry.selection__account_move__customs_doc_type__forwarder_invoice
 msgid "Forwarder Invoice"
 msgstr "Fattura spedizioniere"
 
 #. module: l10n_it_bill_of_entry
-#: code:addons/l10n_it_bill_of_entry/models/account_invoice.py:144
+#: code:addons/l10n-italy/l10n_it_bill_of_entry/models/account_move.py:0
+#: code:addons/l10n_it_bill_of_entry/models/account_move.py:0
 #, python-format
 msgid "Forwarder invoice %s does not have lines with 'Advance Customs Vat'"
 msgstr "La fattura spedizioniere %s non ha righe con 'IVA dogana anticipata'"
@@ -199,14 +199,22 @@ msgid "Generate bill of entry"
 msgstr "Generare bolla doganale"
 
 #. module: l10n_it_bill_of_entry
-#: model:ir.model,name:l10n_it_bill_of_entry.model_account_invoice
-msgid "Invoice"
-msgstr "Fattura"
+#: model:ir.model.fields,field_description:l10n_it_bill_of_entry.field_account_move__id
+#: model:ir.model.fields,field_description:l10n_it_bill_of_entry.field_account_move_line__id
+#: model:ir.model.fields,field_description:l10n_it_bill_of_entry.field_res_company__id
+#: model:ir.model.fields,field_description:l10n_it_bill_of_entry.field_res_config_settings__id
+msgid "ID"
+msgstr ""
+
+#. module: l10n_it_bill_of_entry
+#: model:ir.model,name:l10n_it_bill_of_entry.model_account_move
+msgid "Journal Entry"
+msgstr "Registrazione contabile"
 
 #. module: l10n_it_bill_of_entry
-#: model:ir.model,name:l10n_it_bill_of_entry.model_account_invoice_line
-msgid "Invoice Line"
-msgstr "Riga fattura"
+#: model:ir.model,name:l10n_it_bill_of_entry.model_account_move_line
+msgid "Journal Item"
+msgstr "Movimento contabile"
 
 #. module: l10n_it_bill_of_entry
 #: model:ir.model.fields,help:l10n_it_bill_of_entry.field_res_company__bill_of_entry_journal_id
@@ -216,47 +224,57 @@ msgid "Journal used for reconciliation of bill of entries"
 msgstr "Registro usato per la riconciliazione delle bolle doganali"
 
 #. module: l10n_it_bill_of_entry
-#: code:addons/l10n_it_bill_of_entry/models/account_invoice.py:149
+#: model:ir.model.fields,field_description:l10n_it_bill_of_entry.field_account_move____last_update
+#: model:ir.model.fields,field_description:l10n_it_bill_of_entry.field_account_move_line____last_update
+#: model:ir.model.fields,field_description:l10n_it_bill_of_entry.field_res_company____last_update
+#: model:ir.model.fields,field_description:l10n_it_bill_of_entry.field_res_config_settings____last_update
+msgid "Last Modified on"
+msgstr "Ultima modifica il"
+
+#. module: l10n_it_bill_of_entry
+#: code:addons/l10n-italy/l10n_it_bill_of_entry/models/account_move.py:0
+#: code:addons/l10n_it_bill_of_entry/models/account_move.py:0
 #, python-format
 msgid "No Bill of entry Storno journal configured"
 msgstr "Nessun registro per storno della bolla doganale configurato"
 
 #. module: l10n_it_bill_of_entry
-#: code:addons/l10n_it_bill_of_entry/models/account_invoice.py:113
+#: code:addons/l10n-italy/l10n_it_bill_of_entry/models/account_move.py:0
+#: code:addons/l10n_it_bill_of_entry/models/account_move.py:0
 #, python-format
 msgid "No bill of entries found for this invoice"
 msgstr "Nessuna bolla doganale trovata per questa fattura"
 
 #. module: l10n_it_bill_of_entry
-#: code:addons/l10n_it_bill_of_entry/models/account_invoice.py:247
+#: code:addons/l10n-italy/l10n_it_bill_of_entry/models/account_move.py:0
+#: code:addons/l10n_it_bill_of_entry/models/account_move.py:0
 #, python-format
 msgid "Please set 'Bill of entry partner' in accounting configuration"
 msgstr "Prego impostare 'Partner dogana' in configurazione contabilità"
 
 #. module: l10n_it_bill_of_entry
-#: code:addons/l10n_it_bill_of_entry/models/account_invoice.py:244
+#: code:addons/l10n-italy/l10n_it_bill_of_entry/models/account_move.py:0
+#: code:addons/l10n_it_bill_of_entry/models/account_move.py:0
 #, python-format
 msgid "Please set 'Bill of entry tax' in accounting configuration"
-msgstr "Prego impostare 'Imposta dogana'"
+msgstr "Prego impostare 'Imposta dogana' in configurazione contabilità"
 
 #. module: l10n_it_bill_of_entry
-#: model:product.product,name:l10n_it_bill_of_entry.product_product_stamp_duties
-#: model:product.template,name:l10n_it_bill_of_entry.product_product_stamp_duties_product_template
-msgid "Stamp Duties"
-msgstr ""
-
-#. module: l10n_it_bill_of_entry
-#: model:ir.model.fields,field_description:l10n_it_bill_of_entry.field_account_invoice__supplier_bill_of_entry_ids
+#: model:ir.model.fields,field_description:l10n_it_bill_of_entry.field_account_bank_statement_line__supplier_bill_of_entry_ids
+#: model:ir.model.fields,field_description:l10n_it_bill_of_entry.field_account_move__supplier_bill_of_entry_ids
+#: model:ir.model.fields,field_description:l10n_it_bill_of_entry.field_account_payment__supplier_bill_of_entry_ids
 msgid "Supplier Bill of Entries"
 msgstr "Fornitore bolle doganali"
 
 #. module: l10n_it_bill_of_entry
-#: selection:account.invoice,customs_doc_type:0
+#: model:ir.model.fields.selection,name:l10n_it_bill_of_entry.selection__account_move__customs_doc_type__supplier_invoice
 msgid "Supplier Invoice"
 msgstr "Fattura fornitore"
 
 #. module: l10n_it_bill_of_entry
-#: model:ir.model.fields,field_description:l10n_it_bill_of_entry.field_account_invoice__supplier_invoice_ids
+#: model:ir.model.fields,field_description:l10n_it_bill_of_entry.field_account_bank_statement_line__supplier_invoice_ids
+#: model:ir.model.fields,field_description:l10n_it_bill_of_entry.field_account_move__supplier_invoice_ids
+#: model:ir.model.fields,field_description:l10n_it_bill_of_entry.field_account_payment__supplier_invoice_ids
 msgid "Supplier Invoices"
 msgstr "Fatture fornitore"
 
@@ -268,7 +286,9 @@ msgid "Supplier invoices"
 msgstr "Fatture fornitore"
 
 #. module: l10n_it_bill_of_entry
-#: model:ir.model.fields,field_description:l10n_it_bill_of_entry.field_account_invoice__extra_supplier_invoices_count
+#: model:ir.model.fields,field_description:l10n_it_bill_of_entry.field_account_bank_statement_line__extra_supplier_invoices_count
+#: model:ir.model.fields,field_description:l10n_it_bill_of_entry.field_account_move__extra_supplier_invoices_count
+#: model:ir.model.fields,field_description:l10n_it_bill_of_entry.field_account_payment__extra_supplier_invoices_count
 msgid "Supplier invoices number"
 msgstr "Numero fatture fornitore"
 
@@ -281,6 +301,7 @@ msgstr "Fornitore usato nelle bolle doganali"
 
 #. module: l10n_it_bill_of_entry
 #: model:ir.model.fields,help:l10n_it_bill_of_entry.field_res_company__bill_of_entry_tax_id
+#: model:ir.model.fields,help:l10n_it_bill_of_entry.field_res_config_settings__bill_of_entry_tax_id
 msgid "Tax used in bill of entries"
 msgstr "Imposta usata nelle bolle doganali"
 
@@ -288,46 +309,14 @@ msgstr "Imposta usata nelle bolle doganali"
 #: model_terms:ir.ui.view,arch_db:l10n_it_bill_of_entry.view_boe_config_settings
 msgid "Tax used in bill of entries generation, when product is not present"
 msgstr ""
-"Imposta usata nella generazione delle bolle doganali, quando il prodotto non "
-"è presente"
+"Imposta usata nella generazione delle bolle doganali, quando il prodotto non"
+" è presente"
 
 #. module: l10n_it_bill_of_entry
-#: model:ir.model.fields,help:l10n_it_bill_of_entry.field_res_config_settings__bill_of_entry_tax_id
-msgid "Tax used in bill of entries, when product is not present"
-msgstr "Imposta usata nelle bolle doganali, quando il prodotto non è presente"
-
-#. module: l10n_it_bill_of_entry
-#: model:product.product,uom_name:l10n_it_bill_of_entry.product_product_adv_customs_expense
-#: model:product.product,uom_name:l10n_it_bill_of_entry.product_product_customs_expense
-#: model:product.product,uom_name:l10n_it_bill_of_entry.product_product_delivery
-#: model:product.product,uom_name:l10n_it_bill_of_entry.product_product_extraEU_purchase
-#: model:product.product,uom_name:l10n_it_bill_of_entry.product_product_stamp_duties
-#: model:product.template,uom_name:l10n_it_bill_of_entry.product_product_adv_customs_expense_product_template
-#: model:product.template,uom_name:l10n_it_bill_of_entry.product_product_customs_expense_product_template
-#: model:product.template,uom_name:l10n_it_bill_of_entry.product_product_delivery_product_template
-#: model:product.template,uom_name:l10n_it_bill_of_entry.product_product_extraEU_purchase_product_template
-#: model:product.template,uom_name:l10n_it_bill_of_entry.product_product_stamp_duties_product_template
-msgid "Unit(s)"
-msgstr ""
-
-#. module: l10n_it_bill_of_entry
-#: code:addons/l10n_it_bill_of_entry/models/account_invoice.py:241
+#: code:addons/l10n-italy/l10n_it_bill_of_entry/models/account_move.py:0
+#: code:addons/l10n_it_bill_of_entry/models/account_move.py:0
 #, python-format
 msgid "You can generate bill of entry from extra UE supplier invoice only"
 msgstr ""
 "È possibile generare la bolla doganale solamente da una fattura fornitore "
 "extra UE"
-
-#. module: l10n_it_bill_of_entry
-#: model:product.product,weight_uom_name:l10n_it_bill_of_entry.product_product_adv_customs_expense
-#: model:product.product,weight_uom_name:l10n_it_bill_of_entry.product_product_customs_expense
-#: model:product.product,weight_uom_name:l10n_it_bill_of_entry.product_product_delivery
-#: model:product.product,weight_uom_name:l10n_it_bill_of_entry.product_product_extraEU_purchase
-#: model:product.product,weight_uom_name:l10n_it_bill_of_entry.product_product_stamp_duties
-#: model:product.template,weight_uom_name:l10n_it_bill_of_entry.product_product_adv_customs_expense_product_template
-#: model:product.template,weight_uom_name:l10n_it_bill_of_entry.product_product_customs_expense_product_template
-#: model:product.template,weight_uom_name:l10n_it_bill_of_entry.product_product_delivery_product_template
-#: model:product.template,weight_uom_name:l10n_it_bill_of_entry.product_product_extraEU_purchase_product_template
-#: model:product.template,weight_uom_name:l10n_it_bill_of_entry.product_product_stamp_duties_product_template
-msgid "kg"
-msgstr ""
diff --git a/l10n_it_bill_of_entry/i18n/l10n_it_bill_of_entry.pot b/l10n_it_bill_of_entry/i18n/l10n_it_bill_of_entry.pot
index ff396a1b7d32..5b4ff5400338 100644
--- a/l10n_it_bill_of_entry/i18n/l10n_it_bill_of_entry.pot
+++ b/l10n_it_bill_of_entry/i18n/l10n_it_bill_of_entry.pot
@@ -1,12 +1,14 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
-#	* l10n_it_bill_of_entry
+# 	* l10n_it_bill_of_entry
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Server 12.0\n"
+"Project-Id-Version: Odoo Server 14.0\n"
 "Report-Msgid-Bugs-To: \n"
-"Last-Translator: <>\n"
+"POT-Creation-Date: 2022-10-31 11:13+0000\n"
+"PO-Revision-Date: 2022-10-31 11:13+0000\n"
+"Last-Translator: \n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -15,27 +17,26 @@ msgstr ""
 
 #. module: l10n_it_bill_of_entry
 #: model_terms:ir.ui.view,arch_db:l10n_it_bill_of_entry.view_boe_config_settings
-msgid "<span class=\"fa fa-lg fa-building-o\" title=\"Values set here are company-specific.\" aria-label=\"Values set here are company-specific.\" groups=\"base.group_multi_company\" role=\"img\"/>"
-msgstr ""
-
-#. module: l10n_it_bill_of_entry
-#: model:product.product,name:l10n_it_bill_of_entry.product_product_adv_customs_expense
-#: model:product.template,name:l10n_it_bill_of_entry.product_product_adv_customs_expense_product_template
-msgid "Advance Customs Expense"
+msgid ""
+"<span class=\"fa fa-lg fa-building-o\" title=\"Values set here are company-"
+"specific.\" aria-label=\"Values set here are company-specific.\" "
+"groups=\"base.group_multi_company\" role=\"img\"/>"
 msgstr ""
 
 #. module: l10n_it_bill_of_entry
-#: model:ir.model.fields,field_description:l10n_it_bill_of_entry.field_account_invoice_line__advance_customs_vat
+#: model:ir.model.fields,field_description:l10n_it_bill_of_entry.field_account_move_line__advance_customs_vat
 msgid "Advance Customs Vat"
 msgstr ""
 
 #. module: l10n_it_bill_of_entry
-#: selection:account.invoice,customs_doc_type:0
+#: model:ir.model.fields.selection,name:l10n_it_bill_of_entry.selection__account_move__customs_doc_type__bill_of_entry
 msgid "Bill of Entry"
 msgstr ""
 
 #. module: l10n_it_bill_of_entry
-#: model:ir.model.fields,field_description:l10n_it_bill_of_entry.field_account_invoice__bill_of_entry_storno_id
+#: model:ir.model.fields,field_description:l10n_it_bill_of_entry.field_account_bank_statement_line__bill_of_entry_storno_id
+#: model:ir.model.fields,field_description:l10n_it_bill_of_entry.field_account_move__bill_of_entry_storno_id
+#: model:ir.model.fields,field_description:l10n_it_bill_of_entry.field_account_payment__bill_of_entry_storno_id
 msgid "Bill of Entry Storno"
 msgstr ""
 
@@ -46,17 +47,22 @@ msgid "Bill of entries"
 msgstr ""
 
 #. module: l10n_it_bill_of_entry
-#: model:ir.model.fields,field_description:l10n_it_bill_of_entry.field_account_invoice__forwarder_bill_of_entries_count
+#: model:ir.model.fields,field_description:l10n_it_bill_of_entry.field_account_bank_statement_line__forwarder_bill_of_entries_count
+#: model:ir.model.fields,field_description:l10n_it_bill_of_entry.field_account_move__forwarder_bill_of_entries_count
+#: model:ir.model.fields,field_description:l10n_it_bill_of_entry.field_account_payment__forwarder_bill_of_entries_count
 msgid "Bill of entries for forwarder"
 msgstr ""
 
 #. module: l10n_it_bill_of_entry
-#: model:ir.model.fields,field_description:l10n_it_bill_of_entry.field_account_invoice__bill_of_entries_count
+#: model:ir.model.fields,field_description:l10n_it_bill_of_entry.field_account_bank_statement_line__bill_of_entries_count
+#: model:ir.model.fields,field_description:l10n_it_bill_of_entry.field_account_move__bill_of_entries_count
+#: model:ir.model.fields,field_description:l10n_it_bill_of_entry.field_account_payment__bill_of_entries_count
 msgid "Bill of entries number"
 msgstr ""
 
 #. module: l10n_it_bill_of_entry
-#: code:addons/l10n_it_bill_of_entry/models/account_invoice.py:117
+#: code:addons/l10n-italy/l10n_it_bill_of_entry/models/account_move.py:0
+#: code:addons/l10n_it_bill_of_entry/models/account_move.py:0
 #, python-format
 msgid "Bill of entry %s is in state %s"
 msgstr ""
@@ -86,7 +92,8 @@ msgid "Bills of entry"
 msgstr ""
 
 #. module: l10n_it_bill_of_entry
-#: code:addons/l10n_it_bill_of_entry/models/account_invoice.py:182
+#: code:addons/l10n-italy/l10n_it_bill_of_entry/models/account_move.py:0
+#: code:addons/l10n_it_bill_of_entry/models/account_move.py:0
 #, python-format
 msgid "Can't handle more than 1 tax for line %s"
 msgstr ""
@@ -108,42 +115,44 @@ msgid "Customs"
 msgstr ""
 
 #. module: l10n_it_bill_of_entry
-#: model:ir.model.fields,field_description:l10n_it_bill_of_entry.field_account_invoice__customs_doc_type
+#: model:ir.model.fields,field_description:l10n_it_bill_of_entry.field_account_bank_statement_line__customs_doc_type
+#: model:ir.model.fields,field_description:l10n_it_bill_of_entry.field_account_move__customs_doc_type
+#: model:ir.model.fields,field_description:l10n_it_bill_of_entry.field_account_payment__customs_doc_type
 msgid "Customs Doc Type"
 msgstr ""
 
 #. module: l10n_it_bill_of_entry
-#: model:product.product,name:l10n_it_bill_of_entry.product_product_customs_expense
-#: model:product.template,name:l10n_it_bill_of_entry.product_product_customs_expense_product_template
-msgid "Customs Expense"
-msgstr ""
-
-#. module: l10n_it_bill_of_entry
-#: code:addons/l10n_it_bill_of_entry/models/account_invoice.py:160
+#: code:addons/l10n-italy/l10n_it_bill_of_entry/models/account_move.py:0
+#: code:addons/l10n_it_bill_of_entry/models/account_move.py:0
 #, python-format
 msgid "Customs expenses"
 msgstr ""
 
 #. module: l10n_it_bill_of_entry
-#: code:addons/l10n_it_bill_of_entry/models/account_invoice.py:171
+#: code:addons/l10n-italy/l10n_it_bill_of_entry/models/account_move.py:0
+#: code:addons/l10n_it_bill_of_entry/models/account_move.py:0
 #, python-format
 msgid "Customs supplier"
 msgstr ""
 
 #. module: l10n_it_bill_of_entry
-#: model:product.product,name:l10n_it_bill_of_entry.product_product_delivery
-#: model:product.template,name:l10n_it_bill_of_entry.product_product_delivery_product_template
-msgid "Delivery Expense"
+#: model:ir.model.fields,field_description:l10n_it_bill_of_entry.field_account_move__display_name
+#: model:ir.model.fields,field_description:l10n_it_bill_of_entry.field_account_move_line__display_name
+#: model:ir.model.fields,field_description:l10n_it_bill_of_entry.field_res_company__display_name
+#: model:ir.model.fields,field_description:l10n_it_bill_of_entry.field_res_config_settings__display_name
+msgid "Display Name"
 msgstr ""
 
 #. module: l10n_it_bill_of_entry
-#: code:addons/l10n_it_bill_of_entry/models/account_invoice.py:186
+#: code:addons/l10n-italy/l10n_it_bill_of_entry/models/account_move.py:0
+#: code:addons/l10n_it_bill_of_entry/models/account_move.py:0
 #, python-format
 msgid "Extra UE expenses"
 msgstr ""
 
 #. module: l10n_it_bill_of_entry
-#: code:addons/l10n_it_bill_of_entry/models/account_invoice.py:236
+#: code:addons/l10n-italy/l10n_it_bill_of_entry/models/account_move.py:0
+#: code:addons/l10n_it_bill_of_entry/models/account_move.py:0
 #, python-format
 msgid "Extra UE supplier invoice must have no taxes"
 msgstr ""
@@ -154,24 +163,23 @@ msgid "Extra invoices"
 msgstr ""
 
 #. module: l10n_it_bill_of_entry
-#: model:product.product,name:l10n_it_bill_of_entry.product_product_extraEU_purchase
-#: model:product.template,name:l10n_it_bill_of_entry.product_product_extraEU_purchase_product_template
-msgid "ExtraEU Goods Purchase"
-msgstr ""
-
-#. module: l10n_it_bill_of_entry
-#: model:ir.model.fields,field_description:l10n_it_bill_of_entry.field_account_invoice__forwarder_bill_of_entry_ids
+#: model:ir.model.fields,field_description:l10n_it_bill_of_entry.field_account_bank_statement_line__forwarder_bill_of_entry_ids
+#: model:ir.model.fields,field_description:l10n_it_bill_of_entry.field_account_move__forwarder_bill_of_entry_ids
+#: model:ir.model.fields,field_description:l10n_it_bill_of_entry.field_account_payment__forwarder_bill_of_entry_ids
 msgid "Forward Bill of Entries"
 msgstr ""
 
 #. module: l10n_it_bill_of_entry
-#: selection:account.invoice,customs_doc_type:0
-#: model:ir.model.fields,field_description:l10n_it_bill_of_entry.field_account_invoice__forwarder_invoice_id
+#: model:ir.model.fields,field_description:l10n_it_bill_of_entry.field_account_bank_statement_line__forwarder_invoice_id
+#: model:ir.model.fields,field_description:l10n_it_bill_of_entry.field_account_move__forwarder_invoice_id
+#: model:ir.model.fields,field_description:l10n_it_bill_of_entry.field_account_payment__forwarder_invoice_id
+#: model:ir.model.fields.selection,name:l10n_it_bill_of_entry.selection__account_move__customs_doc_type__forwarder_invoice
 msgid "Forwarder Invoice"
 msgstr ""
 
 #. module: l10n_it_bill_of_entry
-#: code:addons/l10n_it_bill_of_entry/models/account_invoice.py:144
+#: code:addons/l10n-italy/l10n_it_bill_of_entry/models/account_move.py:0
+#: code:addons/l10n_it_bill_of_entry/models/account_move.py:0
 #, python-format
 msgid "Forwarder invoice %s does not have lines with 'Advance Customs Vat'"
 msgstr ""
@@ -188,13 +196,21 @@ msgid "Generate bill of entry"
 msgstr ""
 
 #. module: l10n_it_bill_of_entry
-#: model:ir.model,name:l10n_it_bill_of_entry.model_account_invoice
-msgid "Invoice"
+#: model:ir.model.fields,field_description:l10n_it_bill_of_entry.field_account_move__id
+#: model:ir.model.fields,field_description:l10n_it_bill_of_entry.field_account_move_line__id
+#: model:ir.model.fields,field_description:l10n_it_bill_of_entry.field_res_company__id
+#: model:ir.model.fields,field_description:l10n_it_bill_of_entry.field_res_config_settings__id
+msgid "ID"
+msgstr ""
+
+#. module: l10n_it_bill_of_entry
+#: model:ir.model,name:l10n_it_bill_of_entry.model_account_move
+msgid "Journal Entry"
 msgstr ""
 
 #. module: l10n_it_bill_of_entry
-#: model:ir.model,name:l10n_it_bill_of_entry.model_account_invoice_line
-msgid "Invoice Line"
+#: model:ir.model,name:l10n_it_bill_of_entry.model_account_move_line
+msgid "Journal Item"
 msgstr ""
 
 #. module: l10n_it_bill_of_entry
@@ -205,47 +221,57 @@ msgid "Journal used for reconciliation of bill of entries"
 msgstr ""
 
 #. module: l10n_it_bill_of_entry
-#: code:addons/l10n_it_bill_of_entry/models/account_invoice.py:149
+#: model:ir.model.fields,field_description:l10n_it_bill_of_entry.field_account_move____last_update
+#: model:ir.model.fields,field_description:l10n_it_bill_of_entry.field_account_move_line____last_update
+#: model:ir.model.fields,field_description:l10n_it_bill_of_entry.field_res_company____last_update
+#: model:ir.model.fields,field_description:l10n_it_bill_of_entry.field_res_config_settings____last_update
+msgid "Last Modified on"
+msgstr ""
+
+#. module: l10n_it_bill_of_entry
+#: code:addons/l10n-italy/l10n_it_bill_of_entry/models/account_move.py:0
+#: code:addons/l10n_it_bill_of_entry/models/account_move.py:0
 #, python-format
 msgid "No Bill of entry Storno journal configured"
 msgstr ""
 
 #. module: l10n_it_bill_of_entry
-#: code:addons/l10n_it_bill_of_entry/models/account_invoice.py:113
+#: code:addons/l10n-italy/l10n_it_bill_of_entry/models/account_move.py:0
+#: code:addons/l10n_it_bill_of_entry/models/account_move.py:0
 #, python-format
 msgid "No bill of entries found for this invoice"
 msgstr ""
 
 #. module: l10n_it_bill_of_entry
-#: code:addons/l10n_it_bill_of_entry/models/account_invoice.py:247
+#: code:addons/l10n-italy/l10n_it_bill_of_entry/models/account_move.py:0
+#: code:addons/l10n_it_bill_of_entry/models/account_move.py:0
 #, python-format
 msgid "Please set 'Bill of entry partner' in accounting configuration"
 msgstr ""
 
 #. module: l10n_it_bill_of_entry
-#: code:addons/l10n_it_bill_of_entry/models/account_invoice.py:244
+#: code:addons/l10n-italy/l10n_it_bill_of_entry/models/account_move.py:0
+#: code:addons/l10n_it_bill_of_entry/models/account_move.py:0
 #, python-format
 msgid "Please set 'Bill of entry tax' in accounting configuration"
 msgstr ""
 
 #. module: l10n_it_bill_of_entry
-#: model:product.product,name:l10n_it_bill_of_entry.product_product_stamp_duties
-#: model:product.template,name:l10n_it_bill_of_entry.product_product_stamp_duties_product_template
-msgid "Stamp Duties"
-msgstr ""
-
-#. module: l10n_it_bill_of_entry
-#: model:ir.model.fields,field_description:l10n_it_bill_of_entry.field_account_invoice__supplier_bill_of_entry_ids
+#: model:ir.model.fields,field_description:l10n_it_bill_of_entry.field_account_bank_statement_line__supplier_bill_of_entry_ids
+#: model:ir.model.fields,field_description:l10n_it_bill_of_entry.field_account_move__supplier_bill_of_entry_ids
+#: model:ir.model.fields,field_description:l10n_it_bill_of_entry.field_account_payment__supplier_bill_of_entry_ids
 msgid "Supplier Bill of Entries"
 msgstr ""
 
 #. module: l10n_it_bill_of_entry
-#: selection:account.invoice,customs_doc_type:0
+#: model:ir.model.fields.selection,name:l10n_it_bill_of_entry.selection__account_move__customs_doc_type__supplier_invoice
 msgid "Supplier Invoice"
 msgstr ""
 
 #. module: l10n_it_bill_of_entry
-#: model:ir.model.fields,field_description:l10n_it_bill_of_entry.field_account_invoice__supplier_invoice_ids
+#: model:ir.model.fields,field_description:l10n_it_bill_of_entry.field_account_bank_statement_line__supplier_invoice_ids
+#: model:ir.model.fields,field_description:l10n_it_bill_of_entry.field_account_move__supplier_invoice_ids
+#: model:ir.model.fields,field_description:l10n_it_bill_of_entry.field_account_payment__supplier_invoice_ids
 msgid "Supplier Invoices"
 msgstr ""
 
@@ -257,7 +283,9 @@ msgid "Supplier invoices"
 msgstr ""
 
 #. module: l10n_it_bill_of_entry
-#: model:ir.model.fields,field_description:l10n_it_bill_of_entry.field_account_invoice__extra_supplier_invoices_count
+#: model:ir.model.fields,field_description:l10n_it_bill_of_entry.field_account_bank_statement_line__extra_supplier_invoices_count
+#: model:ir.model.fields,field_description:l10n_it_bill_of_entry.field_account_move__extra_supplier_invoices_count
+#: model:ir.model.fields,field_description:l10n_it_bill_of_entry.field_account_payment__extra_supplier_invoices_count
 msgid "Supplier invoices number"
 msgstr ""
 
@@ -270,6 +298,7 @@ msgstr ""
 
 #. module: l10n_it_bill_of_entry
 #: model:ir.model.fields,help:l10n_it_bill_of_entry.field_res_company__bill_of_entry_tax_id
+#: model:ir.model.fields,help:l10n_it_bill_of_entry.field_res_config_settings__bill_of_entry_tax_id
 msgid "Tax used in bill of entries"
 msgstr ""
 
@@ -279,41 +308,8 @@ msgid "Tax used in bill of entries generation, when product is not present"
 msgstr ""
 
 #. module: l10n_it_bill_of_entry
-#: model:ir.model.fields,help:l10n_it_bill_of_entry.field_res_config_settings__bill_of_entry_tax_id
-msgid "Tax used in bill of entries, when product is not present"
-msgstr ""
-
-#. module: l10n_it_bill_of_entry
-#: model:product.product,uom_name:l10n_it_bill_of_entry.product_product_adv_customs_expense
-#: model:product.product,uom_name:l10n_it_bill_of_entry.product_product_customs_expense
-#: model:product.product,uom_name:l10n_it_bill_of_entry.product_product_delivery
-#: model:product.product,uom_name:l10n_it_bill_of_entry.product_product_extraEU_purchase
-#: model:product.product,uom_name:l10n_it_bill_of_entry.product_product_stamp_duties
-#: model:product.template,uom_name:l10n_it_bill_of_entry.product_product_adv_customs_expense_product_template
-#: model:product.template,uom_name:l10n_it_bill_of_entry.product_product_customs_expense_product_template
-#: model:product.template,uom_name:l10n_it_bill_of_entry.product_product_delivery_product_template
-#: model:product.template,uom_name:l10n_it_bill_of_entry.product_product_extraEU_purchase_product_template
-#: model:product.template,uom_name:l10n_it_bill_of_entry.product_product_stamp_duties_product_template
-msgid "Unit(s)"
-msgstr ""
-
-#. module: l10n_it_bill_of_entry
-#: code:addons/l10n_it_bill_of_entry/models/account_invoice.py:241
+#: code:addons/l10n-italy/l10n_it_bill_of_entry/models/account_move.py:0
+#: code:addons/l10n_it_bill_of_entry/models/account_move.py:0
 #, python-format
 msgid "You can generate bill of entry from extra UE supplier invoice only"
 msgstr ""
-
-#. module: l10n_it_bill_of_entry
-#: model:product.product,weight_uom_name:l10n_it_bill_of_entry.product_product_adv_customs_expense
-#: model:product.product,weight_uom_name:l10n_it_bill_of_entry.product_product_customs_expense
-#: model:product.product,weight_uom_name:l10n_it_bill_of_entry.product_product_delivery
-#: model:product.product,weight_uom_name:l10n_it_bill_of_entry.product_product_extraEU_purchase
-#: model:product.product,weight_uom_name:l10n_it_bill_of_entry.product_product_stamp_duties
-#: model:product.template,weight_uom_name:l10n_it_bill_of_entry.product_product_adv_customs_expense_product_template
-#: model:product.template,weight_uom_name:l10n_it_bill_of_entry.product_product_customs_expense_product_template
-#: model:product.template,weight_uom_name:l10n_it_bill_of_entry.product_product_delivery_product_template
-#: model:product.template,weight_uom_name:l10n_it_bill_of_entry.product_product_extraEU_purchase_product_template
-#: model:product.template,weight_uom_name:l10n_it_bill_of_entry.product_product_stamp_duties_product_template
-msgid "kg"
-msgstr ""
-
diff --git a/l10n_it_bill_of_entry/migrations/13.0.1.0.0/post-migration.py b/l10n_it_bill_of_entry/migrations/13.0.1.0.0/post-migration.py
new file mode 100644
index 000000000000..0bbcc4e910cc
--- /dev/null
+++ b/l10n_it_bill_of_entry/migrations/13.0.1.0.0/post-migration.py
@@ -0,0 +1,98 @@
+#  Copyright 2022 Simone Rubino - TAKOBI
+#  License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl).
+
+from openupgradelib import openupgrade
+
+INVOICE_LINE_FIELDS = [
+    "advance_customs_vat",
+]
+INVOICE_FIELDS = {
+    "simple_fields": [
+        "customs_doc_type",
+        "bill_of_entry_storno_id",
+    ],
+    "m2o_invoice": [
+        "forwarder_invoice_id",
+    ],
+}
+
+
+def _get_set_clause(fields_list, table_alias):
+    set_fields_list = [
+        "{f} = {second_table}.{f}".format(
+            second_table=table_alias,
+            f=field,
+        )
+        for field in fields_list
+    ]
+    set_fields_clause = ", ".join(set_fields_list)
+    return set_fields_clause
+
+
+def migrate_invoice_line_values(cr):
+    set_fields_clause = _get_set_clause(INVOICE_LINE_FIELDS, "ail")
+    query = """
+UPDATE account_move_line aml
+SET {fields}
+FROM account_invoice_line ail
+WHERE aml.old_invoice_line_id = ail.id
+    """.format(
+        fields=set_fields_clause,
+    )
+    return openupgrade.logged_query(cr, query)
+
+
+def migrate_invoice_simple_values(cr):
+    set_fields_clause = _get_set_clause(INVOICE_FIELDS.get("simple_fields"), "ai")
+    query = """
+UPDATE account_move am
+SET {fields}
+FROM account_invoice ai
+WHERE am.old_invoice_id = ai.id
+    """.format(
+        fields=set_fields_clause,
+    )
+    return openupgrade.logged_query(cr, query)
+
+
+def migrate_invoice_m2o_invoice_values(cr):
+    for field in INVOICE_FIELDS.get("m2o_invoice"):
+        query = """
+UPDATE account_move am
+SET {field} = am2.id
+FROM account_invoice ai
+JOIN account_move am2
+    ON am2.old_invoice_id = ai.{field}
+WHERE am.old_invoice_id = ai.id
+        """.format(
+            field=field,
+        )
+        openupgrade.logged_query(cr, query)
+    return True
+
+
+def migrate_invoice_sboe_rel(cr):
+    new_table_name = "sboe_invoice_rel"
+    old_table_name = openupgrade.get_legacy_name(new_table_name)
+    query = """
+INSERT INTO {new_table_name}
+SELECT
+    sboe_move.id as sboe_id,
+    invoice_move.id as invoice_id
+FROM {old_table_name} old_sboe_table
+JOIN account_move sboe_move
+    ON old_sboe_table.sboe_id = sboe_move.old_invoice_id
+JOIN account_move invoice_move
+    ON old_sboe_table.invoice_id = invoice_move.old_invoice_id
+        """.format(
+        new_table_name=new_table_name,
+        old_table_name=old_table_name,
+    )
+    return openupgrade.logged_query(cr, query)
+
+
+def migrate(cr, installed_version):
+    migrate_invoice_line_values(cr)
+    migrate_invoice_simple_values(cr)
+    migrate_invoice_m2o_invoice_values(cr)
+    migrate_invoice_sboe_rel(cr)
diff --git a/l10n_it_bill_of_entry/migrations/13.0.1.0.0/pre-migration.py b/l10n_it_bill_of_entry/migrations/13.0.1.0.0/pre-migration.py
new file mode 100644
index 000000000000..d19b27900a1a
--- /dev/null
+++ b/l10n_it_bill_of_entry/migrations/13.0.1.0.0/pre-migration.py
@@ -0,0 +1,13 @@
+#  Copyright 2022 Simone Rubino - TAKOBI
+#  License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl).
+
+from openupgradelib import openupgrade
+
+
+def migrate(cr, installed_version):
+    openupgrade.rename_tables(
+        cr,
+        [
+            ("sboe_invoice_rel", None),
+        ],
+    )
diff --git a/l10n_it_bill_of_entry/models/__init__.py b/l10n_it_bill_of_entry/models/__init__.py
index 8e1d75d59773..c823b99fba27 100644
--- a/l10n_it_bill_of_entry/models/__init__.py
+++ b/l10n_it_bill_of_entry/models/__init__.py
@@ -1,2 +1,4 @@
-from . import account_invoice
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl).
+
+from . import account_move
 from . import company
diff --git a/l10n_it_bill_of_entry/models/account_invoice.py b/l10n_it_bill_of_entry/models/account_invoice.py
deleted file mode 100644
index 6989e69f1e15..000000000000
--- a/l10n_it_bill_of_entry/models/account_invoice.py
+++ /dev/null
@@ -1,299 +0,0 @@
-from odoo import api, fields, models
-from odoo.exceptions import UserError
-from odoo.tools.translate import _
-
-
-class AccountInvoice(models.Model):
-    _inherit = "account.invoice"
-
-    customs_doc_type = fields.Selection(
-        [
-            ("bill_of_entry", "Bill of Entry"),
-            ("supplier_invoice", "Supplier Invoice"),
-            ("forwarder_invoice", "Forwarder Invoice"),
-        ],
-        "Customs Doc Type",
-        readonly=True,
-    )
-    supplier_bill_of_entry_ids = fields.Many2many(
-        "account.invoice",
-        "sboe_invoice_rel",
-        "sboe_id",
-        "invoice_id",
-        "Supplier Bill of Entries",
-        readonly=True,
-        copy=False,
-    )
-    supplier_invoice_ids = fields.Many2many(
-        "account.invoice",
-        "sboe_invoice_rel",
-        "invoice_id",
-        "sboe_id",
-        "Supplier Invoices",
-        copy=False,
-    )
-    forwarder_invoice_id = fields.Many2one(
-        "account.invoice", "Forwarder Invoice", copy=False
-    )
-    forwarder_bill_of_entry_ids = fields.One2many(
-        "account.invoice",
-        "forwarder_invoice_id",
-        "Forward Bill of Entries",
-        readonly=True,
-        copy=False,
-    )
-    bill_of_entry_storno_id = fields.Many2one(
-        "account.move", "Bill of Entry Storno", readonly=True, copy=False
-    )
-    bill_of_entries_count = fields.Integer(
-        "Bill of entries number", compute="_compute_bill_of_entries_count"
-    )
-    extra_supplier_invoices_count = fields.Integer(
-        "Supplier invoices number", compute="_compute_extra_supplier_invoices_count"
-    )
-    forwarder_bill_of_entries_count = fields.Integer(
-        "Bill of entries for forwarder",
-        compute="_compute_forwarder_bill_of_entries_count",
-    )
-
-    @api.multi
-    def _compute_bill_of_entries_count(self):
-        for inv in self:
-            inv.bill_of_entries_count = len(inv.supplier_bill_of_entry_ids)
-
-    @api.multi
-    def _compute_extra_supplier_invoices_count(self):
-        for inv in self:
-            inv.extra_supplier_invoices_count = len(inv.supplier_invoice_ids)
-
-    @api.multi
-    def _compute_forwarder_bill_of_entries_count(self):
-        for inv in self:
-            inv.forwarder_bill_of_entries_count = len(inv.forwarder_bill_of_entry_ids)
-
-    @api.multi
-    def action_view_bill_of_entries(self):
-        boes = self.mapped("supplier_bill_of_entry_ids")
-        action = self.env.ref("account.action_vendor_bill_template").read()[0]
-        if len(boes) > 1:
-            action["domain"] = [("id", "in", boes.ids)]
-        elif len(boes) == 1:
-            form_view = [(self.env.ref("account.invoice_supplier_form").id, "form")]
-            if "views" in action:
-                action["views"] = form_view + [
-                    (state, view) for state, view in action["views"] if view != "form"
-                ]
-            else:
-                action["views"] = form_view
-            action["res_id"] = boes.ids[0]
-        else:
-            action = {"type": "ir.actions.act_window_close"}
-        return action
-
-    @api.multi
-    def action_view_extra_supplier_invoices(self):
-        invoices = self.mapped("supplier_invoice_ids")
-        action = self.env.ref("account.action_vendor_bill_template").read()[0]
-        if len(invoices) > 1:
-            action["domain"] = [("id", "in", invoices.ids)]
-        elif len(invoices) == 1:
-            form_view = [(self.env.ref("account.invoice_supplier_form").id, "form")]
-            if "views" in action:
-                action["views"] = form_view + [
-                    (state, view) for state, view in action["views"] if view != "form"
-                ]
-            else:
-                action["views"] = form_view
-            action["res_id"] = invoices.ids[0]
-        else:
-            action = {"type": "ir.actions.act_window_close"}
-        return action
-
-    @api.multi
-    def action_view_forwarder_bill_of_entries(self):
-        boes = self.mapped("forwarder_bill_of_entry_ids")
-        action = self.env.ref("account.action_vendor_bill_template").read()[0]
-        if len(boes) > 1:
-            action["domain"] = [("id", "in", boes.ids)]
-        elif len(boes) == 1:
-            form_view = [(self.env.ref("account.invoice_supplier_form").id, "form")]
-            if "views" in action:
-                action["views"] = form_view + [
-                    (state, view) for state, view in action["views"] if view != "form"
-                ]
-            else:
-                action["views"] = form_view
-            action["res_id"] = boes.ids[0]
-        else:
-            action = {"type": "ir.actions.act_window_close"}
-        return action
-
-    @api.multi
-    def action_move_create(self):
-        res = super(AccountInvoice, self).action_move_create()
-
-        AccountMove = self.env["account.move"]
-        AccountMoveLine = self.env["account.move.line"]
-        for invoice in self:
-            if invoice.customs_doc_type == "forwarder_invoice":
-                if not invoice.forwarder_bill_of_entry_ids:
-                    raise UserError(_("No bill of entries found for this invoice"))
-                for bill_of_entry in invoice.forwarder_bill_of_entry_ids:
-                    if bill_of_entry.state not in ("open", "paid"):
-                        raise UserError(
-                            _("Bill of entry %s is in state %s")
-                            % (bill_of_entry.partner_id.name, bill_of_entry.state)
-                        )
-                advance_customs_vat_line = False
-                for line in invoice.invoice_line_ids:
-                    if line.advance_customs_vat:
-                        advance_customs_vat_line = True
-                        break
-                boe_tax_rates = invoice.forwarder_bill_of_entry_ids.mapped(
-                    "invoice_line_ids.invoice_line_tax_ids.amount"
-                )
-                boe_amounts = invoice.forwarder_bill_of_entry_ids.mapped("amount_total")
-
-                # In caso di dichiarazione d'intento inviata alla dogana,
-                # la dogana non addebita IVA.
-                # La bolla doganale ha righe positive e negative, il cui totale è 0
-                if list(set(boe_amounts)) == [0.0]:
-                    # Nessuna registrazione di storno è necessaria
-                    continue
-
-                if not advance_customs_vat_line and list(set(boe_tax_rates)) != [0.0]:
-                    raise UserError(
-                        _(
-                            "Forwarder invoice %s does not have lines with "
-                            "'Advance Customs Vat'"
-                        )
-                        % invoice.number
-                    )
-                if not invoice.company_id.bill_of_entry_journal_id:
-                    raise UserError(_("No Bill of entry Storno journal configured"))
-                move_vals = {
-                    "journal_id": (invoice.company_id.bill_of_entry_journal_id.id),
-                    "date": invoice.date_invoice,
-                }
-                move_lines = []
-                for inv_line in invoice.invoice_line_ids:
-                    if inv_line.advance_customs_vat:
-                        line_vals = {
-                            "name": _("Customs expenses"),
-                            "account_id": inv_line.account_id.id,
-                            "debit": 0.0,
-                            "credit": inv_line.price_subtotal,
-                            "partner_id": inv_line.partner_id.id,
-                        }
-                        if inv_line.product_id:
-                            line_vals["product_id"] = inv_line.product_id.id
-                        move_lines.append((0, 0, line_vals))
-                for bill_of_entry in invoice.forwarder_bill_of_entry_ids:
-                    line_vals = {
-                        "name": _("Customs supplier"),
-                        "account_id": bill_of_entry.account_id.id,
-                        "debit": bill_of_entry.amount_total,
-                        "credit": 0.0,
-                        "partner_id": bill_of_entry.partner_id.id,
-                    }
-                    move_lines.append((0, 0, line_vals))
-                    for boe_line in bill_of_entry.invoice_line_ids:
-                        if boe_line.invoice_line_tax_ids:
-                            if len(boe_line.invoice_line_tax_ids) > 1:
-                                raise UserError(
-                                    _("Can't handle more than 1 tax for line " "%s")
-                                    % boe_line.name
-                                )
-
-                        line_vals = {
-                            "name": _("Extra UE expenses"),
-                            "account_id": boe_line.account_id.id,
-                            "debit": 0.0,
-                            "credit": boe_line.price_subtotal,
-                            "partner_id": boe_line.partner_id.id,
-                        }
-                        if boe_line.product_id:
-                            line_vals["product_id"] = boe_line.product_id.id
-                        move_lines.append((0, 0, line_vals))
-                move_vals["line_ids"] = move_lines
-                move = AccountMove.create(move_vals)
-                move.action_post()
-                invoice.write({"bill_of_entry_storno_id": move.id})
-
-                reconcile_ids = []
-                for move_line in move.line_ids:
-                    for boe in invoice.forwarder_bill_of_entry_ids:
-                        if move_line.account_id.id == boe.account_id.id:
-                            reconcile_ids.append(move_line.id)
-                            for boe_move_line in boe.move_id.line_ids:
-                                if boe_move_line.account_id.id == boe.account_id.id:
-                                    reconcile_ids.append(boe_move_line.id)
-
-                AccountMoveLine.browse(reconcile_ids).reconcile()
-        return res
-
-    def action_cancel(self):
-        res = super(AccountInvoice, self).action_cancel()
-        for invoice in self:
-            for boe in invoice.forwarder_bill_of_entry_ids:
-                move = boe.move_id
-                rec_lines = (
-                    move.mapped("line_ids")
-                    .filtered("full_reconcile_id")
-                    .mapped("full_reconcile_id.reconciled_line_ids")
-                )
-                rec_lines.remove_move_reconcile()
-            if invoice.bill_of_entry_storno_id:
-                invoice.bill_of_entry_storno_id.button_cancel()
-                invoice.bill_of_entry_storno_id.unlink()
-        return res
-
-    def _check_no_taxes(self):
-        for line in self.invoice_line_ids:
-            if line.invoice_line_tax_ids:
-                raise UserError(_("Extra UE supplier invoice must have no taxes"))
-
-    def generate_bill_of_entry(self):
-        self.ensure_one()
-        if self.customs_doc_type != "supplier_invoice":
-            raise UserError(
-                _("You can generate bill of entry from extra UE supplier invoice only")
-            )
-        if not self.company_id.bill_of_entry_tax_id:
-            raise UserError(
-                _("Please set 'Bill of entry tax' in accounting configuration")
-            )
-        if not self.company_id.bill_of_entry_partner_id:
-            raise UserError(
-                _("Please set 'Bill of entry partner' in accounting configuration")
-            )
-        self._check_no_taxes()
-        boe_inv = self.copy(
-            default={
-                "partner_id": self.company_id.bill_of_entry_partner_id.id,
-                "customs_doc_type": "bill_of_entry",
-            }
-        )
-        for line in boe_inv.invoice_line_ids:
-            tax = self.company_id.bill_of_entry_tax_id
-            if line.product_id.supplier_taxes_id:
-                tax = line.product_id.supplier_taxes_id[0]
-            line.invoice_line_tax_ids = [(6, 0, [tax.id])]
-        boe_inv.supplier_invoice_ids = [(4, self.id)]
-        boe_inv.compute_taxes()
-        action = self.env.ref("account.action_vendor_bill_template").read()[0]
-        form_view = [(self.env.ref("account.invoice_supplier_form").id, "form")]
-        if "views" in action:
-            action["views"] = form_view + [
-                (state, view) for state, view in action["views"] if view != "form"
-            ]
-        else:
-            action["views"] = form_view
-        action["res_id"] = boe_inv.ids[0]
-        return action
-
-
-class AccountInvoiceLine(models.Model):
-    _inherit = "account.invoice.line"
-
-    advance_customs_vat = fields.Boolean("Advance Customs Vat")
diff --git a/l10n_it_bill_of_entry/models/account_move.py b/l10n_it_bill_of_entry/models/account_move.py
new file mode 100644
index 000000000000..bd7f9cccd86a
--- /dev/null
+++ b/l10n_it_bill_of_entry/models/account_move.py
@@ -0,0 +1,295 @@
+#  Copyright 2022 Simone Rubino - TAKOBI
+#  License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl).
+
+from odoo import fields, models
+from odoo.exceptions import UserError
+from odoo.fields import first
+from odoo.tools.translate import _
+
+
+class AccountMove(models.Model):
+    _inherit = "account.move"
+
+    customs_doc_type = fields.Selection(
+        [
+            ("bill_of_entry", "Bill of Entry"),
+            ("supplier_invoice", "Supplier Invoice"),
+            ("forwarder_invoice", "Forwarder Invoice"),
+        ],
+        "Customs Doc Type",
+        readonly=True,
+    )
+    supplier_bill_of_entry_ids = fields.Many2many(
+        "account.move",
+        "sboe_invoice_rel",
+        "sboe_id",
+        "invoice_id",
+        "Supplier Bill of Entries",
+        readonly=True,
+        copy=False,
+    )
+    supplier_invoice_ids = fields.Many2many(
+        "account.move",
+        "sboe_invoice_rel",
+        "invoice_id",
+        "sboe_id",
+        "Supplier Invoices",
+        copy=False,
+    )
+    forwarder_invoice_id = fields.Many2one(
+        "account.move", "Forwarder Invoice", copy=False
+    )
+    forwarder_bill_of_entry_ids = fields.One2many(
+        "account.move",
+        "forwarder_invoice_id",
+        "Forward Bill of Entries",
+        readonly=True,
+        copy=False,
+    )
+    bill_of_entry_storno_id = fields.Many2one(
+        "account.move", "Bill of Entry Storno", readonly=True, copy=False
+    )
+    bill_of_entries_count = fields.Integer(
+        "Bill of entries number", compute="_compute_bill_of_entries_count"
+    )
+    extra_supplier_invoices_count = fields.Integer(
+        "Supplier invoices number", compute="_compute_extra_supplier_invoices_count"
+    )
+    forwarder_bill_of_entries_count = fields.Integer(
+        "Bill of entries for forwarder",
+        compute="_compute_forwarder_bill_of_entries_count",
+    )
+
+    def _compute_bill_of_entries_count(self):
+        for inv in self:
+            inv.bill_of_entries_count = len(inv.supplier_bill_of_entry_ids)
+
+    def _compute_extra_supplier_invoices_count(self):
+        for inv in self:
+            inv.extra_supplier_invoices_count = len(inv.supplier_invoice_ids)
+
+    def _compute_forwarder_bill_of_entries_count(self):
+        for inv in self:
+            inv.forwarder_bill_of_entries_count = len(inv.forwarder_bill_of_entry_ids)
+
+    def _bill_of_entry_view_bills(self):
+        action = self.env["ir.actions.act_window"]._for_xml_id(
+            "account.action_move_in_invoice_type"
+        )
+        if len(self) > 1:
+            action["domain"] = [("id", "in", self.ids)]
+        elif len(self) == 1:
+            form_view = [(self.env.ref("account.view_move_form").id, "form")]
+            if "views" in action:
+                action["views"] = form_view + [
+                    (state, view) for state, view in action["views"] if view != "form"
+                ]
+            else:
+                action["views"] = form_view
+            action["res_id"] = self.ids[0]
+        else:
+            action = {"type": "ir.actions.act_window_close"}
+        return action
+
+    def action_view_bill_of_entries(self):
+        sboes = self.mapped("supplier_bill_of_entry_ids")
+        return sboes._bill_of_entry_view_bills()
+
+    def action_view_extra_supplier_invoices(self):
+        invoices = self.mapped("supplier_invoice_ids")
+        return invoices._bill_of_entry_view_bills()
+
+    def action_view_forwarder_bill_of_entries(self):
+        fboes = self.mapped("forwarder_bill_of_entry_ids")
+        return fboes._bill_of_entry_view_bills()
+
+    def _check_forwarder_invoice_advance_customs_vat_line(self, boe_tax_rates):
+        self.ensure_one()
+        advance_customs_vat_line = False
+        for line in self.invoice_line_ids:
+            if line.advance_customs_vat:
+                advance_customs_vat_line = True
+                break
+        if not advance_customs_vat_line and list(set(boe_tax_rates)) != [0.0]:
+            raise UserError(
+                _(
+                    "Forwarder invoice %s does not have lines with "
+                    "'Advance Customs Vat'"
+                )
+                % self.name
+            )
+        return True
+
+    def _get_forwarder_invoice_boe_amounts(self):
+        self.ensure_one()
+        if not self.forwarder_bill_of_entry_ids:
+            raise UserError(_("No bill of entries found for this invoice"))
+        for bill_of_entry in self.forwarder_bill_of_entry_ids:
+            if bill_of_entry.state not in ("posted", "paid"):
+                raise UserError(
+                    _("Bill of entry %s is in state %s")
+                    % (bill_of_entry.partner_id.name, bill_of_entry.state)
+                )
+
+        boe_tax_rates = self.forwarder_bill_of_entry_ids.mapped(
+            "invoice_line_ids.tax_ids.amount"
+        )
+        boe_amounts = self.forwarder_bill_of_entry_ids.mapped("amount_total")
+        return boe_amounts, boe_tax_rates
+
+    def _prepare_bill_of_entry_storno(self):
+        self.ensure_one()
+        if not self.company_id.bill_of_entry_journal_id:
+            raise UserError(_("No Bill of entry Storno journal configured"))
+        move_vals = {
+            "customs_doc_type": False,
+            "move_type": "entry",
+            "journal_id": self.company_id.bill_of_entry_journal_id.id,
+            "date": self.invoice_date,
+        }
+        move_lines = []
+        for inv_line in self.invoice_line_ids:
+            if inv_line.advance_customs_vat:
+                line_vals = {
+                    "name": _("Customs expenses"),
+                    "account_id": inv_line.account_id.id,
+                    "debit": 0.0,
+                    "credit": inv_line.price_subtotal,
+                    "partner_id": inv_line.partner_id.id,
+                }
+                if inv_line.product_id:
+                    line_vals["product_id"] = inv_line.product_id.id
+                move_lines.append((0, 0, line_vals))
+
+        for bill_of_entry in self.forwarder_bill_of_entry_ids:
+            boe_payable_lines = bill_of_entry.line_ids.filtered(
+                lambda l: l.account_internal_type == "payable"
+            )
+            boe_account = first(boe_payable_lines).account_id
+            line_vals = {
+                "name": _("Customs supplier"),
+                "account_id": first(boe_account).id,
+                "debit": bill_of_entry.amount_total,
+                "credit": 0.0,
+                "partner_id": bill_of_entry.partner_id.id,
+            }
+            move_lines.append((0, 0, line_vals))
+            for boe_line in bill_of_entry.invoice_line_ids:
+                if boe_line.tax_ids:
+                    if len(boe_line.tax_ids) > 1:
+                        raise UserError(
+                            _("Can't handle more than 1 tax for line %s")
+                            % boe_line.name
+                        )
+
+                line_vals = {
+                    "name": _("Extra UE expenses"),
+                    "account_id": boe_line.account_id.id,
+                    "debit": 0.0,
+                    "credit": boe_line.price_subtotal,
+                    "partner_id": boe_line.partner_id.id,
+                }
+                if boe_line.product_id:
+                    line_vals["product_id"] = boe_line.product_id.id
+                move_lines.append((0, 0, line_vals))
+        move_vals["line_ids"] = move_lines
+        return move_vals
+
+    def _reconcile_bill_of_entry_storno(self, move):
+        self.ensure_one()
+        reconcile_ids = []
+        for move_line in move.line_ids:
+            line_account = move_line.account_id
+            for boe in self.forwarder_bill_of_entry_ids:
+                boe_payable_lines = boe.line_ids.filtered(
+                    lambda l: l.account_internal_type == "payable"
+                )
+                boe_account = first(boe_payable_lines).account_id
+                if line_account == boe_account:
+                    reconcile_ids.append(move_line.id)
+                    for boe_move_line in boe.line_ids:
+                        if boe_move_line.account_id == boe_account:
+                            reconcile_ids.append(boe_move_line.id)
+        return self.env["account.move.line"].browse(reconcile_ids).reconcile()
+
+    def action_post(self):
+        res = super().action_post()
+
+        for invoice in self:
+            if invoice.customs_doc_type == "forwarder_invoice":
+                boe_amounts, boe_tax_rates = self._get_forwarder_invoice_boe_amounts()
+                # In caso di dichiarazione d'intento inviata alla dogana,
+                # la dogana non addebita IVA.
+                # La bolla doganale ha righe positive e negative, il cui totale è 0
+                if list(set(boe_amounts)) == [0.0]:
+                    # Nessuna registrazione di storno è necessaria
+                    continue
+
+                self._check_forwarder_invoice_advance_customs_vat_line(boe_tax_rates)
+
+                move_vals = self._prepare_bill_of_entry_storno()
+                move = self.env["account.move"].create(move_vals)
+                move.action_post()
+                invoice.write({"bill_of_entry_storno_id": move.id})
+
+                self._reconcile_bill_of_entry_storno(move)
+        return res
+
+    def button_cancel(self):
+        res = super().button_cancel()
+        for invoice in self:
+            for boe in invoice.forwarder_bill_of_entry_ids:
+                move = boe.move_id
+                rec_lines = (
+                    move.mapped("line_ids")
+                    .filtered("full_reconcile_id")
+                    .mapped("full_reconcile_id.reconciled_line_ids")
+                )
+                rec_lines.remove_move_reconcile()
+            if invoice.bill_of_entry_storno_id:
+                invoice.bill_of_entry_storno_id.button_cancel()
+                invoice.bill_of_entry_storno_id.with_context(force_delete=True).unlink()
+        return res
+
+    def _check_no_taxes(self):
+        self.ensure_one()
+        for line in self.invoice_line_ids:
+            if line.tax_ids:
+                raise UserError(_("Extra UE supplier invoice must have no taxes"))
+
+    def generate_bill_of_entry(self):
+        self.ensure_one()
+        if self.customs_doc_type != "supplier_invoice":
+            raise UserError(
+                _("You can generate bill of entry from extra UE supplier invoice only")
+            )
+        if not self.company_id.bill_of_entry_tax_id:
+            raise UserError(
+                _("Please set 'Bill of entry tax' in accounting configuration")
+            )
+        if not self.company_id.bill_of_entry_partner_id:
+            raise UserError(
+                _("Please set 'Bill of entry partner' in accounting configuration")
+            )
+        self._check_no_taxes()
+        boe_inv = self.copy(
+            default={
+                "partner_id": self.company_id.bill_of_entry_partner_id.id,
+                "customs_doc_type": "bill_of_entry",
+            }
+        )
+        for line in boe_inv.invoice_line_ids:
+            tax = self.company_id.bill_of_entry_tax_id
+            if line.product_id.supplier_taxes_id:
+                tax = line.product_id.supplier_taxes_id[0]
+            line.tax_ids = [(6, 0, [tax.id])]
+        boe_inv.supplier_invoice_ids = [(4, self.id)]
+
+        action = boe_inv._bill_of_entry_view_bills()
+        return action
+
+
+class AccountMoveLine(models.Model):
+    _inherit = "account.move.line"
+
+    advance_customs_vat = fields.Boolean("Advance Customs Vat")
diff --git a/l10n_it_bill_of_entry/models/company.py b/l10n_it_bill_of_entry/models/company.py
index 4bd34089612a..26fa1f48e2ad 100644
--- a/l10n_it_bill_of_entry/models/company.py
+++ b/l10n_it_bill_of_entry/models/company.py
@@ -1,3 +1,6 @@
+#  Copyright 2022 Simone Rubino - TAKOBI
+#  License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl).
+
 from odoo import fields, models
 
 
@@ -27,21 +30,15 @@ class AccountConfigSettings(models.TransientModel):
     bill_of_entry_journal_id = fields.Many2one(
         "account.journal",
         related="company_id.bill_of_entry_journal_id",
-        string="Bill of entry Storno journal",
         readonly=False,
-        help="Journal used for reconciliation of bill of entries",
     )
     bill_of_entry_tax_id = fields.Many2one(
         "account.tax",
         related="company_id.bill_of_entry_tax_id",
-        string="Bill of entry tax",
         readonly=False,
-        help="Tax used in bill of entries, when product is not present",
     )
     bill_of_entry_partner_id = fields.Many2one(
         "res.partner",
         related="company_id.bill_of_entry_partner_id",
-        string="Bill of entry partner",
         readonly=False,
-        help="Supplier used in bill of entries",
     )
diff --git a/l10n_it_bill_of_entry/readme/CONTRIBUTORS.rst b/l10n_it_bill_of_entry/readme/CONTRIBUTORS.rst
index f76cc6ca25f7..b942824eccd8 100644
--- a/l10n_it_bill_of_entry/readme/CONTRIBUTORS.rst
+++ b/l10n_it_bill_of_entry/readme/CONTRIBUTORS.rst
@@ -2,5 +2,5 @@
 * `TAKOBI <https://takobi.online>`_:
 
   * Lorenzo Battistini
-
+  * Simone Rubino <sir@takobi.online>
 * Diego Bruselli <d.bruselli@creativiquadrati.it>
diff --git a/l10n_it_bill_of_entry/tests/__init__.py b/l10n_it_bill_of_entry/tests/__init__.py
index 705f4e03d7cc..ef742365d7a5 100644
--- a/l10n_it_bill_of_entry/tests/__init__.py
+++ b/l10n_it_bill_of_entry/tests/__init__.py
@@ -1,10 +1,3 @@
-##############################################################################
-#
-#    Copyright (C) 2017 CQ Creativi Quadrati (http://www.creativiquadrati.it)
-#    @author Diego Bruselli <d.bruselli@creativiquadrati.it>
-#
-#    License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
-#
-##############################################################################
+#  License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl).
 
 from . import test_bill_of_entry
diff --git a/l10n_it_bill_of_entry/tests/test_bill_of_entry.py b/l10n_it_bill_of_entry/tests/test_bill_of_entry.py
index 20405fedaae3..462b58bab5d8 100644
--- a/l10n_it_bill_of_entry/tests/test_bill_of_entry.py
+++ b/l10n_it_bill_of_entry/tests/test_bill_of_entry.py
@@ -1,63 +1,52 @@
-##############################################################################
-#
-#    Copyright (C) 2017 CQ Creativi Quadrati (http://www.creativiquadrati.it)
-#    @author Diego Bruselli <d.bruselli@creativiquadrati.it>
-#
-#    License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
-#
-##############################################################################
-
-from odoo.tests.common import TransactionCase
-
-
-class TestBillOfEntry(TransactionCase):
-    def _get_invline_vals(self, product, quantity=1.0, price_unit=1.0):
-        vals = {
-            "product_id": product.id,
-            "quantity": quantity,
-            "price_unit": price_unit,
-        }
-        return vals
-
-    def _create_invoice(self, partner, customs_doc_type, journal):
-        vals = {
-            "type": "in_invoice",
-            "partner_id": partner.id,
-        }
+# Copyright 2017 CQ Creativi Quadrati (http://www.creativiquadrati.it)
+# Copyright 2017 Diego Bruselli <d.bruselli@creativiquadrati.it>
+# Copyright 2022 Simone Rubino - TAKOBI
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl).
+
+from odoo.exceptions import UserError
+from odoo.fields import first
+from odoo.tests.common import Form, tagged
+
+from odoo.addons.account.tests.common import AccountTestInvoicingCommon
+
+
+@tagged("post_install", "-at_install")
+class TestBillOfEntry(AccountTestInvoicingCommon):
+    def _create_invoice(self, partner, customs_doc_type, journal, products_list):
+        invoice = self.init_invoice(
+            "in_invoice",
+            partner=partner,
+        )
+        invoice_form = Form(invoice)
         if customs_doc_type:
-            vals["customs_doc_type"] = customs_doc_type
+            invoice_form.customs_doc_type = customs_doc_type
         if journal:
-            vals["journal_id"] = journal.id
-        invoice = self.env["account.invoice"].create(vals)
-        invoice._onchange_partner_id()
-        invoice._onchange_journal_id()
-        invoice._convert_to_write(invoice._cache)
-        return invoice
+            invoice_form.journal_id = journal
+        for product, qty, price in products_list:
+            with invoice_form.invoice_line_ids.new() as line:
+                line.product_id = product
+                line.price_unit = price
+                line.quantity = qty
 
-    def _create_invoice_line(self, invoice, vals):
-        new_vals = {
-            "invoice_id": invoice.id,
-            "account_id": self.account_revenue.id,
-            "name": "something in",
-        }
-        vals.update(new_vals)
-        line = self.env["account.invoice.line"].create(vals)
-        line._onchange_product_id()
-        line._convert_to_write(line._cache)
-        return line
+        invoice = invoice_form.save()
+        return invoice
 
     def setUp(self):
-        super(TestBillOfEntry, self).setUp()
+        super().setUp()
 
         self.account_model = self.env["account.account"]
         self.tax_model = self.env["account.tax"]
         self.journal_model = self.env["account.journal"]
-        self.invoice_model = self.env["account.invoice"]
-        self.inv_line_model = self.env["account.invoice.line"]
+        self.invoice_model = self.env["account.move"]
+        self.inv_line_model = self.env["account.move.line"]
         self.move_line_model = self.env["account.move.line"]
         self.fp_model = self.env["account.fiscal.position"]
         self.fp_tax_model = self.env["account.fiscal.position.tax"]
 
+        demo_data_company = self.env.ref("base.main_company")
+        self.env.user.company_ids |= demo_data_company
+        self.env.user.company_id = demo_data_company
+
         # Default accounts for invoice line account_id
         revenue_acctype_id = self.env.ref("account.data_account_type_revenue").id
         self.account_revenue = self.account_model.search(
@@ -65,7 +54,6 @@ def setUp(self):
         )
         # Default purchase journal
         self.journal = self.journal_model.search([("type", "=", "purchase")], limit=1)
-        self.journal.update_posted = True
         # Extra EU purchase journal for differentiate
         # extra EU purchase invoices from ordinary ones
         self.extra_journal = self.env.ref(
@@ -78,7 +66,6 @@ def setUp(self):
                 "name": "bill_of_entry_journal",
                 "type": "general",
                 "code": "BOE",
-                "update_posted": True,
             }
         )
         self.company.bill_of_entry_journal_id = self.bill_of_entry_journal.id
@@ -147,56 +134,105 @@ def setUp(self):
 
         # Extra EU supplier invoice - draft state
         self.supplier_invoice = self._create_invoice(
-            self.supplier, "supplier_invoice", self.journal_extra
+            self.supplier,
+            "supplier_invoice",
+            self.journal_extra,
+            [
+                (self.product1, 1, 2500),
+            ],
         )
-        line_vals = self._get_invline_vals(self.product1, 1, 2500)
-        self._create_invoice_line(self.supplier_invoice, line_vals)
-        self.supplier_invoice.compute_taxes()
-        # self.supplier_invoice.action_invoice_open()
 
         # Bill of Entry - draft state
         self.bill_of_entry = self._create_invoice(
-            self.customs, "bill_of_entry", self.journal
+            self.customs,
+            "bill_of_entry",
+            self.journal,
+            [
+                (self.product_extra, 1, 2500),
+            ],
         )
-        line_vals = self._get_invline_vals(self.product_extra, 1, 2500)
-        self._create_invoice_line(self.bill_of_entry, line_vals)
-        self.bill_of_entry.compute_taxes()
-        self.bill_of_entry.write(
-            {"supplier_invoice_ids": [(6, 0, [self.supplier_invoice.id])]}
-        )
-        # self.bill_of_entry.action_invoice_open()
+        bill_of_entry_form = Form(self.bill_of_entry)
+        bill_of_entry_form.supplier_invoice_ids.clear()
+        bill_of_entry_form.supplier_invoice_ids.add(self.supplier_invoice)
+        bill_of_entry_form.save()
 
         # Forwarder Invoice - draft state
         self.forwarder_invoice = self._create_invoice(
-            self.forwarder, "forwarder_invoice", self.journal
-        )
-        line_vals = self._get_invline_vals(self.product_delivery, 1, 300)
-        self._create_invoice_line(self.forwarder_invoice, line_vals)
-        line_vals = self._get_invline_vals(self.adv_customs_expense, 1, 550)
-        self.adv_customs_expense_line = self._create_invoice_line(
-            self.forwarder_invoice, line_vals
-        )
-        self.adv_customs_expense_line.advance_customs_vat = True
-        self.adv_customs_expense_line.invoice_line_tax_ids = [(6, 0, [])]
-        self.forwarder_invoice.compute_taxes()
-        self.forwarder_invoice.write(
+            self.forwarder,
+            "forwarder_invoice",
+            self.journal,
+            [
+                (self.product_delivery, 1, 300),
+                (self.adv_customs_expense, 1, 550),
+            ],
+        )
+        forwarder_invoice_form = Form(self.forwarder_invoice)
+        with forwarder_invoice_form.invoice_line_ids.edit(1) as line:
+            line.advance_customs_vat = True
+            line.tax_ids.clear()
+        forwarder_invoice_form.save()
+        self.adv_customs_expense_line = (
+            self.forwarder_invoice.invoice_line_ids.filtered("advance_customs_vat")
+        )
+        self.forwarder_invoice.update(
             {
                 "forwarder_bill_of_entry_ids": [(4, self.bill_of_entry.id)],
             }
         )
 
+        demo_data_company.bill_of_entry_tax_id = (
+            demo_data_company.account_purchase_tax_id.copy()
+        )
+        demo_data_company.bill_of_entry_partner_id = self.env[
+            "res.partner"
+        ].name_create("Customs")
+
+    def test_generate_bill_of_entry_required_configurations(self):
+        company = self.env.company
+        missing_configurations_fields = [
+            "bill_of_entry_tax_id",
+            "bill_of_entry_partner_id",
+        ]
+        fields_dict = company.fields_get(
+            allfields=missing_configurations_fields,
+            attributes=["string"],
+        )
+        supplier_invoice = self.supplier_invoice
+        for field_name in missing_configurations_fields:
+            # Save and empty the configuration
+            configuration_value = company[field_name]
+            company[field_name] = False
+
+            # Assert it is needed for generating the bill of entry
+            with self.assertRaises(UserError) as ue:
+                supplier_invoice.generate_bill_of_entry()
+            exc_message = ue.exception.args[0]
+            field_attributes = fields_dict.get(field_name)
+            self.assertIn(field_attributes.get("string"), exc_message)
+
+            # Restore the configuration
+            company[field_name] = configuration_value
+
+    def test_generate_bill_of_entry(self):
+        bill_of_entry_action = self.supplier_invoice.generate_bill_of_entry()
+        bill_of_entry_model = bill_of_entry_action.get("res_model")
+        bill_of_entry_id = bill_of_entry_action.get("res_id")
+        bill_of_entry = self.env[bill_of_entry_model].browse(bill_of_entry_id)
+        self.assertTrue(bill_of_entry)
+        self.assertEqual(bill_of_entry.state, "draft")
+
     def test_storno_create(self):
 
         # Validate bill of entry
-        self.bill_of_entry.action_invoice_open()
+        self.bill_of_entry.action_post()
 
         # Validate forwarder invoice
-        self.forwarder_invoice.action_invoice_open()
+        self.forwarder_invoice.action_post()
 
         # Storno Bill of Entry account.move
         storno = self.forwarder_invoice.bill_of_entry_storno_id
         self.assertTrue(storno)
-        self.assertEqual(storno.date, self.forwarder_invoice.date_invoice)
+        self.assertEqual(storno.date, self.forwarder_invoice.invoice_date)
 
         # Advance Customs Expense account.move.line
         move_line_domain = [
@@ -210,8 +246,12 @@ def test_storno_create(self):
         self.assertEqual(len(adv_customs_expense_moveline), 1)
 
         # Customs Expense account.move.lines
+        boe_payable_lines = self.bill_of_entry.line_ids.filtered(
+            lambda l: l.account_internal_type == "payable"
+        )
+        boe_account = first(boe_payable_lines).account_id
         move_line_domain = [
-            ("account_id", "=", self.bill_of_entry.account_id.id),
+            ("account_id", "=", boe_account.id),
             ("debit", "=", self.bill_of_entry.amount_total),
             ("credit", "=", 0.0),
             ("partner_id", "=", self.bill_of_entry.partner_id.id),
@@ -238,7 +278,7 @@ def test_storno_create(self):
             .ids
         )
         boe_reconcile_ids = (
-            self.bill_of_entry.move_id.line_ids.filtered(lambda l: l.full_reconcile_id)
+            self.bill_of_entry.line_ids.filtered(lambda l: l.full_reconcile_id)
             .mapped("full_reconcile_id")
             .ids
         )
diff --git a/l10n_it_bill_of_entry/views/account_invoice_view.xml b/l10n_it_bill_of_entry/views/account_invoice_view.xml
index 80b5f771afd8..ac4c4b6c0d0a 100644
--- a/l10n_it_bill_of_entry/views/account_invoice_view.xml
+++ b/l10n_it_bill_of_entry/views/account_invoice_view.xml
@@ -1,75 +1,117 @@
 <?xml version="1.0" encoding="utf-8" ?>
+<!--
+  ~ Copyright 2022 Simone Rubino - TAKOBI
+  ~ License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl).
+  -->
 <odoo>
-
     <record model="ir.ui.view" id="invoice_supplier_boe_form">
         <field name="name">invoice.supplier.boe.form</field>
-        <field name="model">account.invoice</field>
-        <field name="inherit_id" ref="account.invoice_supplier_form" />
+        <field name="model">account.move</field>
+        <field name="inherit_id" ref="account.view_move_form" />
         <field name="arch" type="xml">
-            <xpath expr="//sheet/div[1]" position="before">
-                <div class="oe_button_box" name="button_box">
-                    <button
-                        name="action_view_bill_of_entries"
-                        type="object"
-                        class="oe_stat_button"
-                        icon="fa-pencil-square-o"
-                        attrs="{'invisible': [('bill_of_entries_count', '=', 0)]}"
-                    >
-                        <field
-                            name="bill_of_entries_count"
-                            widget="statinfo"
-                            string="Bill of entries"
-                        />
-                    </button>
-                    <button
-                        name="action_view_extra_supplier_invoices"
-                        type="object"
-                        class="oe_stat_button"
-                        icon="fa-pencil-square-o"
-                        attrs="{'invisible': [('extra_supplier_invoices_count', '=', 0)]}"
-                    >
-                        <field
-                            name="extra_supplier_invoices_count"
-                            widget="statinfo"
-                            string="Extra invoices"
-                        />
-                    </button>
-                    <button
-                        name="action_view_forwarder_bill_of_entries"
-                        type="object"
-                        class="oe_stat_button"
-                        icon="fa-pencil-square-o"
-                        attrs="{'invisible': [('forwarder_bill_of_entries_count', '=', 0)]}"
-                    >
-                        <field
-                            name="forwarder_bill_of_entries_count"
-                            widget="statinfo"
-                            string="Bill of entries"
-                        />
-                    </button>
-                </div>
-            </xpath>
-            <xpath expr="//button[@name='action_invoice_draft']" position="after">
+            <div name="button_box" position="inside">
+                <button
+                    name="action_view_bill_of_entries"
+                    type="object"
+                    class="oe_stat_button"
+                    icon="fa-pencil-square-o"
+                    attrs="{
+                        'invisible': [
+                            '|',
+                                ('move_type', '!=', 'in_invoice'),
+                                ('bill_of_entries_count', '=', 0),
+                        ],
+                    }"
+                >
+                    <field
+                        name="bill_of_entries_count"
+                        widget="statinfo"
+                        string="Bill of entries"
+                    />
+                </button>
+                <button
+                    name="action_view_extra_supplier_invoices"
+                    type="object"
+                    class="oe_stat_button"
+                    icon="fa-pencil-square-o"
+                    attrs="{
+                        'invisible': [
+                            '|',
+                                ('move_type', '!=', 'in_invoice'),
+                                ('extra_supplier_invoices_count', '=', 0),
+                        ],
+                    }"
+                >
+                    <field
+                        name="extra_supplier_invoices_count"
+                        widget="statinfo"
+                        string="Extra invoices"
+                    />
+                </button>
+                <button
+                    name="action_view_forwarder_bill_of_entries"
+                    type="object"
+                    class="oe_stat_button"
+                    icon="fa-pencil-square-o"
+                    attrs="{
+                        'invisible': [
+                            '|',
+                                ('move_type', '!=', 'in_invoice'),
+                                ('forwarder_bill_of_entries_count', '=', 0),
+                        ],
+                    }"
+                >
+                    <field
+                        name="forwarder_bill_of_entries_count"
+                        widget="statinfo"
+                        string="Bill of entries"
+                    />
+                </button>
+            </div>
+            <xpath expr="//button[@name='button_draft']" position="after">
                 <button
                     name="generate_bill_of_entry"
                     class="oe_highlight"
-                    attrs="{'invisible': ['|', ('customs_doc_type', '!=', 'supplier_invoice'), ('bill_of_entries_count', '!=', 0)]}"
+                    attrs="{
+                        'invisible': [
+                            '|',
+                                ('move_type', '!=', 'in_invoice'),
+                                '|',
+                                    ('customs_doc_type', '!=', 'supplier_invoice'),
+                                    ('bill_of_entries_count', '!=', 0),
+                        ],
+                    }"
                     string="Generate bill of entry"
                     type="object"
                     groups="account.group_account_invoice"
                 />
             </xpath>
-            <xpath expr="//field[@name='move_name']" position="after">
+            <group id="header_right_group" position="inside">
                 <field
                     name="customs_doc_type"
-                    attrs="{'readonly': ['|',('state', '!=', 'draft'), ('forwarder_bill_of_entries_count', '!=', 0)]}"
+                    attrs="{
+                        'invisible': [
+                            ('move_type', '!=', 'in_invoice'),
+                        ],
+                        'readonly': [
+                            '|',
+                                ('state', '!=', 'draft'),
+                                ('forwarder_bill_of_entries_count', '!=', 0),
+                        ],
+                    }"
                 />
-            </xpath>
+            </group>
             <xpath expr="//notebook/page[2]" position="after">
                 <page
                     string="Customs"
                     name="customs"
-                    attrs="{'invisible': [('customs_doc_type','not in', ['bill_of_entry', 'forwarder_invoice'])]}"
+                    attrs="{
+                        'invisible': [
+                            '|',
+                                ('move_type', '!=', 'in_invoice'),
+                                ('customs_doc_type','not in', ['bill_of_entry', 'forwarder_invoice']),
+                        ],
+                    }"
                 >
                     <separator
                         string="Supplier invoices"
@@ -105,9 +147,21 @@
             >
                 <field
                     name="advance_customs_vat"
-                    attrs="{'column_invisible': [('parent.customs_doc_type', '!=', 'forwarder_invoice')]}"
+                    attrs="{
+                        'column_invisible': [
+                            '|',
+                                ('parent.move_type', '!=', 'in_invoice'),
+                                ('parent.customs_doc_type', '!=', 'forwarder_invoice'),
+                        ],
+                    }"
                 />
             </xpath>
+            <xpath
+                expr="//notebook/page[@id='aml_tab']//field[@name='line_ids']/tree/field[@name='price_subtotal']"
+                position="after"
+            >
+                <field name="advance_customs_vat" invisible="True" />
+            </xpath>
         </field>
     </record>
 
@@ -120,26 +174,25 @@
 
     <record id="action_supplier_invoice" model="ir.actions.act_window">
         <field name="name">Supplier invoices</field>
-        <field name="res_model">account.invoice</field>
-        <field name="view_type">form</field>
-        <field name="view_mode">tree,kanban,form,calendar,pivot,graph,activity</field>
+        <field name="res_model">account.move</field>
+        <field name="view_mode">tree,kanban,form,pivot,graph,activity</field>
         <field
             name="domain"
-        >[('type','=','in_invoice'), ('customs_doc_type', '=', 'supplier_invoice')]</field>
+        >[('move_type','=','in_invoice'), ('customs_doc_type', '=', 'supplier_invoice')]</field>
         <field
             name="context"
-        >{'default_type': 'in_invoice', 'type': 'in_invoice', 'journal_type': 'purchase', 'default_customs_doc_type': 'supplier_invoice'}</field>
+        >{'default_move_type': 'in_invoice', 'journal_type': 'purchase', 'default_customs_doc_type': 'supplier_invoice'}</field>
     </record>
     <record id="action_supplier_invoice_view1" model="ir.actions.act_window.view">
         <field eval="1" name="sequence" />
         <field name="view_mode">tree</field>
-        <field name="view_id" ref="account.invoice_supplier_tree" />
+        <field name="view_id" ref="account.view_move_tree" />
         <field name="act_window_id" ref="action_supplier_invoice" />
     </record>
     <record id="action_supplier_invoice_view2" model="ir.actions.act_window.view">
         <field eval="2" name="sequence" />
         <field name="view_mode">form</field>
-        <field name="view_id" ref="account.invoice_supplier_form" />
+        <field name="view_id" ref="account.view_move_form" />
         <field name="act_window_id" ref="action_supplier_invoice" />
     </record>
     <menuitem
@@ -150,26 +203,25 @@
 
     <record id="action_bill_of_entry" model="ir.actions.act_window">
         <field name="name">Bills of entry</field>
-        <field name="res_model">account.invoice</field>
-        <field name="view_type">form</field>
-        <field name="view_mode">tree,kanban,form,calendar,pivot,graph,activity</field>
+        <field name="res_model">account.move</field>
+        <field name="view_mode">tree,kanban,form,pivot,graph,activity</field>
         <field
             name="domain"
-        >[('type','=','in_invoice'), ('customs_doc_type', '=', 'bill_of_entry')]</field>
+        >[('move_type','=','in_invoice'), ('customs_doc_type', '=', 'bill_of_entry')]</field>
         <field
             name="context"
-        >{'default_type': 'in_invoice', 'type': 'in_invoice', 'journal_type': 'purchase', 'default_customs_doc_type': 'bill_of_entry'}</field>
+        >{'default_move_type': 'in_invoice', 'journal_type': 'purchase', 'default_customs_doc_type': 'bill_of_entry'}</field>
     </record>
     <record id="action_bill_of_entry_view1" model="ir.actions.act_window.view">
         <field eval="1" name="sequence" />
         <field name="view_mode">tree</field>
-        <field name="view_id" ref="account.invoice_supplier_tree" />
+        <field name="view_id" ref="account.view_move_tree" />
         <field name="act_window_id" ref="action_bill_of_entry" />
     </record>
     <record id="action_bill_of_entry_view2" model="ir.actions.act_window.view">
         <field eval="2" name="sequence" />
         <field name="view_mode">form</field>
-        <field name="view_id" ref="account.invoice_supplier_form" />
+        <field name="view_id" ref="account.view_move_form" />
         <field name="act_window_id" ref="action_bill_of_entry" />
     </record>
     <menuitem
@@ -180,26 +232,25 @@
 
     <record id="action_forwarder_invoice" model="ir.actions.act_window">
         <field name="name">Forwarder invoices</field>
-        <field name="res_model">account.invoice</field>
-        <field name="view_type">form</field>
-        <field name="view_mode">tree,kanban,form,calendar,pivot,graph,activity</field>
+        <field name="res_model">account.move</field>
+        <field name="view_mode">tree,kanban,form,pivot,graph,activity</field>
         <field
             name="domain"
-        >[('type','=','in_invoice'), ('customs_doc_type', '=', 'forwarder_invoice')]</field>
+        >[('move_type','=','in_invoice'), ('customs_doc_type', '=', 'forwarder_invoice')]</field>
         <field
             name="context"
-        >{'default_type': 'in_invoice', 'type': 'in_invoice', 'journal_type': 'purchase', 'default_customs_doc_type': 'forwarder_invoice'}</field>
+        >{'default_move_type': 'in_invoice', 'journal_type': 'purchase', 'default_customs_doc_type': 'forwarder_invoice'}</field>
     </record>
     <record id="action_forwarder_invoice_view1" model="ir.actions.act_window.view">
         <field eval="1" name="sequence" />
         <field name="view_mode">tree</field>
-        <field name="view_id" ref="account.invoice_supplier_tree" />
+        <field name="view_id" ref="account.view_move_tree" />
         <field name="act_window_id" ref="action_forwarder_invoice" />
     </record>
     <record id="action_forwarder_invoice_view2" model="ir.actions.act_window.view">
         <field eval="2" name="sequence" />
         <field name="view_mode">form</field>
-        <field name="view_id" ref="account.invoice_supplier_form" />
+        <field name="view_id" ref="account.view_move_form" />
         <field name="act_window_id" ref="action_forwarder_invoice" />
     </record>
     <menuitem
@@ -207,5 +258,4 @@
         id="menu_action_forwarder_invoice"
         parent="customs"
     />
-
 </odoo>
diff --git a/l10n_it_bill_of_entry/views/company_view.xml b/l10n_it_bill_of_entry/views/company_view.xml
index f2d2dfffcccc..8cfdd0f6e8c2 100644
--- a/l10n_it_bill_of_entry/views/company_view.xml
+++ b/l10n_it_bill_of_entry/views/company_view.xml
@@ -1,4 +1,8 @@
 <?xml version="1.0" encoding="utf-8" ?>
+<!--
+  ~ Copyright 2022 Simone Rubino - TAKOBI
+  ~ License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl).
+  -->
 <odoo>
 
     <record id="view_boe_config_settings" model="ir.ui.view">