diff options
| author | Victor Feyens <vfe@odoo.com> | 2020-03-10 18:06:44 +0100 |
|---|---|---|
| committer | Martin Trigaux <mat@odoo.com> | 2020-03-20 16:15:40 +0100 |
| commit | 532c083cbbe0ee6e7a940e2bdc9c677bd56b62fa (patch) | |
| tree | e5602b92b48d3b1405a0f9d93459cf6612204cc1 | |
| parent | f6c06bd0b87dac11d76a3134eb61c7ef4eb59270 (diff) | |
[IMP] *: remove global field definition in ir rules xml
It is a computed field, there is no need to manually set its value.
28 files changed, 4 insertions, 113 deletions
diff --git a/addons/account/security/account_security.xml b/addons/account/security/account_security.xml index 641164df389..f22dc39f7dd 100644 --- a/addons/account/security/account_security.xml +++ b/addons/account/security/account_security.xml @@ -103,105 +103,90 @@ <record id="account_move_comp_rule" model="ir.rule"> <field name="name">Account Entry</field> <field name="model_id" ref="model_account_move"/> - <field name="global" eval="True"/> <field name="domain_force">['|',('company_id','=',False),('company_id', 'in', company_ids)]</field> </record> <record id="account_move_line_comp_rule" model="ir.rule"> <field name="name">Entry lines</field> <field name="model_id" ref="model_account_move_line"/> - <field name="global" eval="True"/> <field name="domain_force">['|',('company_id','=',False),('company_id', 'in', company_ids)]</field> </record> <record id="journal_group_comp_rule" model="ir.rule"> <field name="name">Journal Group multi-company</field> <field name="model_id" ref="model_account_journal_group"/> - <field name="global" eval="True"/> <field name="domain_force">['|',('company_id','=',False),('company_id', 'in', company_ids)]</field> </record> <record id="journal_comp_rule" model="ir.rule"> <field name="name">Journal multi-company</field> <field name="model_id" ref="model_account_journal"/> - <field name="global" eval="True"/> <field name="domain_force">['|',('company_id','=',False),('company_id', 'in', company_ids)]</field> </record> <record id="account_comp_rule" model="ir.rule"> <field name="name">Account multi-company</field> <field name="model_id" ref="model_account_account"/> - <field name="global" eval="True"/> <field name="domain_force">['|',('company_id','=',False),('company_id', 'in', company_ids)]</field> </record> <record id="account_group_comp_rule" model="ir.rule"> <field name="name">Account Group multi-company</field> <field name="model_id" ref="model_account_group"/> - <field name="global" eval="True"/> <field name="domain_force">[('company_id', 'in', company_ids)]</field> </record> <record id="account_root_comp_rule" model="ir.rule"> <field name="name">Account Root multi-company</field> <field name="model_id" ref="model_account_root"/> - <field name="global" eval="True"/> <field name="domain_force">['|',('company_id','=',False),('company_id', 'in', company_ids)]</field> </record> <record id="tax_comp_rule" model="ir.rule"> <field name="name">Tax multi-company</field> <field name="model_id" ref="model_account_tax"/> - <field name="global" eval="True"/> <field name="domain_force">['|',('company_id','=',False),('company_id', 'in', company_ids)]</field> </record> <record id="invoice_analysis_comp_rule" model="ir.rule"> <field name="name">Invoice Analysis multi-company</field> <field name="model_id" ref="model_account_invoice_report"/> - <field name="global" eval="True"/> <field name="domain_force">['|',('company_id','=',False),('company_id', 'in', company_ids)]</field> </record> <record id="account_fiscal_position_comp_rule" model="ir.rule"> <field name="name">Account fiscal Mapping company rule</field> <field name="model_id" ref="model_account_fiscal_position"/> - <field name="global" eval="True"/> <field name="domain_force">['|',('company_id','=',False),('company_id', 'in', company_ids)]</field> </record> <record model="ir.rule" id="account_bank_statement_comp_rule"> <field name="name">Account bank statement company rule</field> <field name="model_id" ref="model_account_bank_statement"/> - <field name="global" eval="True"/> <field name="domain_force">['|',('company_id','=',False),('company_id', 'in', company_ids)]</field> </record> <record model="ir.rule" id="account_bank_statement_line_comp_rule"> <field name="name">Account bank statement line company rule</field> <field name="model_id" ref="model_account_bank_statement_line"/> - <field name="global" eval="True"/> <field name="domain_force">['|',('company_id','=',False),('company_id', 'in', company_ids)]</field> </record> <record model="ir.rule" id="account_reconcile_model_template_comp_rule"> <field name="name">Account reconcile model template company rule</field> <field name="model_id" ref="model_account_reconcile_model"/> - <field name="global" eval="True"/> <field name="domain_force">['|',('company_id','=',False),('company_id', 'in', company_ids)]</field> </record> <record model="ir.rule" id="account_reconcile_model_line_template_comp_rule"> <field name="name">Account reconcile model_line template company rule</field> <field name="model_id" ref="model_account_reconcile_model_line"/> - <field name="global" eval="True"/> <field name="domain_force">['|',('company_id','=',False),('company_id', 'in', company_ids)]</field> </record> <record model="ir.rule" id="account_payment_comp_rule"> <field name="name">Account payment company rule</field> <field name="model_id" ref="model_account_payment"/> - <field name="global" eval="True"/> <field name="domain_force">['|',('company_id','=',False),('company_id', 'in', company_ids)]</field> </record> diff --git a/addons/crm/security/crm_security.xml b/addons/crm/security/crm_security.xml index e96c6f1809a..892ecc7e7dc 100644 --- a/addons/crm/security/crm_security.xml +++ b/addons/crm/security/crm_security.xml @@ -69,7 +69,6 @@ <record id="crm_activity_report_rule_multi_company" model="ir.rule"> <field name="name">CRM Lead Multi-Company</field> <field name="model_id" ref="model_crm_activity_report"/> - <field name="global" eval="True"/> <field name="domain_force">['|',('company_id','=',False),('company_id', 'in', company_ids)]</field> </record> diff --git a/addons/delivery/security/delivery_carrier_security.xml b/addons/delivery/security/delivery_carrier_security.xml index 4f60ee6d286..84b71329eca 100644 --- a/addons/delivery/security/delivery_carrier_security.xml +++ b/addons/delivery/security/delivery_carrier_security.xml @@ -4,7 +4,6 @@ <record model="ir.rule" id="delivery_carrier_comp_rule"> <field name="name">Delivery Carrier multi-company</field> <field name="model_id" ref="model_delivery_carrier"/> - <field name="global" eval="True"/> <field name="domain_force"> ['|', ('company_id', 'in', company_ids), ('company_id', '=', False)]</field> </record> </data> diff --git a/addons/event/security/event_security.xml b/addons/event/security/event_security.xml index 08dd739cf52..613625f2c78 100644 --- a/addons/event/security/event_security.xml +++ b/addons/event/security/event_security.xml @@ -29,7 +29,6 @@ <record model="ir.rule" id="event_event_company_rule"> <field name="name">Event: multi-company</field> <field name="model_id" ref="model_event_event"/> - <field name="global" eval="True"/> <field name="domain_force">['|', ('company_id', '=', False), ('company_id', 'in', company_ids), @@ -39,7 +38,6 @@ <record model="ir.rule" id="event_registration_company_rule"> <field name="name">Event/Registration: multi-company</field> <field name="model_id" ref="model_event_registration"/> - <field name="global" eval="True"/> <field name="domain_force">['|', ('company_id', '=', False), ('company_id', 'in', company_ids), diff --git a/addons/fleet/security/fleet_security.xml b/addons/fleet/security/fleet_security.xml index 3d1dc4b65d2..786a030d1c8 100644 --- a/addons/fleet/security/fleet_security.xml +++ b/addons/fleet/security/fleet_security.xml @@ -83,7 +83,6 @@ <record id="ir_rule_fleet_vehicle" model="ir.rule"> <field name="name">Fleet vehicle: Multi Company</field> <field name="model_id" ref="model_fleet_vehicle"/> - <field name="global" eval="True"/> <field name="domain_force">['|', ('company_id', '=', False), ('company_id', 'in', company_ids)]</field> </record> </data> diff --git a/addons/gamification/security/gamification_security.xml b/addons/gamification/security/gamification_security.xml index 4629c8776b2..0733209d3f6 100644 --- a/addons/gamification/security/gamification_security.xml +++ b/addons/gamification/security/gamification_security.xml @@ -32,7 +32,6 @@ <field name="name">Multicompany rule on challenges</field> <field name="model_id" ref="model_gamification_goal"/> <field name="domain_force">[('user_id.company_id', 'in', company_ids)]</field> - <field name="global" eval="True"/> </record> </data> diff --git a/addons/hr/security/hr_security.xml b/addons/hr/security/hr_security.xml index bbafaf7fb38..5a8d4f01aac 100644 --- a/addons/hr/security/hr_security.xml +++ b/addons/hr/security/hr_security.xml @@ -29,28 +29,24 @@ <record id="hr_employee_comp_rule" model="ir.rule"> <field name="name">Employee multi company rule</field> <field name="model_id" ref="model_hr_employee"/> - <field name="global" eval="True"/> <field name="domain_force">['|',('company_id','=',False),('company_id', 'in', company_ids)]</field> </record> <record id="hr_dept_comp_rule" model="ir.rule"> <field name="name">Department multi company rule</field> <field name="model_id" ref="model_hr_department"/> - <field name="global" eval="True"/> <field name="domain_force">['|',('company_id','=',False),('company_id', 'in', company_ids)]</field> </record> <record id="hr_employee_public_comp_rule" model="ir.rule"> <field name="name">Employee multi company rule</field> <field name="model_id" ref="model_hr_employee_public"/> - <field name="global" eval="True"/> <field name="domain_force">['|',('company_id','=',False),('company_id', 'in', company_ids)]</field> </record> <record id="hr_job_comp_rule" model="ir.rule"> <field name="name">Job multi company rule</field> <field name="model_id" ref="model_hr_job"/> - <field name="global" eval="True"/> <field name="domain_force">['|',('company_id','=',False),('company_id', 'in', company_ids)]</field> </record> diff --git a/addons/hr_contract/security/security.xml b/addons/hr_contract/security/security.xml index 2ffba623cf7..e65a83d488f 100644 --- a/addons/hr_contract/security/security.xml +++ b/addons/hr_contract/security/security.xml @@ -20,7 +20,6 @@ <record id="ir_rule_hr_contract_multi_company" model="ir.rule"> <field name="name">HR Contract: Multi Company</field> <field name="model_id" ref="model_hr_contract"/> - <field name="global" eval="True"/> <field name="domain_force">['|', ('company_id', '=', False), ('company_id', 'in', company_ids)]</field> </record> diff --git a/addons/hr_holidays/security/hr_holidays_security.xml b/addons/hr_holidays/security/hr_holidays_security.xml index f416e939808..f0a15d56563 100644 --- a/addons/hr_holidays/security/hr_holidays_security.xml +++ b/addons/hr_holidays/security/hr_holidays_security.xml @@ -88,7 +88,6 @@ <record id="hr_leave_rule_multicompany" model="ir.rule"> <field name="name">Time Off: multi company global rule</field> <field name="model_id" ref="model_hr_leave"/> - <field name="global" eval="True"/> <field name="domain_force">['|', ('holiday_status_id.company_id', '=', False), ('holiday_status_id.company_id', 'in', company_ids)]</field> </record> @@ -189,7 +188,6 @@ <record id="hr_holidays_status_rule_multi_company" model="ir.rule"> <field name="name">Time Off multi company rule</field> <field name="model_id" ref="model_hr_leave_type"/> - <field name="global" eval="True"/> <field name="domain_force">['|', ('company_id', '=', False), ('company_id', 'in', company_ids)]</field> </record> diff --git a/addons/lunch/security/lunch_security.xml b/addons/lunch/security/lunch_security.xml index 01a59c0057a..8b8c17e80e6 100644 --- a/addons/lunch/security/lunch_security.xml +++ b/addons/lunch/security/lunch_security.xml @@ -68,28 +68,24 @@ <record id="ir_rule_lunch_supplier_multi_company" model="ir.rule"> <field name="name">Lunch supplier: Multi Company</field> <field name="model_id" ref="model_lunch_supplier"/> - <field name="global" eval="True"/> <field name="domain_force">['|', ('company_id', '=', False), ('company_id', 'in', company_ids)]</field> </record> <record id="ir_rule_lunch_product_multi_company" model="ir.rule"> <field name="name">Lunch product: Multi Company</field> <field name="model_id" ref="model_lunch_product"/> - <field name="global" eval="True"/> <field name="domain_force">['|', ('company_id', '=', False), ('company_id', 'in', company_ids)]</field> </record> <record id="ir_rule_lunch_location_multi_company" model="ir.rule"> <field name="name">Lunch location: Multi Company</field> <field name="model_id" ref="model_lunch_location"/> - <field name="global" eval="True"/> <field name="domain_force">['|', ('company_id', '=', False), ('company_id', 'in', company_ids)]</field> </record> <record id="ir_rule_lunch_product_report_multi_company" model="ir.rule"> <field name="name">Lunch product report: Multi Company</field> <field name="model_id" ref="model_lunch_product_report"/> - <field name="global" eval="True"/> <field name="domain_force">['|', ('company_id', '=', False), ('company_id', 'in', company_ids)]</field> </record> </data> diff --git a/addons/mail/security/mail_security.xml b/addons/mail/security/mail_security.xml index 036f9a275c2..c65ed7f641b 100644 --- a/addons/mail/security/mail_security.xml +++ b/addons/mail/security/mail_security.xml @@ -52,7 +52,6 @@ <field name="name">Mail Compose Message Rule</field> <field name="model_id" ref="model_mail_compose_message"/> <field name="domain_force">[('create_uid', '=', user.id)]</field> - <field name="global" eval="True"/> <field name="perm_create" eval="False"/> <field name="perm_read" eval="True"/> <field name="perm_write" eval="True"/> diff --git a/addons/maintenance/security/maintenance.xml b/addons/maintenance/security/maintenance.xml index 8a15e48e01f..5b4912fd03c 100644 --- a/addons/maintenance/security/maintenance.xml +++ b/addons/maintenance/security/maintenance.xml @@ -40,28 +40,24 @@ <record id="maintenance_request_comp_rule" model="ir.rule"> <field name="name">Maintenance Request Multi-company rule</field> <field name="model_id" ref="model_maintenance_request"/> - <field name="global" eval="True"/> <field name="domain_force">['|',('company_id','=',False),('company_id', 'in', company_ids)]</field> </record> <record id="maintenance_equipment_comp_rule" model="ir.rule"> <field name="name">Maintenance Equipment Multi-company rule</field> <field name="model_id" ref="model_maintenance_equipment"/> - <field name="global" eval="True"/> <field name="domain_force">['|',('company_id','=',False),('company_id', 'in', company_ids)]</field> </record> <record id="maintenance_team_comp_rule" model="ir.rule"> <field name="name">Maintenance Team Multi-company rule</field> <field name="model_id" ref="model_maintenance_team"/> - <field name="global" eval="True"/> <field name="domain_force">['|',('company_id','=',False),('company_id', 'in', company_ids)]</field> </record> <record id="maintenance_equipment_category_comp_rule" model="ir.rule"> <field name="name">Maintenance Equipment Category Multi-company rule</field> <field name="model_id" ref="model_maintenance_equipment_category"/> - <field name="global" eval="True"/> <field name="domain_force">['|',('company_id','=',False),('company_id', 'in', company_ids)]</field> </record> diff --git a/addons/mrp/security/mrp_security.xml b/addons/mrp/security/mrp_security.xml index fc4854b214c..c1c350dffd1 100644 --- a/addons/mrp/security/mrp_security.xml +++ b/addons/mrp/security/mrp_security.xml @@ -39,70 +39,60 @@ <record model="ir.rule" id="mrp_production_rule"> <field name="name">mrp_production multi-company</field> <field name="model_id" search="[('model','=','mrp.production')]" model="ir.model"/> - <field name="global" eval="True"/> <field name="domain_force">[('company_id', 'in', company_ids)]</field> </record> <record model="ir.rule" id="mrp_unbuild_rule"> <field name="name">mrp_unbuild multi-company</field> <field name="model_id" search="[('model','=','mrp.unbuild')]" model="ir.model"/> - <field name="global" eval="True"/> <field name="domain_force">[('company_id', 'in', company_ids)]</field> </record> <record model="ir.rule" id="mrp_workcenter_rule"> <field name="name">mrp_workcenter multi-company</field> <field name="model_id" search="[('model','=','mrp.workcenter')]" model="ir.model"/> - <field name="global" eval="True"/> <field name="domain_force">['|',('company_id', 'in', company_ids),('company_id','=',False)]</field> </record> <record model="ir.rule" id="mrp_workorder_rule"> <field name="name">mrp_workorder multi-company</field> <field name="model_id" search="[('model','=','mrp.workorder')]" model="ir.model"/> - <field name="global" eval="True"/> <field name="domain_force">[('company_id', 'in', company_ids)]</field> </record> <record model="ir.rule" id="mrp_bom_rule"> <field name="name">mrp_bom multi-company</field> <field name="model_id" search="[('model','=','mrp.bom')]" model="ir.model"/> - <field name="global" eval="True"/> <field name="domain_force">['|',('company_id', 'in', company_ids),('company_id','=',False)]</field> </record> <record model="ir.rule" id="mrp_bom_line_rule"> <field name="name">mrp_bom_line multi-company</field> <field name="model_id" search="[('model','=','mrp.bom.line')]" model="ir.model"/> - <field name="global" eval="True"/> <field name="domain_force">['|',('company_id', 'in', company_ids),('company_id','=',False)]</field> </record> <record model="ir.rule" id="mrp_bom_byproduct_rule"> <field name="name">mrp_bom_byproduct multi-company</field> <field name="model_id" search="[('model','=','mrp.bom.byproduct')]" model="ir.model"/> - <field name="global" eval="True"/> <field name="domain_force">['|',('company_id', 'in', company_ids),('company_id','=',False)]</field> </record> <record model="ir.rule" id="mrp_routing_rule"> <field name="name">mrp_routing multi-company</field> <field name="model_id" search="[('model','=','mrp.routing')]" model="ir.model"/> - <field name="global" eval="True"/> <field name="domain_force">['|',('company_id', 'in', company_ids),('company_id','=',False)]</field> </record> <record model="ir.rule" id="mrp_routing_workcenter_rule"> <field name="name">mrp_routing_workcenter multi-company</field> <field name="model_id" search="[('model','=','mrp.routing.workcenter')]" model="ir.model"/> - <field name="global" eval="True"/> <field name="domain_force">['|',('company_id', 'in', company_ids),('company_id','=',False)]</field> </record> <record model="ir.rule" id="mrp_workcenter_productivity"> <field name="name">mrp_workcenter_productivity multi-company</field> <field name="model_id" search="[('model','=','mrp.workcenter.productivity')]" model="ir.model"/> - <field name="global" eval="True"/> <field name="domain_force">[('company_id', 'in', company_ids)]</field> </record> diff --git a/addons/note/security/note_security.xml b/addons/note/security/note_security.xml index 6463bbfab1b..6dac46ef040 100644 --- a/addons/note/security/note_security.xml +++ b/addons/note/security/note_security.xml @@ -4,7 +4,6 @@ <field name="name">Only followers can access a sticky notes</field> <field name="model_id" ref="model_note_note"/> <field name="domain_force">['|', ('user_id', '=', user.id), ('message_partner_ids', '=', user.partner_id.id)]</field> - <field name="global" eval="True"/> <field name="perm_create" eval="False"/> <field name="perm_unlink" eval="False"/> </record> @@ -13,7 +12,6 @@ <field name="name">note: create / unlink: responsible</field> <field name="model_id" ref="model_note_note"/> <field name="domain_force">[('user_id', '=', user.id)]</field> - <field name="global" eval="True"/> <field name="perm_write" eval="False"/> <field name="perm_read" eval="False"/> </record> @@ -22,7 +20,6 @@ <field name="name">Each user have his stage name</field> <field name="model_id" ref="model_note_stage"/> <field name="domain_force">['|',('user_id','=',False),('user_id','=',user.id)]</field> - <field name="global" eval="True"/> </record> </odoo> diff --git a/addons/point_of_sale/security/point_of_sale_security.xml b/addons/point_of_sale/security/point_of_sale_security.xml index ca1b8264c3f..095c61fa999 100644 --- a/addons/point_of_sale/security/point_of_sale_security.xml +++ b/addons/point_of_sale/security/point_of_sale_security.xml @@ -50,37 +50,31 @@ <record id="rule_pos_multi_company" model="ir.rule"> <field name="name">Point Of Sale Order</field> <field name="model_id" ref="model_pos_order" /> - <field name="global" eval="True" /> <field name="domain_force">[('company_id', 'in', company_ids)]</field> </record> <record id="rule_pos_session_multi_company" model="ir.rule"> <field name="name">Point Of Sale Session</field> <field name="model_id" ref="model_pos_session" /> - <field name="global" eval="True" /> <field name="domain_force">[('config_id.company_id', 'in', company_ids)]</field> </record> <record id="rule_pos_config_multi_company" model="ir.rule"> <field name="name">Point Of Sale Config</field> <field name="model_id" ref="model_pos_config" /> - <field name="global" eval="True" /> <field name="domain_force">[('company_id', 'in', company_ids)]</field> </record> <record id="rule_pos_order_report_multi_company" model="ir.rule"> <field name="name">Point Of Sale Order Analysis multi-company</field> <field name="model_id" ref="model_report_pos_order"/> - <field name="global" eval="True"/> <field name="domain_force">['|',('company_id','=',False),('company_id', 'in', company_ids)]</field> </record> <record id="rule_pos_payment_method_multi_company" model="ir.rule"> <field name="name">PoS Payment Method</field> <field name="model_id" ref="model_pos_payment_method" /> - <field name="global" eval="True" /> <field name="domain_force">[('company_id', 'in', company_ids)]</field> </record> <record id="rule_pos_payment_multi_company" model="ir.rule"> <field name="name">PoS Payment</field> <field name="model_id" ref="model_pos_payment" /> - <field name="global" eval="True" /> <field name="domain_force">[('company_id', 'in', company_ids)]</field> </record> diff --git a/addons/product/security/product_security.xml b/addons/product/security/product_security.xml index 6da657fca1a..4cbff24b335 100644 --- a/addons/product/security/product_security.xml +++ b/addons/product/security/product_security.xml @@ -34,35 +34,30 @@ <record id="product_comp_rule" model="ir.rule"> <field name="name" >Product multi-company</field> <field name="model_id" ref="model_product_template"/> - <field name="global" eval="True"/> <field name="domain_force"> ['|', ('company_id', 'in', company_ids), ('company_id', '=', False)]</field> </record> <record model="ir.rule" id="product_pricelist_comp_rule"> <field name="name">product pricelist company rule</field> <field name="model_id" ref="model_product_pricelist"/> - <field name="global" eval="True"/> <field name="domain_force"> ['|', ('company_id', 'in', company_ids), ('company_id', '=', False)]</field> </record> <record model="ir.rule" id="product_pricelist_item_comp_rule"> <field name="name">product pricelist item company rule</field> <field name="model_id" ref="model_product_pricelist_item"/> - <field name="global" eval="True"/> <field name="domain_force"> ['|', ('company_id', 'in', company_ids), ('company_id', '=', False)]</field> </record> <record model="ir.rule" id="product_supplierinfo_comp_rule"> <field name="name">product supplierinfo company rule</field> <field name="model_id" ref="model_product_supplierinfo"/> - <field name="global" eval="True"/> <field name="domain_force">['|', ('company_id', '=', False), ('company_id', 'in', company_ids)]</field> </record> <record model="ir.rule" id="product_packaging_comp_rule"> <field name="name">product packaging company rule</field> <field name="model_id" ref="model_product_packaging"/> - <field name="global" eval="True"/> <field name="domain_force">['|', ('company_id', '=', False), ('company_id', 'in', company_ids)]</field> </record> diff --git a/addons/project/security/project_security.xml b/addons/project/security/project_security.xml index 58d51e0fc94..ead2c9c52d5 100644 --- a/addons/project/security/project_security.xml +++ b/addons/project/security/project_security.xml @@ -37,7 +37,6 @@ <record model="ir.rule" id="project_comp_rule"> <field name="name">Project: multi-company</field> <field name="model_id" ref="model_project_project"/> - <field name="global" eval="True"/> <field name="domain_force">[('company_id', 'in', company_ids)]</field> </record> @@ -62,7 +61,6 @@ <record model="ir.rule" id="task_comp_rule"> <field name="name">Project/Task: multi-company</field> <field name="model_id" ref="model_project_task"/> - <field name="global" eval="True"/> <field name="domain_force">[('company_id', 'in', company_ids)]</field> </record> @@ -87,7 +85,6 @@ <record model="ir.rule" id="report_project_task_user_report_comp_rule"> <field name="name">Task Analysis multi-company</field> <field name="model_id" ref="model_report_project_task_user"/> - <field name="global" eval="True"/> <field name="domain_force">[('company_id', 'in', company_ids)]</field> </record> diff --git a/addons/purchase/security/purchase_security.xml b/addons/purchase/security/purchase_security.xml index 715793f8216..883c11e3c82 100644 --- a/addons/purchase/security/purchase_security.xml +++ b/addons/purchase/security/purchase_security.xml @@ -34,14 +34,12 @@ <record model="ir.rule" id="purchase_order_comp_rule"> <field name="name">Purchase Order multi-company</field> <field name="model_id" ref="model_purchase_order"/> - <field name="global" eval="True"/> <field name="domain_force">['|',('company_id','=',False),('company_id', 'in', company_ids)]</field> </record> <record model="ir.rule" id="purchase_order_line_comp_rule"> <field name="name">Purchase Order Line multi-company</field> <field name="model_id" ref="model_purchase_order_line"/> - <field name="global" eval="True"/> <field name="domain_force">['|',('company_id','=',False),('company_id', 'in', company_ids)]</field> </record> @@ -65,14 +63,12 @@ <record model="ir.rule" id="purchase_bill_union_comp_rule"> <field name="name">Purchases & Bills Union multi-company</field> <field name="model_id" ref="model_purchase_bill_union"/> - <field name="global" eval="True"/> <field name="domain_force">['|',('company_id','=',False),('company_id', 'in', company_ids)]</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', 'in', company_ids)]</field> </record> diff --git a/addons/purchase_requisition/security/purchase_requisition_security.xml b/addons/purchase_requisition/security/purchase_requisition_security.xml index 161937c6e92..d18f4792121 100644 --- a/addons/purchase_requisition/security/purchase_requisition_security.xml +++ b/addons/purchase_requisition/security/purchase_requisition_security.xml @@ -5,14 +5,12 @@ <record model="ir.rule" id="purchase_requisition_comp_rule"> <field name="name">Purchase Requisition multi-company</field> <field name="model_id" ref="model_purchase_requisition"/> - <field name="global" eval="True"/> <field name="domain_force">['|',('company_id','=',False),('company_id', 'in', company_ids)]</field> </record> <record model="ir.rule" id="purchase_requisition_line_comp_rule"> <field name="name">Purchase requisition Line multi-company</field> <field name="model_id" ref="model_purchase_requisition_line"/> - <field name="global" eval="True"/> <field name="domain_force">['|',('company_id','=',False),('company_id', 'in', company_ids)]</field> </record> diff --git a/addons/repair/security/repair_security.xml b/addons/repair/security/repair_security.xml index a3a5f7188c6..4f17fb2210c 100644 --- a/addons/repair/security/repair_security.xml +++ b/addons/repair/security/repair_security.xml @@ -6,19 +6,16 @@ <record model="ir.rule" id="repair_order_rule"> <field name="name">repair order multi-company</field> <field name="model_id" search="[('model','=','repair.order')]" model="ir.model"/> - <field name="global" eval="True"/> <field name="domain_force">[('company_id', 'in', company_ids)]</field> </record> <record model="ir.rule" id="repair_line_rule"> <field name="name">repair line multi-company</field> <field name="model_id" search="[('model','=','repair.line')]" model="ir.model"/> - <field name="global" eval="True"/> <field name="domain_force">[('company_id', 'in', company_ids)]</field> </record> <record model="ir.rule" id="repair_fee_rule"> <field name="name">repair fee multi-company</field> <field name="model_id" search="[('model','=','repair.fee')]" model="ir.model"/> - <field name="global" eval="True"/> <field name="domain_force">[('company_id', 'in', company_ids)]</field> </record> diff --git a/addons/sale/security/sale_security.xml b/addons/sale/security/sale_security.xml index fb041d3768f..a4f9ce82f11 100644 --- a/addons/sale/security/sale_security.xml +++ b/addons/sale/security/sale_security.xml @@ -35,21 +35,18 @@ <record model="ir.rule" id="sale_order_comp_rule"> <field name="name">Sales Order multi-company</field> <field name="model_id" ref="model_sale_order"/> - <field name="global" eval="True"/> <field name="domain_force">[('company_id', 'in', company_ids)]</field> </record> <record model="ir.rule" id="sale_order_line_comp_rule"> <field name="name">Sales Order Line multi-company</field> <field name="model_id" ref="model_sale_order_line"/> - <field name="global" eval="True"/> <field name="domain_force">['|', ('company_id', '=', False), ('company_id', 'in', company_ids)]</field> </record> <record model="ir.rule" id="sale_order_report_comp_rule"> <field name="name">Sales Order Analysis multi-company</field> <field name="model_id" ref="model_sale_report"/> - <field name="global" eval="True"/> <field name="domain_force">['|',('company_id','=',False),('company_id', 'in', company_ids)]</field> </record> @@ -187,26 +184,23 @@ <field name="domain_force">[('move_id.move_type', 'in', ('out_invoice', 'out_refund', 'in_invoice', 'in_refund'))]</field> <field name="groups" eval="[(4, ref('sales_team.group_sale_salesman_all_leads'))]"/> </record> - + <!-- Wizard access rules --> <record id="sale_payment_acquirer_onboarding_wizard_rule" model="ir.rule"> <field name="name">Payment Acquier Onboarding Wizard Rule</field> <field name="model_id" ref="model_sale_payment_acquirer_onboarding_wizard"/> - <field name="global" eval="True"/> <field name="domain_force">[('create_uid', '=', user.id)]</field> </record> <record id="sale_advance_payment_inv_rule" model="ir.rule"> <field name="name">Sales Advance Payment Invoice Rule</field> <field name="model_id" ref="model_sale_advance_payment_inv"/> - <field name="global" eval="True"/> <field name="domain_force">[('create_uid', '=', user.id)]</field> </record> <record id="sale_order_cancel_rule" model="ir.rule"> <field name="name">Sales Order Cancel Rule</field> <field name="model_id" ref="model_sale_order_cancel"/> - <field name="global" eval="True"/> <field name="domain_force">[('create_uid', '=', user.id)]</field> </record> </data> diff --git a/addons/sale_coupon/security/sale_coupon_security.xml b/addons/sale_coupon/security/sale_coupon_security.xml index fa5b89ef5ef..e099e76273b 100644 --- a/addons/sale_coupon/security/sale_coupon_security.xml +++ b/addons/sale_coupon/security/sale_coupon_security.xml @@ -5,13 +5,11 @@ <record id="sale_coupon_apply_code_rule" model="ir.rule"> <field name="name">Sale Coupon Apply Code Rule</field> <field name="model_id" ref="model_sale_coupon_apply_code"/> - <field name="global" eval="True"/> <field name="domain_force">[('create_uid', '=', user.id)]</field> </record> <record id="sale_coupon_generate_rule" model="ir.rule"> <field name="name">Generate Sales Coupon Rule</field> <field name="model_id" ref="model_sale_coupon_generate"/> - <field name="global" eval="True"/> <field name="domain_force">[('create_uid', '=', user.id)]</field> </record> diff --git a/addons/stock/security/stock_security.xml b/addons/stock/security/stock_security.xml index 84b7d8fad45..6a739de883a 100644 --- a/addons/stock/security/stock_security.xml +++ b/addons/stock/security/stock_security.xml @@ -73,119 +73,102 @@ <record model="ir.rule" id="stock_picking_rule"> <field name="name">stock_picking multi-company</field> <field name="model_id" search="[('model','=','stock.picking')]" model="ir.model"/> - <field name="global" eval="True"/> <field name="domain_force">[('company_id', 'in', company_ids)]</field> </record> <record model="ir.rule" id="stock_picking_type_rule"> <field name="name">Stock Operation Type multi-company</field> <field name="model_id" search="[('model','=','stock.picking.type')]" model="ir.model"/> - <field name="global" eval="True"/> <field name="domain_force">[('company_id','in', company_ids)]</field> </record> <record model="ir.rule" id="stock_putaway_rule_rule"> <field name="name">Stock Operation Type multi-company</field> <field name="model_id" search="[('model','=','stock.putaway.rule')]" model="ir.model"/> - <field name="global" eval="True"/> <field name="domain_force">[('company_id','in', company_ids)]</field> </record> <record model="ir.rule" id="stock_production_lot_rule"> <field name="name">Stock Production Lot multi-company</field> <field name="model_id" search="[('model','=','stock.production.lot')]" model="ir.model"/> - <field name="global" eval="True"/> <field name="domain_force">[('company_id','in', company_ids)]</field> </record> <record model="ir.rule" id="stock_warehouse_comp_rule"> <field name="name">Warehouse multi-company</field> <field name="model_id" ref="model_stock_warehouse"/> - <field name="global" eval="True"/> <field name="domain_force">[('company_id', 'in', company_ids)]</field> </record> <record model="ir.rule" id="stock_location_comp_rule"> <field name="name">Location multi-company</field> <field name="model_id" ref="model_stock_location"/> - <field name="global" eval="True"/> <field name="domain_force">['|',('company_id','=',False),('company_id', 'in', company_ids)]</field> </record> <record model="ir.rule" id="stock_move_rule"> <field name="name">stock_move multi-company</field> <field name="model_id" search="[('model','=','stock.move')]" model="ir.model"/> - <field name="global" eval="True"/> <field name="domain_force">[('company_id', 'in', company_ids)]</field> </record> <record model="ir.rule" id="stock_move_line_rule"> <field name="name">stock_move_line multi-company</field> <field name="model_id" search="[('model','=','stock.move.line')]" model="ir.model"/> - <field name="global" eval="True"/> <field name="domain_force">['|',('company_id','=',False),('company_id', 'in', company_ids)]</field> </record> <record model="ir.rule" id="stock_quant_rule"> <field name="name">stock_quant multi-company</field> <field name="model_id" ref="model_stock_quant"/> - <field name="global" eval="True"/> <field name="domain_force">['|',('company_id','=',False),('company_id', 'in', company_ids)]</field> </record> <record model="ir.rule" id="stock_inventory_line_comp_rule"> <field name="name">Inventory Line multi-company</field> <field name="model_id" ref="model_stock_inventory_line"/> - <field name="global" eval="True"/> <field name="domain_force">[('company_id', 'in', company_ids)]</field> </record> <record model="ir.rule" id="stock_inventory_comp_rule"> <field name="name">Inventory multi-company</field> <field name="model_id" ref="model_stock_inventory"/> - <field name="global" eval="True"/> <field name="domain_force">[('company_id', 'in', company_ids)]</field> </record> <record model="ir.rule" id="stock_warehouse_orderpoint_rule"> <field name="name">stock_warehouse.orderpoint multi-company</field> <field name="model_id" search="[('model','=','stock.warehouse.orderpoint')]" model="ir.model"/> - <field name="global" eval="True"/> <field name="domain_force">[('company_id', 'in', company_ids)]</field> </record> <record model="ir.rule" id="product_pulled_flow_comp_rule"> <field name="name">product_pulled_flow multi-company</field> <field name="model_id" ref="model_stock_rule"/> - <field name="global" eval="True"/> <field name="domain_force">['|',('company_id','=',False),('company_id', 'in', company_ids)]</field> </record> <record model="ir.rule" id="stock_location_route_comp_rule"> <field name="name">stock_location_route multi-company</field> <field name="model_id" ref="model_stock_location_route"/> - <field name="global" eval="True"/> <field name="domain_force">['|',('company_id','=',False),('company_id', 'in', company_ids)]</field> </record> <record model="ir.rule" id="stock_quant_package_comp_rule"> <field name="name">stock_quant_package multi-company</field> <field name="model_id" ref="model_stock_quant_package"/> - <field name="global" eval="True"/> <field name="domain_force">['|', ('company_id', '=', False), ('company_id', 'in', company_ids)]</field> </record> <record model="ir.rule" id="stock_scrap_company_rule"> <field name="name">stock_scrap_company multi-company</field> <field name="model_id" ref="model_stock_scrap"/> - <field name="global" eval="True"/> <field name="domain_force">[('company_id', 'in', company_ids)]</field> </record> <record model="ir.rule" id="report_stock_quantity_flow_comp_rule"> <field name="name">report_stock_quantity_flow multi-company</field> <field name="model_id" ref="model_report_stock_quantity"/> - <field name="global" eval="True"/> <field name="domain_force">['|',('company_id','=',False),('company_id', 'in', company_ids)]</field> </record> diff --git a/addons/stock_account/security/stock_account_security.xml b/addons/stock_account/security/stock_account_security.xml index 7a209e33678..91346b2f909 100644 --- a/addons/stock_account/security/stock_account_security.xml +++ b/addons/stock_account/security/stock_account_security.xml @@ -1,12 +1,9 @@ <?xml version="1.0" encoding="utf-8"?> <odoo> -<data noupdate="0"> <record model="ir.rule" id="stock_valuation_layer_company_rule"> <field name="name">Stock Valuation Layer Multicompany</field> <field name="model_id" search="[('model','=','stock.valuation.layer')]" model="ir.model"/> - <field name="global" eval="True"/> <field name="domain_force">[('company_id', 'in', company_ids)]</field> </record> -</data> </odoo> diff --git a/addons/stock_landed_costs/security/stock_landed_cost_security.xml b/addons/stock_landed_costs/security/stock_landed_cost_security.xml index 8dcbc0e9762..c74c9db151b 100644 --- a/addons/stock_landed_costs/security/stock_landed_cost_security.xml +++ b/addons/stock_landed_costs/security/stock_landed_cost_security.xml @@ -1,13 +1,10 @@ <?xml version="1.0" encoding="utf-8"?> <odoo> -<data noupdate="0"> <record model="ir.rule" id="stock_landed_cost_rule"> <field name="name">stock_landed_cost multi-company</field> <field name="model_id" search="[('model','=','stock.landed.cost')]" model="ir.model"/> - <field name="global" eval="True"/> <field name="domain_force">['|',('company_id','=',False),('company_id', 'in', company_ids)]</field> </record> -</data> -</odoo>
\ No newline at end of file +</odoo> diff --git a/addons/website_sale/security/website_sale.xml b/addons/website_sale/security/website_sale.xml index 9c4702b0d9f..28fd4e1c420 100644 --- a/addons/website_sale/security/website_sale.xml +++ b/addons/website_sale/security/website_sale.xml @@ -46,13 +46,11 @@ <record id="product_pricelist_comp_rule" model="ir.rule"> <field name="name">product pricelist company rule</field> <field name="model_id" ref="product.model_product_pricelist"/> - <field name="global" eval="True"/> <field name="domain_force">['|', ('company_id', 'in', [False,website.company_id.id]), ('company_id', 'in', company_ids)]</field> </record> <record id="product_pricelist_item_comp_rule" model="ir.rule"> <field name="name">product pricelist item company rule</field> <field name="model_id" ref="product.model_product_pricelist_item"/> - <field name="global" eval="True"/> <field name="domain_force">['|', ('company_id', 'in', [False,website.company_id.id]), ('company_id', 'in', company_ids)]</field> </record> diff --git a/addons/website_slides/security/website_slides_security.xml b/addons/website_slides/security/website_slides_security.xml index d732f167e27..ab14e8e2642 100644 --- a/addons/website_slides/security/website_slides_security.xml +++ b/addons/website_slides/security/website_slides_security.xml @@ -29,7 +29,6 @@ <record id="rule_slide_channel_global" model="ir.rule"> <field name="name">Channel: always visible (sub rules exist)</field> <field name="model_id" ref="model_slide_channel"/> - <field name="global" eval="True"/> <field name="domain_force">[(1, '=', 1)]</field> </record> @@ -80,7 +79,6 @@ <record id="rule_slide_slide_global" model="ir.rule"> <field name="name">Slide: always visible (sub rules exist)</field> <field name="model_id" ref="model_slide_slide"/> - <field name="global" eval="True"/> <field name="domain_force">[(1, '=', 1)]</field> </record> @@ -190,4 +188,4 @@ <field name="perm_unlink" eval="False"/> </record> </data> -</odoo>
\ No newline at end of file +</odoo> diff --git a/odoo/addons/base/security/base_security.xml b/odoo/addons/base/security/base_security.xml index f3ee7bb6cbc..c2cb464bec4 100644 --- a/odoo/addons/base/security/base_security.xml +++ b/odoo/addons/base/security/base_security.xml @@ -58,8 +58,7 @@ <record id="res_partner_bank_rule" model="ir.rule"> <field name="name">Partner bank company rule</field> <field name="model_id" ref="model_res_partner_bank"/> - <field name="global" eval="True"/> - <field name="domain_force">['|', ('company_id', 'in', company_ids), ('company_id', '=', False)]</field> + <field name="domain_force">['|', ('company_id', 'in', company_ids), ('company_id', '=', False)]</field> </record> <record id="res_currency_rate_rule" model="ir.rule"> |
