diff --git a/__manifest__.py b/__manifest__.py index 00e1c4d5e1d47c4f16098f8175122c1ca3ac9652..68323dd4eaf7448d2feedf1702861c0d73aa1f05 100644 --- a/__manifest__.py +++ b/__manifest__.py @@ -18,6 +18,7 @@ # Views "views/account_move.xml", "views/product.xml", + "views/scop_arescop_group.xml", "views/res_users.xml", ], } diff --git a/models/__init__.py b/models/__init__.py index 61996b0ed2648b97aca8a049e78bf73c17268a48..0746232c61167f2402e5217340e02a2f3d33d10c 100644 --- a/models/__init__.py +++ b/models/__init__.py @@ -3,6 +3,5 @@ from . import scop_arescop_group from . import account_move -from . import ir_ui_menu from . import product from . import res_users diff --git a/models/ir_ui_menu.py b/models/ir_ui_menu.py deleted file mode 100644 index e9fff9190b3bea2c07e210a2d962579ab5fd817f..0000000000000000000000000000000000000000 --- a/models/ir_ui_menu.py +++ /dev/null @@ -1,27 +0,0 @@ -# Copyright 2021 Le Filament -# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl). - -from odoo import api, models, tools - - -class IrUiMenuArescop(models.Model): - _inherit = "ir.ui.menu" - - @api.model - @tools.ormcache("frozenset(self.env.user.groups_id.ids)", "debug") - def _visible_menu_ids(self, debug=False): - """ - Remove account menu for ARESCOP users - :param debug: if debug enabled - :return: set(menu_ids) - """ - menus = super(IrUiMenuArescop, self)._visible_menu_ids(debug) - menu_ids = self.browse(list(menus)) - visible_menu_ids = menu_ids - arescop_company_id = self.env.ref("cgscop_account_arescop.company_arescop") - if self.env.company == arescop_company_id and self.env.user.has_group( - "cgscop_account_arescop.group_cg_arescop_ur" - ): - visible_menu_ids = visible_menu_ids - self.env.ref("account.menu_finance") - - return set(visible_menu_ids.ids) diff --git a/models/scop_arescop_group.py b/models/scop_arescop_group.py index e59ea5826e9325ca1b6d0a82a40c26e97a7bf8ac..b9203043638c49c98be3f9a2e4343e56e5d40da8 100644 --- a/models/scop_arescop_group.py +++ b/models/scop_arescop_group.py @@ -9,3 +9,4 @@ class ScopArescopGroup(models.Model): _description = "Groupes de facturation ARESCOP" name = fields.Char("Nom", required=True, index=True) + analytic_code = fields.Char("Code analytique") diff --git a/views/scop_arescop_group.xml b/views/scop_arescop_group.xml new file mode 100644 index 0000000000000000000000000000000000000000..45fee9dd32d4ce434c0169d4d6ddb7f90f8b4cc6 --- /dev/null +++ b/views/scop_arescop_group.xml @@ -0,0 +1,36 @@ +<?xml version="1.0"?> +<!-- Copyright 2020 Le Filament + License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl). --> + +<odoo> + <data> + <!-- FORM --> + <!-- Inherit Form View to Modify it --> + <record id="scop_arescop_group_tree" model="ir.ui.view"> + <field name="name">scop.arescop.group.tree</field> + <field name="model">scop.arescop.group</field> + <field name="arch" type="xml"> + <tree editable="top"> + <field name="name"/> + <field name="analytic_code"/> + </tree> + </field> + </record> + + <!-- ACTION --> + <record id="action_arescop_groups" model="ir.actions.act_window"> + <field name="name">Groupes ARESCOP</field> + <field name="res_model">scop.arescop.group</field> + <field name="view_mode">tree,form</field> + </record> + + <!-- MENU --> + <menuitem + id="menu_scop_arescop_groups" + parent="base.menu_users" + action="action_arescop_groups" + sequence="80" + /> + + </data> +</odoo>