diff --git a/addons/delivery/models/stock_picking.py b/addons/delivery/models/stock_picking.py
index 946655e55100046ebf1a6f181640da27f47a247c..c5bb9da8f22fd21b048a4cf400d55422728ab4c0 100644
--- a/addons/delivery/models/stock_picking.py
+++ b/addons/delivery/models/stock_picking.py
@@ -272,6 +272,10 @@ class StockPicking(models.Model):
             weight += move.product_qty * move.product_id.weight
         return weight
 
+    def _should_generate_commercial_invoice(self):
+        self.ensure_one()
+        return self.picking_type_id.warehouse_id.partner_id.country_id != self.partner_id.country_id
+
 
 class StockReturnPicking(models.TransientModel):
     _inherit = 'stock.return.picking'
diff --git a/addons/l10n_in_stock/__init__.py b/addons/l10n_in_stock/__init__.py
index 67dee8c60dbf8317b263fbc3279f0823b2eb4b35..dc5e6b693d19dcacd224b7ab27b26f75e66cb7b2 100644
--- a/addons/l10n_in_stock/__init__.py
+++ b/addons/l10n_in_stock/__init__.py
@@ -1,2 +1,4 @@
 # -*- coding: utf-8 -*-
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
+
+from . import models
diff --git a/addons/l10n_in_stock/models/__init__.py b/addons/l10n_in_stock/models/__init__.py
new file mode 100644
index 0000000000000000000000000000000000000000..ac9517445aee0dc127d1d8136bb61d718d21ea22
--- /dev/null
+++ b/addons/l10n_in_stock/models/__init__.py
@@ -0,0 +1,4 @@
+# -*- coding: utf-8 -*-
+# Part of Odoo. See LICENSE file for full copyright and licensing details.
+
+from . import stock_picking
diff --git a/addons/l10n_in_stock/models/stock_picking.py b/addons/l10n_in_stock/models/stock_picking.py
new file mode 100644
index 0000000000000000000000000000000000000000..ec0f5c1972d785060a983216fb67c4516277fddf
--- /dev/null
+++ b/addons/l10n_in_stock/models/stock_picking.py
@@ -0,0 +1,12 @@
+# -*- coding: utf-8 -*-
+# Part of Odoo. See LICENSE file for full copyright and licensing details.
+
+from odoo import models
+
+
+class StockPicking(models.Model):
+    _inherit = 'stock.picking'
+
+    def _should_generate_commercial_invoice(self):
+        super(StockPicking, self)._should_generate_commercial_invoice()
+        return True