diff --git a/intrastat_base/models/account_chart_template.py b/intrastat_base/models/account_chart_template.py
new file mode 100644
index 0000000..939e9e2
--- /dev/null
+++ b/intrastat_base/models/account_chart_template.py
@@ -0,0 +1,17 @@
+# 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 models
+
+
+class AccountChartTemplate(models.Model):
+    _inherit = "account.chart.template"
+
+    def _get_fp_vals(self, company, position):
+        """
+        Get fiscal position chart template instrastat value
+        to create fiscal position
+        """
+        vals = super()._get_fp_vals(company, position)
+        vals["intrastat"] = position.intrastat
+        return vals
diff --git a/intrastat_base/models/account_fiscal_position.py b/intrastat_base/models/account_fiscal_position.py
index fe3ebfb..0c56e59 100644
--- a/intrastat_base/models/account_fiscal_position.py
+++ b/intrastat_base/models/account_fiscal_position.py
@@ -13,18 +13,3 @@ class AccountFiscalPosition(models.Model):
         help="Set to True if the invoices with this fiscal position should "
         "be taken into account for the generation of the intrastat reports.",
     )
-
-
-class AccountFiscalPositionTemplate(models.Model):
-    _inherit = "account.fiscal.position.template"
-
-    intrastat = fields.Boolean(string="Intrastat")
-
-
-class AccountChartTemplate(models.Model):
-    _inherit = "account.chart.template"
-
-    def _get_fp_vals(self, company, position):
-        vals = super()._get_fp_vals(company, position)
-        vals["intrastat"] = position.intrastat
-        return vals
diff --git a/intrastat_base/models/account_fiscal_position_template.py b/intrastat_base/models/account_fiscal_position_template.py
new file mode 100644
index 0000000..9085f53
--- /dev/null
+++ b/intrastat_base/models/account_fiscal_position_template.py
@@ -0,0 +1,14 @@
+# 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 AccountFiscalPositionTemplate(models.Model):
+    _inherit = "account.fiscal.position.template"
+
+    intrastat = fields.Boolean(
+        string="Intrastat",
+        help="Check this if you want to generate intrastat declarations with"
+        "the created fiscal position",
+    )