Merge PR #77 into 16.0

Signed-off-by legalsylvain
grap · Jan 24, 2025 · 20652d0 · 20652d0
2 parents 2fbff2a + 7d22ef2
commit 20652d0
Show file tree

Hide file tree

Showing 6 changed files with 21 additions and 21 deletions.
diff --git a/fiscal_company_account/__manifest__.py b/fiscal_company_account/__manifest__.py
@@ -19,7 +19,7 @@
     ],
     "data": [
         "security/ir_rule.xml",
-        # "views/menu.xml",
+        "views/menu.xml",
         # "views/view_account_move.xml",
         # "views/view_res_partner.xml",
     ],

diff --git a/fiscal_company_account/readme/DESCRIPTION.rst b/fiscal_company_account/readme/DESCRIPTION.rst
@@ -12,3 +12,5 @@ status for french companies.
     * Following fields property are propagated in all the fiscal child company:
         * product_category / property_account_income_categ_id;
         * product_category / property_account_expense_categ_id;
+
+* Hide the Account Dashboard menu.
diff --git a/fiscal_company_account/views/menu.xml b/fiscal_company_account/views/menu.xml
@@ -9,7 +9,7 @@ License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
     <!--
     Disable account journal kanban view because the function get_line_graph_datas
     and get_journal_dashboard_datas are hard coded with SQL request. So security
-    is not ensured
+    is not ensured and data are wrong.
     -->
     <record id="account.menu_board_journal_1" model="ir.ui.menu">
         <field name="groups_id" eval="[(6, 0, [ref('fiscal_company_base.fiscal_company_disabled_feature')])]"/>

diff --git a/fiscal_company_base/__manifest__.py b/fiscal_company_base/__manifest__.py
@@ -19,6 +19,7 @@
     ],
     "data": [
         "security/ir_rule.xml",
+        "security/res_groups.xml",
         "views/view_res_company.xml",
     ],
     "demo": [

diff --git a/fiscal_company_base/security/ir_rule.xml b/fiscal_company_base/security/ir_rule.xml
@@ -21,23 +21,4 @@ Copyright (C) 2013-Today GRAP (http://www.grap.coop)
         </field>
     </record>
 
-    <!--
-    recreate a new rule, because base.res_partner_rule is noupdatable
-    and to prevent errors, when uninstalling module
-    -->
-<!--     <record id="res_partner_rule" model="ir.rule">
-        <field name="name">res.partner CAE company</field>
-        <field name="model_id" ref="base.model_res_partner"/>
-        <field name="domain_force">[
-            '|', '|', '|', '|', '|',
-            ('company_id', '=', user.company_id.id),
-            ('company_id', '=', user.company_id.fiscal_company_id.id),
-            ('company_id', 'in', [c.id for c in user.company_id.fiscal_child_ids]),
-            ('company_id', '=', False),
-            ('is_odoo_user', '=', True),
-            ('is_odoo_company', '=', True),
-        ]</field>
-
-    </record> -->
-
 </odoo>
diff --git a/fiscal_company_base/security/res_groups.xml b/fiscal_company_base/security/res_groups.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Copyright (C) 2013-Today GRAP (http://www.grap.coop)
+@author Julien Weste
+@author: Sylvain LE GAL (https://twitter.com/legalsylvain)
+ License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
+-->
+
+<odoo>
+
+    <record id="fiscal_company_disabled_feature" model="res.groups">
+        <field name="name">Disabled Features (Fiscal Company)</field>
+        <field name="category_id" ref="base.module_category_usability" />
+    </record>
+
+</odoo>