From c81216fc07aa17f523362814b551364ac239f28a Mon Sep 17 00:00:00 2001
From: Andrea <a.stirpe@onestein.nl>
Date: Thu, 9 Apr 2020 14:15:15 +0200
Subject: [PATCH] [FIX] multicompany rule

---
 .../migrations/13.0.1.0.0/noupdate_changes.xml        |  8 ++++++++
 .../migrations/13.0.1.0.0/post-migration.py           | 11 +++++++++++
 account_payment_mode/readme/CONTRIBUTORS.rst          |  1 +
 .../security/account_payment_mode.xml                 |  2 +-
 4 files changed, 21 insertions(+), 1 deletion(-)
 create mode 100644 account_payment_mode/migrations/13.0.1.0.0/noupdate_changes.xml
 create mode 100644 account_payment_mode/migrations/13.0.1.0.0/post-migration.py

diff --git a/account_payment_mode/migrations/13.0.1.0.0/noupdate_changes.xml b/account_payment_mode/migrations/13.0.1.0.0/noupdate_changes.xml
new file mode 100644
index 000000000..5b9125351
--- /dev/null
+++ b/account_payment_mode/migrations/13.0.1.0.0/noupdate_changes.xml
@@ -0,0 +1,8 @@
+<?xml version='1.0' encoding='utf-8' ?>
+<odoo>
+    <record id="account_payment_mode_company_rule" model="ir.rule">
+        <field
+            name="domain_force"
+        >['|',('company_id','=',False),('company_id','in',company_ids)]</field>
+    </record>
+</odoo>
diff --git a/account_payment_mode/migrations/13.0.1.0.0/post-migration.py b/account_payment_mode/migrations/13.0.1.0.0/post-migration.py
new file mode 100644
index 000000000..cf2e5dae1
--- /dev/null
+++ b/account_payment_mode/migrations/13.0.1.0.0/post-migration.py
@@ -0,0 +1,11 @@
+# Copyright 2020 Tecnativa - Pedro M. Baeza
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
+
+from openupgradelib import openupgrade  # pylint: disable=W7936
+
+
+@openupgrade.migrate()
+def migrate(env, version):
+    openupgrade.load_data(
+        env.cr, "account_payment_mode", "migrations/13.0.1.0.0/noupdate_changes.xml"
+    )
diff --git a/account_payment_mode/readme/CONTRIBUTORS.rst b/account_payment_mode/readme/CONTRIBUTORS.rst
index e1a9f6eb0..9d4546c37 100644
--- a/account_payment_mode/readme/CONTRIBUTORS.rst
+++ b/account_payment_mode/readme/CONTRIBUTORS.rst
@@ -1,2 +1,3 @@
 * Alexis de Lattre <alexis.delattre@akretion.com>
 * Eric Lembregts <eric@lembregts.eu>
+* Andrea Stirpe <a.stirpe@onestein.nl>
diff --git a/account_payment_mode/security/account_payment_mode.xml b/account_payment_mode/security/account_payment_mode.xml
index 506ba65d2..c5a63de19 100644
--- a/account_payment_mode/security/account_payment_mode.xml
+++ b/account_payment_mode/security/account_payment_mode.xml
@@ -5,6 +5,6 @@
         <field name="model_id" ref="model_account_payment_mode" />
         <field
             name="domain_force"
-        >['|', ('company_id', '=', False), ('company_id', 'child_of', [user.company_id.id])]</field>
+        >['|', ('company_id', '=', False), ('company_id', 'in', company_ids)]</field>
     </record>
 </odoo>