From 3c1e886cedb30350f4015cfac46729efa9a85418 Mon Sep 17 00:00:00 2001 From: jem-odoo <jem@openerp.com> Date: Mon, 4 Jun 2018 13:21:20 +0200 Subject: [PATCH] [IMP] purchase: add access rule for report When splitting purchase and stock, the access rules of the report was wrongly moved to purchase_stock. This commit restores balance in the universe. --- addons/purchase/security/ir.model.access.csv | 2 ++ addons/purchase/security/purchase_security.xml | 8 ++++++++ addons/purchase_stock/__manifest__.py | 1 - addons/purchase_stock/security/ir.model.access.csv | 2 -- .../security/purchase_stock_security.xml | 13 ------------- 5 files changed, 10 insertions(+), 16 deletions(-) delete mode 100644 addons/purchase_stock/security/purchase_stock_security.xml diff --git a/addons/purchase/security/ir.model.access.csv b/addons/purchase/security/ir.model.access.csv index e2c47c7dc419..e7fa2d8ad40b 100644 --- a/addons/purchase/security/ir.model.access.csv +++ b/addons/purchase/security/ir.model.access.csv @@ -38,3 +38,5 @@ access_account_journal_purchase_manager,account.journal purchase manager,account access_product_price_history_purchase_user,prices.history purchase user,product.model_product_price_history,purchase.group_purchase_user,1,0,0,0 access_product_price_history_purchase_manager,prices.history purchase manager,product.model_product_price_history,purchase.group_purchase_manager,1,1,1,1 access_purchase_bill_union,access_purchase_bill_union,model_purchase_bill_union,purchase.group_purchase_user,1,0,0,0 +access_report_purchase_order,purchase.stock.report,model_purchase_report,purchase.group_purchase_manager,1,0,0,0 +access_report_purchase_order_user,purchase.stock.report user,model_purchase_report,purchase.group_purchase_user,1,0,0,0 \ No newline at end of file diff --git a/addons/purchase/security/purchase_security.xml b/addons/purchase/security/purchase_security.xml index 5633528a2737..c85656854863 100644 --- a/addons/purchase/security/purchase_security.xml +++ b/addons/purchase/security/purchase_security.xml @@ -66,5 +66,13 @@ <field name="global" eval="True"/> <field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field> </record> + + <record id="purchase_order_report_comp_rule" model="ir.rule"> + <field name="name">Purchase Order Report multi-company</field> + <field name="model_id" ref="model_purchase_report"/> + <field name="global" eval="True"/> + <field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field> + </record> + </data> </odoo> diff --git a/addons/purchase_stock/__manifest__.py b/addons/purchase_stock/__manifest__.py index e0feb2425af5..1701118709bc 100644 --- a/addons/purchase_stock/__manifest__.py +++ b/addons/purchase_stock/__manifest__.py @@ -12,7 +12,6 @@ 'depends': ['stock_account', 'purchase'], 'data': [ 'security/ir.model.access.csv', - 'security/purchase_stock_security.xml', 'data/purchase_stock_data.xml', 'data/mail_data.xml', 'views/purchase_views.xml', diff --git a/addons/purchase_stock/security/ir.model.access.csv b/addons/purchase_stock/security/ir.model.access.csv index f83098c627e8..82b377f73188 100644 --- a/addons/purchase_stock/security/ir.model.access.csv +++ b/addons/purchase_stock/security/ir.model.access.csv @@ -12,5 +12,3 @@ access_stock_move_purchase_user_manager,stock.move,stock.model_stock_move,purcha access_stock_location_purchase_manager,stock.location purchase manager,stock.model_stock_location,purchase.group_purchase_manager,1,0,0,0 access_stock_warehouse_orderpoint_manager,stock.warehouse.orderpoint,stock.model_stock_warehouse_orderpoint,purchase.group_purchase_manager,1,0,0,0 access_stock_warehouse_orderpoint_user,stock.warehouse.orderpoint,stock.model_stock_warehouse_orderpoint,purchase.group_purchase_user,1,0,0,0 -access_report_purchase_order,purchase.stock.report,model_purchase_report,purchase.group_purchase_manager,1,0,0,0 -access_report_purchase_order_user,purchase.stock.report user,model_purchase_report,purchase.group_purchase_user,1,0,0,0 diff --git a/addons/purchase_stock/security/purchase_stock_security.xml b/addons/purchase_stock/security/purchase_stock_security.xml deleted file mode 100644 index 991f398f9cc8..000000000000 --- a/addons/purchase_stock/security/purchase_stock_security.xml +++ /dev/null @@ -1,13 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<odoo> -<data noupdate="1"> - - <record id="purchase_order_report_comp_rule" model="ir.rule"> - <field name="name">Purchase Order Report multi-company</field> - <field name="model_id" ref="model_purchase_report"/> - <field name="global" eval="True"/> - <field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field> - </record> - -</data> -</odoo> \ No newline at end of file -- GitLab