diff --git a/stock_multi_store/__manifest__.py b/stock_multi_store/__manifest__.py
index 53a9d81d..f0ab3492 100644
--- a/stock_multi_store/__manifest__.py
+++ b/stock_multi_store/__manifest__.py
@@ -19,7 +19,7 @@
##############################################################################
{
"name": "Multi Store for Warehouse",
- "version": "18.0.1.4.0",
+ "version": "18.0.1.4.1",
"category": "Accounting",
"sequence": 14,
"summary": "",
diff --git a/stock_multi_store/migrations/18.0.1.4.1/pre-migration.py b/stock_multi_store/migrations/18.0.1.4.1/pre-migration.py
new file mode 100644
index 00000000..2eefc223
--- /dev/null
+++ b/stock_multi_store/migrations/18.0.1.4.1/pre-migration.py
@@ -0,0 +1,25 @@
+from openupgradelib import openupgrade
+
+
+@openupgrade.migrate()
+def migrate(env, version):
+ domain_force = (
+ "['|', ('picking_type_id.code', '=', 'dropship'), "
+ "'|', ('picking_type_id.warehouse_id', '=', False), "
+ "'|', ('picking_type_id.warehouse_id.store_id', '=', False), "
+ "('picking_type_id.warehouse_id.store_id', 'child_of', "
+ "user.store_ids.ids)]"
+ )
+ openupgrade.logged_query(
+ env.cr,
+ """
+ UPDATE ir_rule rule
+ SET domain_force = %s
+ FROM ir_model_data data
+ WHERE data.model = 'ir.rule'
+ AND data.module = 'stock_multi_store'
+ AND data.name = 'stock_picking_store_rule'
+ AND data.res_id = rule.id
+ """,
+ (domain_force,),
+ )
diff --git a/stock_multi_store/security/multi_store_security.xml b/stock_multi_store/security/multi_store_security.xml
index 74ba6b5d..fe144a8a 100644
--- a/stock_multi_store/security/multi_store_security.xml
+++ b/stock_multi_store/security/multi_store_security.xml
@@ -23,6 +23,6 @@
- ['|', ('picking_type_id.code','=','dropship'),'|',('picking_type_id.warehouse_id.store_id','=',False),('picking_type_id.warehouse_id.store_id','child_of',user.store_ids.ids)]
+ ['|', ('picking_type_id.code', '=', 'dropship'), '|', ('picking_type_id.warehouse_id', '=', False), '|', ('picking_type_id.warehouse_id.store_id', '=', False), ('picking_type_id.warehouse_id.store_id', 'child_of', user.store_ids.ids)]