Merge PR #449 into 15.0

Signed-off-by LoisRForgeFlow
OCA · May 7, 2024 · 95374cf · 95374cf
2 parents 03a4951 + 8958b47
commit 95374cf
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 0 deletions.
diff --git a/ddmrp_history/__manifest__.py b/ddmrp_history/__manifest__.py
@@ -13,6 +13,7 @@
     "depends": ["ddmrp"],
     "data": [
         "security/ir.model.access.csv",
+        "security/security.xml",
         "views/ddmrp_history_view.xml",
         "views/stock_buffer_view.xml",
     ],

diff --git a/ddmrp_history/models/ddmrp_history.py b/ddmrp_history/models/ddmrp_history.py
@@ -48,3 +48,6 @@ class DdmrpHistory(models.Model):
         group_operator="avg",
         help="Average Daily Usage",
     )
+    company_id = fields.Many2one(
+        related="buffer_id.company_id",
+    )
diff --git a/ddmrp_history/security/security.xml b/ddmrp_history/security/security.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<!-- Copyright 2024 ForgeFlow S.L. (https://www.forgeflow.com)
+     License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl-3.0) -->
+<odoo>
+    <record id="ddmrp_history_multicompany" model="ir.rule">
+        <field name="name">DDMRP History Multi-Company</field>
+        <field name="model_id" ref="model_ddmrp_history" />
+        <field eval="True" name="global" />
+        <field
+            name="domain_force"
+        >['|',('company_id', 'in', company_ids),('company_id','=',False)]</field>
+    </record>
+</odoo>
diff --git a/ddmrp_history/views/ddmrp_history_view.xml b/ddmrp_history/views/ddmrp_history_view.xml
@@ -15,6 +15,11 @@
                 <field name="net_flow_position" />
                 <field name="on_hand_position" />
                 <field name="date" />
+                <field
+                    name="company_id"
+                    groups="base.group_multi_company"
+                    optional="hide"
+                />
             </tree>
         </field>
     </record>