diff --git a/__manifest__.py b/__manifest__.py index c0e6d863903adda0aaddd694947671868ff44333..f77e30e509f7a4929efe1ad88d161f33fcf0b99f 100644 --- a/__manifest__.py +++ b/__manifest__.py @@ -9,7 +9,6 @@ "depends": [ "cgscop_partner", "cgscop_cotisation", - "multi_company_menu", ], "data": [ "security/security_rules.xml", diff --git a/models/res_config_settings.py b/models/res_config_settings.py index 75d9f8f60f7cb078d47410d70a94e03ea2e5f4d8..f059d8019a859fe802ce40496fcd7c1bf500b6be 100644 --- a/models/res_config_settings.py +++ b/models/res_config_settings.py @@ -8,18 +8,3 @@ class ScopInvoiceIDFConfigSettings(models.TransientModel): _inherit = "res.config.settings" is_invoice_idf = fields.Boolean(related="company_id.is_invoice_idf", readonly=False) - - # TODO: Remove during migration 14.0 - def execute(self): - """ - Rewrite execute() function to add current company to the list - of available company in ir_ui_menu - """ - res = super(ScopInvoiceIDFConfigSettings, self).execute() - - menu_invoice_idf = self.env.ref("cgscop_invoice_idf.menu_scop_invoice_idf") - - bool_condition = self.is_invoice_idf - - self.add_company_to_menu(menu_invoice_idf, bool_condition) - return res diff --git a/models/scop_invoice_idf.py b/models/scop_invoice_idf.py index fd82962afd61307358f4443620c8f380c27b4c6e..eb138454574b20c07750509fb15247d337808198 100644 --- a/models/scop_invoice_idf.py +++ b/models/scop_invoice_idf.py @@ -44,7 +44,7 @@ class ScopInvoiceIDF(models.Model): ) debit = fields.Monetary(string="Débit", currency_field="currency_id") credit = fields.Monetary(string="Crédit", currency_field="currency_id") - amount_residual = fields.Float( + amount_residual = fields.Monetary( string="Reste à payer", compute="_compute_amount_residual", store=True, diff --git a/security/security_rules.xml b/security/security_rules.xml index aa269ac2b3727359083f1a163aa09af78f16472f..4c60110461346972f0b24dd13cddab8b2e2c1185 100644 --- a/security/security_rules.xml +++ b/security/security_rules.xml @@ -25,7 +25,7 @@ <field name="groups" eval="[(6, 0, [ref('group_cg_invoice_idf_admin')])]" /> <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> <field name="perm_read" eval="True" /> <field name="perm_write" eval="True" /> <field name="perm_create" eval="True" /> @@ -40,7 +40,7 @@ <field name="groups" eval="[(6, 0, [ref('group_cg_invoice_idf_admin')])]" /> <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> <field name="perm_read" eval="True" /> <field name="perm_write" eval="True" /> <field name="perm_create" eval="True" /> @@ -53,7 +53,7 @@ <field name="groups" eval="[(6, 0, [ref('group_cg_invoice_idf_admin')])]" /> <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> <field name="perm_read" eval="True" /> <field name="perm_write" eval="True" /> <field name="perm_create" eval="True" />