[IMP] l10n_it_dichiarazione_intento: Adapt to v12

eLBati · Jan 24, 2022 · 803afa5 · 803afa5
1 parent 0eb3a87
commit 803afa5
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 11 deletions.
diff --git a/l10n_it_dichiarazione_intento/models/dichiarazione_intento.py b/l10n_it_dichiarazione_intento/models/dichiarazione_intento.py
@@ -76,7 +76,7 @@ def _default_currency(self):
     limit_amount = fields.Monetary(required=True)
     available_amount = fields.Monetary(compute='_compute_amounts', store=True)
     company_id = fields.Many2one(
-        "res.company", string="Company", default=lambda self: self.env.company
+        "res.company", string="Company", default=lambda self: self.env.user.company_id,
     )
     currency_id = fields.Many2one('res.currency', string='Currency',
                                   default=_default_currency,)
@@ -272,6 +272,6 @@ class DichiarazioneIntentoLine(models.Model):
         string='Date Invoice'
     )
     company_id = fields.Many2one(
-        "res.company", string="Company", related="declaration_id.company_id"
+        "res.company", string="Company", related="dichiarazione_id.company_id"
     )
     currency_id = fields.Many2one('res.currency', string='Currency')
diff --git a/l10n_it_dichiarazione_intento/security/declaration_security.xml b/l10n_it_dichiarazione_intento/security/declaration_security.xml
@@ -1,40 +1,42 @@
 <?xml version="1.0" encoding="utf-8" ?>
+<!--
+  ~ Copyright 2022 Simone Rubino - Takobi
+  ~ License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl).
+  -->
+
 <odoo noupdate="1">
 
     <!-- Multi - Company Rules -->
     <record id="yearly_limit_company_rule" model="ir.rule">
         <field name="name">Yearly limit multi-company</field>
         <field
             name="model_id"
-            ref="l10n_it_declaration_of_intent.model_l10n_it_declaration_of_intent_yearly_limit"
+            ref="model_dichiarazione_intento_yearly_limit"
         />
-        <field name="global" eval="True" />
         <field name="domain_force">
-            ['|',('company_id','=',False),('company_id','in',company_ids)]
+            ['|', ('company_id', '=', False), ('company_id', 'in', user.company_ids.ids)]
         </field>
     </record>
 
     <record id="declaration_company_rule" model="ir.rule">
         <field name="name">Declaration multi-company</field>
         <field
             name="model_id"
-            ref="l10n_it_declaration_of_intent.model_l10n_it_declaration_of_intent_declaration"
+            ref="model_dichiarazione_intento"
         />
-        <field name="global" eval="True" />
         <field name="domain_force">
-            ['|',('company_id','=',False),('company_id','in',company_ids)]
+            ['|', ('company_id', '=', False), ('company_id', 'in', user.company_ids.ids)]
         </field>
     </record>
 
     <record id="declaration_line_company_rule" model="ir.rule">
         <field name="name">Declaration line multi-company</field>
         <field
             name="model_id"
-            ref="l10n_it_declaration_of_intent.model_l10n_it_declaration_of_intent_declaration_line"
+            ref="model_dichiarazione_intento_line"
         />
-        <field name="global" eval="True" />
         <field name="domain_force">
-            ['|',('company_id','=',False),('company_id','in',company_ids)]
+            ['|', ('company_id', '=', False), ('company_id', 'in', user.company_ids.ids)]
         </field>
     </record>