diff --git a/addons/account/views/res_config_view.xml b/addons/account/views/res_config_view.xml
index eef5a5d92d3..14b4f4000a0 100644
--- a/addons/account/views/res_config_view.xml
+++ b/addons/account/views/res_config_view.xml
@@ -144,7 +144,7 @@
                             </div>
                         </div>
                         <h2>Invoicing</h2>
-                        <div class="row mt16 o_settings_container">
+                        <div class="row mt16 o_settings_container" id="invoicing_settings">
                             <div class="col-xs-12 col-md-6 o_setting_box">
                                 <div class="o_setting_left_pane">
                                     <field name="group_proforma_invoices"/>
diff --git a/addons/l10n_mx/__manifest__.py b/addons/l10n_mx/__manifest__.py
index 0c57a21ca78..8ec93d7a7e3 100644
--- a/addons/l10n_mx/__manifest__.py
+++ b/addons/l10n_mx/__manifest__.py
@@ -41,5 +41,6 @@ With this module you will have:
         "data/account_tax_data.xml",
         "data/account_chart_template_data.yml",
         "data/fiscal_position_data.xml",
+        "views/res_config_view.xml",
     ],
 }
diff --git a/addons/l10n_mx/models/__init__.py b/addons/l10n_mx/models/__init__.py
index 5376a315b04..f2b298f3cb9 100644
--- a/addons/l10n_mx/models/__init__.py
+++ b/addons/l10n_mx/models/__init__.py
@@ -4,3 +4,4 @@
 
 from . import chart_template
 from . import account
+from . import res_config
diff --git a/addons/l10n_mx/models/res_config.py b/addons/l10n_mx/models/res_config.py
new file mode 100644
index 00000000000..913a422cf4b
--- /dev/null
+++ b/addons/l10n_mx/models/res_config.py
@@ -0,0 +1,9 @@
+# -*- coding: utf-8 -*-
+
+from odoo import fields, models
+
+
+class AccountConfigSettings(models.TransientModel):
+    _inherit = 'res.config.settings'
+
+    module_l10n_mx_edi = fields.Boolean('Mexican Electronic Invoicing')
diff --git a/addons/l10n_mx/views/res_config_view.xml b/addons/l10n_mx/views/res_config_view.xml
new file mode 100644
index 00000000000..d5f59f6937f
--- /dev/null
+++ b/addons/l10n_mx/views/res_config_view.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+    <record id="account_config_settings_account_mx_inherit" model="ir.ui.view">
+        <field name="name">account.config.settings.form.inherit</field>
+        <field name="model">account.config.settings</field>
+        <field name="inherit_id" ref="account.account_config_settings_view_form"/>
+        <field name="arch" type="xml">
+            <xpath expr=".//div[@id='invoicing_settings']" position="inside">
+                <div class="col-xs-12 col-md-6 o_setting_box">
+                    <div class="o_setting_left_pane">
+                        <field name="module_l10n_mx_edi" class="oe_inline" widget="upgrade_boolean"/>
+                    </div>
+                    <div class="o_setting_right_pane">
+                        <label for="module_l10n_mx_edi"/>
+                        <div class="text-muted">
+                            Create your electronic invoices automatically (CFDI format)
+                        </div>
+                    </div>
+                </div>
+            </xpath>
+        </field>
+    </record>
+</odoo>