diff options
| author | Odoo's Mergebot <xmo+roboto@odoo.com> | 2020-03-20 17:24:11 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-03-20 17:24:11 +0100 |
| commit | fd113d48a2379f63fcfeae22fc62a28a0e8e5e90 (patch) | |
| tree | b9dc888b51b0dfd4e78cc8dd02c6d668948520ea /addons | |
| parent | 979de450669b9175b4ff78bea15ae14bd455761a (diff) | |
| parent | a3ded9043d34229e4547e16625a86dfbebdbcfaf (diff) | |
[MERGE] *: ir.rule declaration cleanup
* remove global assignation in xml, it is a computed field anyway, let the orm compute it
* put all `ir_rule` definition as noupdate in the xml
closes odoo/odoo#47688
Signed-off-by: Martin Trigaux (mat) <mat@odoo.com>
Diffstat (limited to 'addons')
62 files changed, 104 insertions, 221 deletions
diff --git a/addons/account/security/account_security.xml b/addons/account/security/account_security.xml index 641164df389..b179a7eb535 100644 --- a/addons/account/security/account_security.xml +++ b/addons/account/security/account_security.xml @@ -75,6 +75,10 @@ <field name="category_id" ref="base.module_category_hidden"/> </record> +</data> + +<data noupdate="1"> + <record id="account_analytic_line_rule_billing_user" model="ir.rule"> <field name="name">account.analytic.line.billing.user</field> <field name="model_id" ref="analytic.model_account_analytic_line"/> @@ -82,10 +86,6 @@ <field name="groups" eval="[(4, ref('account.group_account_invoice'))]"/> </record> -</data> - - -<data noupdate="1"> <record id="base.group_public" model="res.groups"> <field name="implied_ids" eval="[(4, ref('account.group_show_line_subtotals_tax_excluded'))]"/> </record> @@ -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/account_analytic_default/security/account_analytic_default_security.xml b/addons/account_analytic_default/security/account_analytic_default_security.xml index 513146cd564..be8922535a0 100644 --- a/addons/account_analytic_default/security/account_analytic_default_security.xml +++ b/addons/account_analytic_default/security/account_analytic_default_security.xml @@ -1,6 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> -<odoo> - <data noupdate="1"> +<odoo noupdate="1"> <record id="analytic_default_comp_rule" model="ir.rule"> <field name="name">Analytic Default multi company rule</field> @@ -8,6 +7,5 @@ <field eval="True" name="global"/> <field name="domain_force">['|',('company_id','=',False),('company_id', 'in', company_ids)]</field> </record> - - </data> + </odoo> 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/crm_sms/security/sms_security.xml b/addons/crm_sms/security/sms_security.xml index 33f490f317e..f5bf0769b15 100644 --- a/addons/crm_sms/security/sms_security.xml +++ b/addons/crm_sms/security/sms_security.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> -<odoo> +<odoo noupdate="1"> <record id="ir_rule_sms_template_sale_manager" model="ir.rule"> <field name="name">SMS Template: sale manager CRUD on opportunity / partner templates</field> <field name="model_id" ref="sms.model_sms_template"/> diff --git a/addons/delivery/security/delivery_carrier_security.xml b/addons/delivery/security/delivery_carrier_security.xml index 4f60ee6d286..32566b4ced5 100644 --- a/addons/delivery/security/delivery_carrier_security.xml +++ b/addons/delivery/security/delivery_carrier_security.xml @@ -1,11 +1,10 @@ <?xml version='1.0' encoding='utf-8'?> -<odoo> - <data noupdate="1"> +<odoo noupdate="1"> + <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> -</odoo> + + </odoo> 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/event_sms/security/sms_security.xml b/addons/event_sms/security/sms_security.xml index 036a91320b4..4c7bfa9d80c 100644 --- a/addons/event_sms/security/sms_security.xml +++ b/addons/event_sms/security/sms_security.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> -<odoo> +<odoo noupdate="1"> <record id="ir_rule_sms_template_event_manager" model="ir.rule"> <field name="name">SMS Template: event manager CRUD on event / registrations templates</field> <field name="model_id" ref="sms.model_sms_template"/> 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..574c89cce2f 100644 --- a/addons/gamification/security/gamification_security.xml +++ b/addons/gamification/security/gamification_security.xml @@ -1,5 +1,4 @@ -<odoo> - <data noupdate="1"> +<odoo noupdate="1"> <record id="goal_user_visibility" model="ir.rule"> <field name="name">User can only see his/her goals or goal from the same challenge in board visibility</field> @@ -32,8 +31,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> </odoo> 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_expense/security/ir_rule.xml b/addons/hr_expense/security/ir_rule.xml index 3b13eb977a6..947bcd66f76 100644 --- a/addons/hr_expense/security/ir_rule.xml +++ b/addons/hr_expense/security/ir_rule.xml @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> -<odoo> - <data noupdate="1"> +<odoo noupdate="1"> + <record id="ir_rule_hr_expense_manager" model="ir.rule"> <field name="name">Manager Expense</field> <field name="model_id" ref="model_hr_expense"/> @@ -64,5 +64,4 @@ <field name="domain_force">['|',('company_id', '=', False), ('company_id', 'in', company_ids)]</field> </record> - </data> </odoo> diff --git a/addons/hr_gamification/security/gamification_security.xml b/addons/hr_gamification/security/gamification_security.xml index f1de6b6d1e7..9c210e1d4ec 100644 --- a/addons/hr_gamification/security/gamification_security.xml +++ b/addons/hr_gamification/security/gamification_security.xml @@ -1,10 +1,8 @@ <?xml version="1.0" encoding="UTF-8"?> -<odoo> - <data noupdate="1"> +<odoo noupdate="1"> <record id="gamification.goal_gamification_manager_visibility" model="ir.rule"> <field name="groups" eval="[(4, ref('hr.group_hr_user'))]"/> </record> - </data> </odoo> diff --git a/addons/hr_holidays/security/hr_holidays_security.xml b/addons/hr_holidays/security/hr_holidays_security.xml index f416e939808..9b2c42d4d5a 100644 --- a/addons/hr_holidays/security/hr_holidays_security.xml +++ b/addons/hr_holidays/security/hr_holidays_security.xml @@ -18,6 +18,8 @@ <field name="users" eval="[(4, ref('base.user_root')), (4, ref('base.user_admin'))]"/> </record> + <data noupdate="1"> + <record id="base.default_user" model="res.users"> <field name="groups_id" eval="[(4,ref('hr_holidays.group_hr_holidays_manager'))]"/> </record> @@ -88,7 +90,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,8 +190,8 @@ <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> + </data> </odoo> diff --git a/addons/hr_recruitment/security/hr_recruitment_security.xml b/addons/hr_recruitment/security/hr_recruitment_security.xml index 50d5f825ca4..9979890aefa 100644 --- a/addons/hr_recruitment/security/hr_recruitment_security.xml +++ b/addons/hr_recruitment/security/hr_recruitment_security.xml @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> -<odoo> -<data noupdate="1"> +<odoo noupdate="1"> + <record model="ir.module.category" id="base.module_category_human_resources_recruitment"> <field name="description">Helps you manage your recruitments.</field> <field name="sequence">11</field> @@ -30,6 +30,4 @@ <field name="groups_id" eval="[(4,ref('hr_recruitment.group_hr_recruitment_manager'))]"/> </record> - - </data> </odoo> diff --git a/addons/hr_skills/security/hr_skills_security.xml b/addons/hr_skills/security/hr_skills_security.xml index 215f9502cc8..e82d0008bfc 100644 --- a/addons/hr_skills/security/hr_skills_security.xml +++ b/addons/hr_skills/security/hr_skills_security.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> -<odoo> +<odoo noupdate="1"> <record id="hr_resume_rule_employee" model="ir.rule"> <field name="name">Resumé: employee: read all</field> diff --git a/addons/hr_work_entry/security/hr_work_entry_security.xml b/addons/hr_work_entry/security/hr_work_entry_security.xml index 357f37fd2ff..aa7c46438dc 100644 --- a/addons/hr_work_entry/security/hr_work_entry_security.xml +++ b/addons/hr_work_entry/security/hr_work_entry_security.xml @@ -1,6 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> -<odoo> - <data noupdate="1"> +<odoo noupdate="1"> <record id="hr_user_work_entry_employee" model="ir.rule"> <field name="name">Work entries/Employee calendar filter: only self</field> @@ -13,5 +12,4 @@ <field name="perm_read" eval="0"/> </record> - </data> </odoo> diff --git a/addons/iap/security/ir_rule.xml b/addons/iap/security/ir_rule.xml index a81e1542854..3670899f16e 100644 --- a/addons/iap/security/ir_rule.xml +++ b/addons/iap/security/ir_rule.xml @@ -1,5 +1,5 @@ -<odoo> - <data> +<odoo noupdate="1"> + <record id="user_iap_account" model="ir.rule"> <field name="name">User IAP Account</field> <field name="model_id" ref="model_iap_account"/> @@ -7,5 +7,5 @@ <!-- partners can CUD services linked to themselves --> <field name="domain_force">['|', ('company_ids', '=', False), ('company_ids', 'in', company_ids)]</field> </record> - </data> + </odoo>
\ No newline at end of file diff --git a/addons/im_livechat/security/im_livechat_channel_security.xml b/addons/im_livechat/security/im_livechat_channel_security.xml index be4753f9d4a..89c1910ee85 100644 --- a/addons/im_livechat/security/im_livechat_channel_security.xml +++ b/addons/im_livechat/security/im_livechat_channel_security.xml @@ -20,6 +20,7 @@ <field name="users" eval="[(4, ref('base.user_root')), (4, ref('base.user_admin'))]"/> </record> + <data noupdate="1"> <record id="im_livechat_rule_manager_read_all_mail_channel" model="ir.rule"> <field name="name">Livechat: Administrator: read all livechat channel</field> <field name="model_id" ref="model_mail_channel"/> @@ -31,7 +32,7 @@ <field name="perm_unlink" eval="False"/> </record> - <data noupdate="1"> + <record id="base.default_user" model="res.users"> <field name="groups_id" eval="[(4,ref('im_livechat.im_livechat_group_manager'))]"/> </record> diff --git a/addons/l10n_fr_pos_cert/security/account_closing_intercompany.xml b/addons/l10n_fr_pos_cert/security/account_closing_intercompany.xml index a316014794e..9001538844f 100644 --- a/addons/l10n_fr_pos_cert/security/account_closing_intercompany.xml +++ b/addons/l10n_fr_pos_cert/security/account_closing_intercompany.xml @@ -1,4 +1,5 @@ -<odoo> +<odoo noupdate="1"> + <record model="ir.rule" id="account_sale_closing_multi_company"> <field name="name">Sale Closing multi-company</field> <field name="model_id" ref="model_account_sale_closing"/> diff --git a/addons/lunch/security/lunch_security.xml b/addons/lunch/security/lunch_security.xml index 01a59c0057a..4da736313e8 100644 --- a/addons/lunch/security/lunch_security.xml +++ b/addons/lunch/security/lunch_security.xml @@ -16,6 +16,7 @@ <field name="users" eval="[(4, ref('base.user_root')), (4, ref('base.user_admin'))]"/> </record> + <data noupdate="1"> <record id="lunch_mind_your_own_food_money" model="ir.rule"> <field name="name">lunch.cashmove: do not see other people's cashmove</field> @@ -60,7 +61,6 @@ <field name="groups" eval="[(4, ref('lunch.group_lunch_manager'))]"/> </record> - <data noupdate="1"> <record id="base.default_user" model="res.users"> <field name="groups_id" eval="[(4,ref('lunch.group_lunch_manager'))]"/> </record> @@ -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..565af06b20a 100644 --- a/addons/mail/security/mail_security.xml +++ b/addons/mail/security/mail_security.xml @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> -<odoo> - <data noupdate="0"> +<odoo noupdate="1"> + <!-- RULES --> <record id="mail_channel_rule" model="ir.rule"> <field name="name">Mail.channel: access only public and joined groups</field> @@ -12,8 +12,7 @@ '&', ('public', '=', 'groups'), ('group_public_id', 'in', [g.id for g in user.groups_id])]</field> <field name="perm_create" eval="False"/> </record> - </data> - <data noupdate="1"> + <record id="ir_rule_mail_notifications_group_user" model="ir.rule"> <field name="name">mail.notifications: group_user: write its own entries</field> <field name="model_id" ref="model_mail_notification"/> @@ -52,11 +51,10 @@ <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"/> <field name="perm_unlink" eval="False"/> </record> - </data> + </odoo> diff --git a/addons/maintenance/security/maintenance.xml b/addons/maintenance/security/maintenance.xml index 8a15e48e01f..e3f31dccde2 100644 --- a/addons/maintenance/security/maintenance.xml +++ b/addons/maintenance/security/maintenance.xml @@ -8,6 +8,8 @@ <field name="comment">The user will be able to manage equipments.</field> </record> + <data noupdate="1"> + <!-- Rules --> <record id="equipment_request_rule_user" model="ir.rule"> <field name="name">Users are allowed to access their own maintenance requests</field> @@ -40,28 +42,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> @@ -69,4 +67,6 @@ <field name="groups_id" eval="[(4, ref('group_equipment_manager'))]"/> </record> + </data> + </odoo> 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..3b657e48633 100644 --- a/addons/note/security/note_security.xml +++ b/addons/note/security/note_security.xml @@ -1,10 +1,9 @@ <?xml version="1.0"?> -<odoo> +<odoo noupdate="1"> <record id="note_note_rule_global" model="ir.rule"> <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/payment/security/payment_security.xml b/addons/payment/security/payment_security.xml index df797070aed..7a0ec3f975c 100644 --- a/addons/payment/security/payment_security.xml +++ b/addons/payment/security/payment_security.xml @@ -1,6 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> -<odoo> - <data noupdate="1"> +<odoo noupdate="1"> <record id="payment_transaction_user_rule" model="ir.rule"> <field name="name">Access own payment transaction only</field> @@ -19,5 +18,4 @@ <field name="groups" eval="[(4, ref('base.group_user')), (4, ref('base.group_portal')), (4, ref('base.group_public'))]"/> </record> - </data> </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..57fa5950b7d 100644 --- a/addons/point_of_sale/security/point_of_sale_security.xml +++ b/addons/point_of_sale/security/point_of_sale_security.xml @@ -16,6 +16,7 @@ <field name="users" eval="[(4, ref('base.user_root')), (4, ref('base.user_admin'))]"/> </record> + <data noupdate="1"> <record id="rule_pos_bank_statement_user" model="ir.rule"> <field name="name">Point Of Sale Bank Statement POS User</field> @@ -50,41 +51,34 @@ <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> - <data noupdate="1"> <record id="base.default_user" model="res.users"> <field name="groups_id" eval="[(4,ref('point_of_sale.group_pos_manager'))]"/> </record> diff --git a/addons/pos_sale/security/pos_sale_security.xml b/addons/pos_sale/security/pos_sale_security.xml index 265cb695d59..b857378a0e9 100644 --- a/addons/pos_sale/security/pos_sale_security.xml +++ b/addons/pos_sale/security/pos_sale_security.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> -<odoo> +<odoo noupdate="1"> <record id="pos_sale_rule_pos_channel_pos_manager" model="ir.rule"> <field name="name">POS Sales Team</field> <field name="model_id" ref="sales_team.model_crm_team"/> 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..1cf3c4753ee 100644 --- a/addons/purchase/security/purchase_security.xml +++ b/addons/purchase/security/purchase_security.xml @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <odoo> -<data noupdate="0"> +<data> <record model="ir.module.category" id="base.module_category_inventory_purchase"> <field name="description">Helps you manage your purchase-related processes such as requests for quotations, supplier bills, etc...</field> @@ -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..1fc52187ff9 100644 --- a/addons/purchase_requisition/security/purchase_requisition_security.xml +++ b/addons/purchase_requisition/security/purchase_requisition_security.xml @@ -1,20 +1,16 @@ <?xml version="1.0" encoding="utf-8"?> -<odoo> -<data noupdate="1"> +<odoo noupdate="1"> <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> -</data> </odoo> diff --git a/addons/repair/security/repair_security.xml b/addons/repair/security/repair_security.xml index a3a5f7188c6..d00a7d04c8f 100644 --- a/addons/repair/security/repair_security.xml +++ b/addons/repair/security/repair_security.xml @@ -1,26 +1,21 @@ <?xml version="1.0" encoding="utf-8"?> -<odoo> - <data noupdate="1"> +<odoo noupdate="1"> <!-- Multicompay rules--> <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> - </data> </odoo> diff --git a/addons/resource/security/resource_security.xml b/addons/resource/security/resource_security.xml index f2f4937ddc7..c0ccaac3c73 100644 --- a/addons/resource/security/resource_security.xml +++ b/addons/resource/security/resource_security.xml @@ -1,6 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> -<odoo> -<data noupdate="1"> +<odoo noupdate="1"> <record model="ir.rule" id="resource_calendar_leaves_rule_group_user_create"> <field name="name">resource.calendar.leaves: employee reads own or global</field> @@ -27,5 +26,5 @@ <field name="domain_force">[('resource_id', '=', False)]</field> <field name="perm_read" eval="False"/> </record> -</data> + </odoo> 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..0f4de81de29 100644 --- a/addons/sale_coupon/security/sale_coupon_security.xml +++ b/addons/sale_coupon/security/sale_coupon_security.xml @@ -1,19 +1,15 @@ <?xml version="1.0" encoding="utf-8"?> -<odoo> -<data noupdate="1"> +<odoo noupdate="1"> <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> -</data> </odoo> diff --git a/addons/sale_expense/security/sale_expense_security.xml b/addons/sale_expense/security/sale_expense_security.xml index c8087457e9d..48edc9cf1db 100644 --- a/addons/sale_expense/security/sale_expense_security.xml +++ b/addons/sale_expense/security/sale_expense_security.xml @@ -1,7 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> -<odoo> - -<data noupdate="1"> +<odoo noupdate="1"> <!-- Required simply to set SO on expense before submitting. Used to avoid crash on name_get/name_search --> <record id="sale_order_rule_expense_user" model="ir.rule"> @@ -16,5 +14,4 @@ <field name="active" eval="False"/> <!-- opw-2027005: this rules breaks sale "see own document" --> </record> -</data> </odoo> diff --git a/addons/sale_management/security/sale_management_security.xml b/addons/sale_management/security/sale_management_security.xml index 2ec489b6650..3786f1ea20e 100644 --- a/addons/sale_management/security/sale_management_security.xml +++ b/addons/sale_management/security/sale_management_security.xml @@ -6,11 +6,11 @@ <field name="category_id" ref="base.module_category_hidden"/> </record> - <record id="sale_order_template_rule_company" model="ir.rule"> - <field name="name">Quotation Template multi-company</field> - <field name="model_id" ref="model_sale_order_template"/> - <field name="global" eval="True"/> - <field name="domain_force">['|', ('company_id', '=', False), ('company_id', 'in', company_ids)]</field> - </record> - + <data noupdate="1"> + <record id="sale_order_template_rule_company" model="ir.rule"> + <field name="name">Quotation Template multi-company</field> + <field name="model_id" ref="model_sale_order_template"/> + <field name="domain_force">['|', ('company_id', '=', False), ('company_id', 'in', company_ids)]</field> + </record> + </data> </odoo> diff --git a/addons/sale_stock/security/sale_stock_security.xml b/addons/sale_stock/security/sale_stock_security.xml index 7b656de8511..e1860aa85fe 100644 --- a/addons/sale_stock/security/sale_stock_security.xml +++ b/addons/sale_stock/security/sale_stock_security.xml @@ -1,6 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> <odoo> - <data noupdate="0"> <record id="group_display_incoterm" model="res.groups"> <field name="name">Display incoterms on Sales Order and related invoices</field> <field name="category_id" ref="base.module_category_hidden"/> @@ -11,6 +10,8 @@ <field name="category_id" ref="base.module_category_hidden"/> </record> + <data noupdate="1"> + <!-- Stock Portal Access Rules --> <record id="stock_picking_rule_portal" model="ir.rule"> <field name="name">Portal Follower Transfers</field> diff --git a/addons/sale_timesheet/security/sale_timesheet_security.xml b/addons/sale_timesheet/security/sale_timesheet_security.xml index f4d33495b02..6da589d7593 100644 --- a/addons/sale_timesheet/security/sale_timesheet_security.xml +++ b/addons/sale_timesheet/security/sale_timesheet_security.xml @@ -1,7 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> -<odoo> +<odoo noupdate="1"> - <data noupdate="1"> <!-- Override this rule because in hr_timesheet, the lowest access right can only see own timesheets (model: account.analytic.line) @@ -12,5 +11,5 @@ <record id="account.account_analytic_line_rule_billing_user" model="ir.rule"> <field name="domain_force">[('project_id', '=', False)]</field> </record> - </data> + </odoo> diff --git a/addons/sales_team/security/sales_team_security.xml b/addons/sales_team/security/sales_team_security.xml index 6d95bb22adc..a293b29be66 100644 --- a/addons/sales_team/security/sales_team_security.xml +++ b/addons/sales_team/security/sales_team_security.xml @@ -27,6 +27,12 @@ <field name="users" eval="[(4, ref('base.user_root')), (4, ref('base.user_admin'))]"/> </record> + <record model="ir.ui.menu" id="sales_team.menu_sale_config"> + <field name="name">Configuration</field> + <field eval="[(6,0,[ref('base.group_system')])]" name="groups_id"/> + </record> + + <data noupdate="1"> <record id="crm_rule_all_salesteam" model="ir.rule"> <field name="name">All Salesteam</field> <field ref="sales_team.model_crm_team" name="model_id"/> @@ -40,12 +46,6 @@ <field name="domain_force">['|',('company_id','=',False),('company_id', 'in', company_ids)]</field> </record> - <record model="ir.ui.menu" id="sales_team.menu_sale_config"> - <field name="name">Configuration</field> - <field eval="[(6,0,[ref('base.group_system')])]" name="groups_id"/> - </record> - - <data noupdate="1"> <record id="base.default_user" model="res.users"> <field name="groups_id" eval="[(4,ref('sales_team.group_sale_manager'))]"/> </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..1e47996bedc 100644 --- a/addons/stock_account/security/stock_account_security.xml +++ b/addons/stock_account/security/stock_account_security.xml @@ -1,12 +1,11 @@ <?xml version="1.0" encoding="utf-8"?> -<odoo> -<data noupdate="0"> +<odoo noupdate="1"> + <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..fd3f1b525e9 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"> +<odoo noupdate="1"> <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/stock_sms/security/sms_security.xml b/addons/stock_sms/security/sms_security.xml index c7394770c13..d6a79e98b7d 100644 --- a/addons/stock_sms/security/sms_security.xml +++ b/addons/stock_sms/security/sms_security.xml @@ -1,9 +1,11 @@ <?xml version="1.0" encoding="utf-8"?> -<odoo> +<odoo noupdate="1"> + <record id="ir_rule_sms_template_stock_manager" model="ir.rule"> <field name="name">SMS Template: stock manager CRUD on stock picking templates</field> <field name="model_id" ref="sms.model_sms_template"/> <field name="groups" eval="[(4, ref('stock.group_stock_manager'))]"/> <field name="domain_force">[('model_id.model', '=', 'stock.picking')]</field> </record> + </odoo> diff --git a/addons/test_mail/security/test_mail_security.xml b/addons/test_mail/security/test_mail_security.xml index 762df7cf167..296cbdc02da 100644 --- a/addons/test_mail/security/test_mail_security.xml +++ b/addons/test_mail/security/test_mail_security.xml @@ -1,6 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> -<odoo> - <data noupdate="1"> +<odoo noupdate="1"> <record id="mail_test_multi_company_rule" model="ir.rule"> <field name="name">Mail Test Multi Company</field> @@ -9,5 +8,4 @@ <field name="domain_force">['|', ('company_id', '=', False), ('company_id', 'in', company_ids)]</field> </record> - </data> </odoo> diff --git a/addons/timer/security/timer_security.xml b/addons/timer/security/timer_security.xml index 662a2aac0d7..8bad09e2641 100644 --- a/addons/timer/security/timer_security.xml +++ b/addons/timer/security/timer_security.xml @@ -1,6 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<odoo> - <data noupdate="0"> +<odoo noupdate="1"> <record id="timer_user_rule_create-write-delete" model="ir.rule"> <field name="name">timer.user.rule.create-write-delete</field> @@ -28,5 +27,4 @@ <field name="perm_read" eval="1"/> </record> - </data> </odoo> diff --git a/addons/website/security/website_security.xml b/addons/website/security/website_security.xml index ab822aeca80..e4113fbc717 100644 --- a/addons/website/security/website_security.xml +++ b/addons/website/security/website_security.xml @@ -27,6 +27,8 @@ <field name="implied_ids" eval="[(4, ref('website.group_website_designer'))]"/> </record> + <data noupdate="1"> + <record id="website_menu" model="ir.rule"> <field name="name">Website menu: group_ids</field> <field name="model_id" ref="model_website_menu"/> @@ -90,4 +92,6 @@ <field name="perm_unlink" eval="False"/> <field name="groups" eval="[(4, ref('base.group_portal'))]"/> </record> + + </data> </odoo> diff --git a/addons/website_blog/security/website_blog_security.xml b/addons/website_blog/security/website_blog_security.xml index ca1ae295701..79cfbbe6074 100644 --- a/addons/website_blog/security/website_blog_security.xml +++ b/addons/website_blog/security/website_blog_security.xml @@ -1,9 +1,11 @@ <?xml version="1.0" encoding="utf-8"?> -<odoo> +<odoo noupdate="1"> + <record model="ir.rule" id="website_blog_post_public"> <field name="name">Blog Post: public: published only</field> <field name="model_id" ref="model_blog_post"/> <field name="domain_force">[('website_published', '=', True)]</field> <field name="groups" eval="[(4, ref('base.group_public')), (4, ref('base.group_portal'))]"/> </record> + </odoo> diff --git a/addons/website_crm_partner_assign/security/ir_rule.xml b/addons/website_crm_partner_assign/security/ir_rule.xml index 2081edd4419..881e7b27a5b 100644 --- a/addons/website_crm_partner_assign/security/ir_rule.xml +++ b/addons/website_crm_partner_assign/security/ir_rule.xml @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> -<odoo> +<odoo noupdate="1"> + <!-- CRM Lead portal --> <record id="assigned_lead_portal_rule_1" model="ir.rule"> <field name="name">Portal Graded Partner: read and write assigned leads</field> diff --git a/addons/website_customer/security/ir_rule.xml b/addons/website_customer/security/ir_rule.xml index b901763eb96..5bfd1859b5e 100644 --- a/addons/website_customer/security/ir_rule.xml +++ b/addons/website_customer/security/ir_rule.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> -<odoo> +<odoo noupdate="1"> <record model="ir.rule" id="website_customer_res_partner_tag_public"> <field name="name">Partner Tag: published only</field> diff --git a/addons/website_event/security/event_security.xml b/addons/website_event/security/event_security.xml index 0b86e8cf8cc..d34a1f76a48 100644 --- a/addons/website_event/security/event_security.xml +++ b/addons/website_event/security/event_security.xml @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <odoo> + <data noupdate="1"> <record id="event_event_public" model="ir.rule"> <field name="name">event: Public</field> <field name="model_id" ref="event.model_event_event"/> @@ -21,6 +22,7 @@ <field name="perm_create" eval="False"/> <field name="perm_unlink" eval="False"/> </record> + </data> <record id="event.group_event_manager" model="res.groups"> <field name="implied_ids" eval="[(4, ref('website.group_website_publisher'))]"/> diff --git a/addons/website_event_sale/security/website_event_sale_security.xml b/addons/website_event_sale/security/website_event_sale_security.xml index a3b77d8ad05..67336bf79aa 100644 --- a/addons/website_event_sale/security/website_event_sale_security.xml +++ b/addons/website_event_sale/security/website_event_sale_security.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> -<odoo> +<odoo noupdate="1"> <record id="event_product_template_public" model="ir.rule"> <field name="name">Product template linked to event: Public</field> <field name="model_id" ref="product.model_product_template"/> diff --git a/addons/website_event_track/security/event_track_security.xml b/addons/website_event_track/security/event_track_security.xml index 850607bf2df..7ccae1c6f4c 100644 --- a/addons/website_event_track/security/event_track_security.xml +++ b/addons/website_event_track/security/event_track_security.xml @@ -1,6 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> -<odoo> - <data noupdate="1"> +<odoo noupdate="1"> <record id="event_track_public" model="ir.rule"> <field name="name">event tracks: Public</field> @@ -13,5 +12,4 @@ <field name="perm_unlink" eval="False"/> </record> - </data> </odoo> diff --git a/addons/website_forum/security/website_forum_security.xml b/addons/website_forum/security/website_forum_security.xml index 6908c0fb102..1293ae07cc1 100644 --- a/addons/website_forum/security/website_forum_security.xml +++ b/addons/website_forum/security/website_forum_security.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> -<odoo> +<odoo noupdate="1"> <record id="website_forum_public" model="ir.rule"> <field name="name">Website forum: Public user can only access to public forum</field> <field name="model_id" ref="model_forum_forum"/> diff --git a/addons/website_hr_recruitment/security/website_hr_recruitment_security.xml b/addons/website_hr_recruitment/security/website_hr_recruitment_security.xml index 43ecfc36521..b96e7902c5e 100644 --- a/addons/website_hr_recruitment/security/website_hr_recruitment_security.xml +++ b/addons/website_hr_recruitment/security/website_hr_recruitment_security.xml @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <odoo> -<data> + <data noupdate="1"> <record id="hr_job_public" model="ir.rule"> <field name="name">Job Positions: Public</field> <field name="model_id" ref="hr.model_hr_job"/> @@ -41,9 +41,10 @@ <field name="perm_create" eval="False"/> <field name="perm_unlink" eval="False"/> </record> + </data> + <record id="hr_recruitment.group_hr_recruitment_manager" model="res.groups"> <field name="implied_ids" eval="[(4, ref('website.group_website_publisher'))]"/> </record> -</data> </odoo> diff --git a/addons/website_livechat/security/website_livechat.xml b/addons/website_livechat/security/website_livechat.xml index 9525b4d9e1a..e66ae0e8e05 100644 --- a/addons/website_livechat/security/website_livechat.xml +++ b/addons/website_livechat/security/website_livechat.xml @@ -1,6 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> -<odoo> - <data> +<odoo noupdate="1"> <record id="im_livechat_channel_rule_public" model="ir.rule"> <field name="name">website_livechat.channel.public</field> @@ -13,5 +12,4 @@ <field name="perm_unlink" eval="0"/> </record> - </data> </odoo> diff --git a/addons/website_membership/security/website_membership.xml b/addons/website_membership/security/website_membership.xml index bdfeb1c42df..ca722e617e6 100644 --- a/addons/website_membership/security/website_membership.xml +++ b/addons/website_membership/security/website_membership.xml @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> -<odoo> +<odoo noupdate="1"> + <record id="membership_product_product_public" model="ir.rule"> <field name="name">Product membership: Public</field> <field name="model_id" ref="product.model_product_template"/> @@ -20,4 +21,5 @@ <field name="perm_create" eval="False"/> <field name="perm_unlink" eval="False"/> </record> + </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_sale_wishlist/security/website_sale_wishlist_security.xml b/addons/website_sale_wishlist/security/website_sale_wishlist_security.xml index d7f009041f4..6824c5ed63b 100644 --- a/addons/website_sale_wishlist/security/website_sale_wishlist_security.xml +++ b/addons/website_sale_wishlist/security/website_sale_wishlist_security.xml @@ -1,6 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> -<odoo> - <data noupdate="1"> +<odoo noupdate="1"> <record id="product_wishlist_rule" model="ir.rule"> <field name="name">See own Wishlist</field> @@ -16,5 +15,4 @@ <field name="groups" eval="[(4, ref('sales_team.group_sale_manager'))]"/> </record> - </data> </odoo> diff --git a/addons/website_slides/security/website_slides_security.xml b/addons/website_slides/security/website_slides_security.xml index d732f167e27..ab800865dd0 100644 --- a/addons/website_slides/security/website_slides_security.xml +++ b/addons/website_slides/security/website_slides_security.xml @@ -1,6 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> <odoo> - <data noupdate="0"> <record model="ir.module.category" id="base.module_category_website_elearning"> <field name="sequence">21</field> </record> @@ -25,11 +24,11 @@ <field name="implied_ids" eval="[(4, ref('group_website_slides_manager'))]"/> </record> + <data noupdate="1"> <!-- CHANNEL --> <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/addons/website_slides_forum/security/website_slides_forum_security.xml b/addons/website_slides_forum/security/website_slides_forum_security.xml index 3ca12ec8b36..487d1bb6cea 100644 --- a/addons/website_slides_forum/security/website_slides_forum_security.xml +++ b/addons/website_slides_forum/security/website_slides_forum_security.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> -<odoo> +<odoo noupdate="1"> <record id="website_slides_forum_public" model="ir.rule"> <field name="name">Website forum: User can only access to forum related to followed courses</field> <field name="model_id" ref="website_forum.model_forum_forum"/> |