diff --git a/intrastat_base/models/__init__.py b/intrastat_base/models/__init__.py
index 9d1273d..073fa97 100644
--- a/intrastat_base/models/__init__.py
+++ b/intrastat_base/models/__init__.py
@@ -3,3 +3,4 @@ from . import product_template
 from . import res_company
 from . import intrastat_common
 from . import account_fiscal_position
+from . import account_move
diff --git a/intrastat_base/models/account_fiscal_position.py b/intrastat_base/models/account_fiscal_position.py
index baacbdd..fe3ebfb 100644
--- a/intrastat_base/models/account_fiscal_position.py
+++ b/intrastat_base/models/account_fiscal_position.py
@@ -11,7 +11,7 @@ class AccountFiscalPosition(models.Model):
     intrastat = fields.Boolean(
         string="Intrastat",
         help="Set to True if the invoices with this fiscal position should "
-        "be taken into account for the generation of the intrastat reports."
+        "be taken into account for the generation of the intrastat reports.",
     )
 
 
@@ -26,5 +26,5 @@ class AccountChartTemplate(models.Model):
 
     def _get_fp_vals(self, company, position):
         vals = super()._get_fp_vals(company, position)
-        vals['intrastat'] = position.intrastat
+        vals["intrastat"] = position.intrastat
         return vals
diff --git a/intrastat_base/models/account_move.py b/intrastat_base/models/account_move.py
new file mode 100644
index 0000000..eef7d73
--- /dev/null
+++ b/intrastat_base/models/account_move.py
@@ -0,0 +1,13 @@
+# Copyright 2020 Akretion France (http://www.akretion.com/)
+# @author: <alexis.delattre@akretion.com>
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
+
+from odoo import fields, models
+
+
+class AccountMove(models.Model):
+    _inherit = "account.move"
+
+    intrastat_fiscal_position = fields.Boolean(
+        related="fiscal_position_id.intrastat", store=True,
+        string="Intrastat Fiscal Position")
diff --git a/intrastat_base/models/intrastat_common.py b/intrastat_base/models/intrastat_common.py
index a78ae4d..abac2ec 100644
--- a/intrastat_base/models/intrastat_common.py
+++ b/intrastat_base/models/intrastat_common.py
@@ -2,7 +2,6 @@
 # Copyright 2009-2020 Noviat (http://www.noviat.com)
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
 
-import base64
 import logging
 from io import BytesIO
 from sys import exc_info
@@ -78,7 +77,7 @@ class IntrastatCommon(models.AbstractModel):
                 "name": filename,
                 "res_id": self.id,
                 "res_model": self._name,
-                "datas": base64.encodebytes(xml_bytes),
+                "raw": xml_bytes,
             }
         )
         return attach.id
diff --git a/intrastat_base/views/account_fiscal_position.xml b/intrastat_base/views/account_fiscal_position.xml
index 1a4edec..f67a1bd 100644
--- a/intrastat_base/views/account_fiscal_position.xml
+++ b/intrastat_base/views/account_fiscal_position.xml
@@ -11,7 +11,7 @@
         <field name="inherit_id" ref="account.view_account_position_form" />
         <field name="arch" type="xml">
             <field name="vat_required" position="after">
-                <field name="intrastat"/>
+                <field name="intrastat" />
             </field>
         </field>
     </record>
@@ -21,7 +21,7 @@
         <field name="inherit_id" ref="account.view_account_position_tree" />
         <field name="arch" type="xml">
             <field name="name" position="after">
-                <field name="intrastat" optional="show"/>
+                <field name="intrastat" optional="show" />
             </field>
         </field>
     </record>