diff options
| author | Alexis de Lattre <alexis@via.ecp.fr> | 2012-07-13 19:08:38 +0200 |
|---|---|---|
| committer | Alexis de Lattre <alexis@via.ecp.fr> | 2012-07-13 19:08:38 +0200 |
| commit | 5101771cd9ea7218695d31ce7c7bf2b12a1d417f (patch) | |
| tree | b892e4f28095db0d93f6bc96bf844841e481724a | |
| parent | a59ddcba81c21e0139273a178f38b78be0c1a822 (diff) | |
Harmonize the noupdate flag on security XML files :
- ir.rule objects are noupdate="1"
- all other objects are noupdate="0"
bzr revid: alexis@via.ecp.fr-20120713170838-pjsysliyt6twazrc
32 files changed, 109 insertions, 55 deletions
diff --git a/addons/account/security/account_security.xml b/addons/account/security/account_security.xml index e1a29a6edfb..55e9d4cfe85 100644 --- a/addons/account/security/account_security.xml +++ b/addons/account/security/account_security.xml @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> -<openerp><data> +<openerp> +<data noupdate="0"> <record id="group_account_invoice" model="res.groups"> <field name="name">Invoicing & Payments</field> @@ -22,6 +23,9 @@ <field name="category_id" ref="base.module_category_hidden"/> </record> +</data> +<data noupdate="1"> + <record id="account_move_comp_rule" model="ir.rule"> <field name="name">Account Entry</field> <field ref="model_account_move" name="model_id"/> @@ -142,4 +146,5 @@ <field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field> </record> -</data></openerp> +</data> +</openerp> 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 7ff68c7d849..63c6e30eb22 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,6 @@ <?xml version="1.0" encoding="utf-8"?> <openerp> - <data> + <data noupdate="1"> <record id="analytic_default_comp_rule" model="ir.rule"> <field name="name">Analytic Default multi company rule</field> diff --git a/addons/account_asset/security/account_asset_security.xml b/addons/account_asset/security/account_asset_security.xml index d6b9840ceb0..77f218d13b9 100644 --- a/addons/account_asset/security/account_asset_security.xml +++ b/addons/account_asset/security/account_asset_security.xml @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <openerp> - <data> + <data noupdate="1"> <record id="account_asset_category_multi_company_rule" model="ir.rule"> <field name="name">Account Asset Category multi-company</field> <field ref="model_account_asset_category" name="model_id"/> diff --git a/addons/account_budget/security/account_budget_security.xml b/addons/account_budget/security/account_budget_security.xml index 1fbcd82e86c..d184ac4b944 100644 --- a/addons/account_budget/security/account_budget_security.xml +++ b/addons/account_budget/security/account_budget_security.xml @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <openerp> - <data noupdate="0"> + <data noupdate="1"> <record id="budget_post_comp_rule" model="ir.rule"> <field name="name">Budget post multi-company</field> diff --git a/addons/account_coda/security/account_security.xml b/addons/account_coda/security/account_security.xml index b8fdd32ebe6..8ec71cc8762 100644 --- a/addons/account_coda/security/account_security.xml +++ b/addons/account_coda/security/account_security.xml @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> -<openerp><data> +<openerp> +<data noupdate="1"> <record id="account_coda_comp_rule" model="ir.rule"> <field name="name">Account Coda model company rule</field> @@ -8,4 +9,5 @@ <field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field> </record> -</data></openerp> +</data> +</openerp> diff --git a/addons/account_followup/security/account_followup_security.xml b/addons/account_followup/security/account_followup_security.xml index fd90e16fec8..1586403d701 100644 --- a/addons/account_followup/security/account_followup_security.xml +++ b/addons/account_followup/security/account_followup_security.xml @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <openerp> - <data> + <data noupdate="1"> <record id="account_followup_comp_rule" model="ir.rule"> <field name="name">Account Follow-up multi company rule</field> diff --git a/addons/account_payment/security/account_payment_security.xml b/addons/account_payment/security/account_payment_security.xml index 135059c79d5..4bca00eaa6d 100644 --- a/addons/account_payment/security/account_payment_security.xml +++ b/addons/account_payment/security/account_payment_security.xml @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <openerp> -<data noupdate="1"> +<data noupdate="0"> <record id="group_account_payment" model="res.groups"> <field name="name">Accounting / Payments</field> @@ -10,6 +10,9 @@ <field name="implied_ids" eval="[(4, ref('group_account_payment'))]"/> </record> +</data> +<data noupdate="1"> + <record id="payment_mode_comp_rule" model="ir.rule"> <field name="name">Payment Mode company rule</field> <field model="ir.model" name="model_id" ref="model_payment_mode"/> diff --git a/addons/account_voucher/security/account_voucher_security.xml b/addons/account_voucher/security/account_voucher_security.xml index df4e58484b5..04540fd8aa0 100644 --- a/addons/account_voucher/security/account_voucher_security.xml +++ b/addons/account_voucher/security/account_voucher_security.xml @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <openerp> - <data> + <data noupdate="1"> <record id="voucher_comp_rule" model="ir.rule"> <field name="name">Voucher multi-company</field> <field model="ir.model" name="model_id" ref="model_account_voucher"/> diff --git a/addons/analytic/security/analytic_security.xml b/addons/analytic/security/analytic_security.xml index a8c43b0bbb7..70688275de2 100644 --- a/addons/analytic/security/analytic_security.xml +++ b/addons/analytic/security/analytic_security.xml @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> -<openerp><data> +<openerp> +<data noupdate="1"> <record id="analytic_comp_rule" model="ir.rule"> <field name="name">Analytic multi company rule</field> @@ -14,9 +15,14 @@ <field eval="True" name="global"/> <field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field> </record> - + +</data> +<data noupdate="0"> + <record id="group_analytic_accounting" model="res.groups"> <field name="name">Analytic Accounting</field> <field name="category_id" ref="base.module_category_hidden"/> </record> -</data></openerp> + +</data> +</openerp> diff --git a/addons/crm/security/crm_security.xml b/addons/crm/security/crm_security.xml index 949cd5d4e73..92da0fe964b 100644 --- a/addons/crm/security/crm_security.xml +++ b/addons/crm/security/crm_security.xml @@ -24,6 +24,17 @@ <field eval="[(4,ref('base.group_partner_manager'))]" name="groups_id"/> </record> + <record model='ir.ui.menu' id='base.menu_base_partner'> + <field name="groups_id" eval="[(4,ref('base.group_sale_manager')),(4,ref('base.group_sale_salesman'))]"/> + </record> + + <record model="ir.ui.menu" id="base.menu_base_config"> + <field eval="[(4, ref('base.group_sale_manager'))]" name="groups_id"/> + </record> + +</data> +<data noupdate="1"> + <record id="crm_rule_personal_lead" model="ir.rule"> <field name="name">Personal Leads</field> <field ref="model_crm_lead" name="model_id"/> @@ -37,14 +48,6 @@ <field name="groups" eval="[(4, ref('base.group_sale_salesman_all_leads'))]"/> </record> - <record model='ir.ui.menu' id='base.menu_base_partner'> - <field name="groups_id" eval="[(4,ref('base.group_sale_manager')),(4,ref('base.group_sale_salesman'))]"/> - </record> - - <record model="ir.ui.menu" id="base.menu_base_config"> - <field eval="[(4, ref('base.group_sale_manager'))]" name="groups_id"/> - </record> - <record id="crm_meeting_global" model="ir.rule"> <field name="name">Hide Private Meetings</field> <field ref="model_crm_meeting" name="model_id"/> @@ -52,5 +55,5 @@ <field name="domain_force">['|',('user_id','=',user.id),('show_as','=','busy')]</field> </record> - </data> +</data> </openerp> diff --git a/addons/document/security/document_security.xml b/addons/document/security/document_security.xml index cacde50c36e..a7ec76eafac 100644 --- a/addons/document/security/document_security.xml +++ b/addons/document/security/document_security.xml @@ -11,6 +11,8 @@ <!-- <record id="group_document_manager" model="res.groups">--> <!-- <field name="name">Document / Manager</field>--> <!-- </record>--> +</data> +<data noupdate="1"> <record id="ir_rule_readpublicdirectories0" model="ir.rule"> <field name="model_id" ref="document.model_document_directory"/> diff --git a/addons/event/security/event_security.xml b/addons/event/security/event_security.xml index e0d17c3bacb..cf37e7ddba7 100644 --- a/addons/event/security/event_security.xml +++ b/addons/event/security/event_security.xml @@ -20,6 +20,8 @@ <field name="users" eval="[(4, ref('base.user_root'))]"/> </record> +</data> +<data noupdate="1"> <!-- Multi - Company Rules --> <record model="ir.rule" id="event_event_comp_rule"> diff --git a/addons/hr/security/hr_security.xml b/addons/hr/security/hr_security.xml index 5e4c3052858..eaab00497d3 100644 --- a/addons/hr/security/hr_security.xml +++ b/addons/hr/security/hr_security.xml @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <openerp> - <data noupdate="1"> +<data noupdate="0"> <record id="base.group_hr_user" model="res.groups"> <field name="name">Officer</field> @@ -13,6 +13,10 @@ <field name="implied_ids" eval="[(4, ref('base.group_hr_user'))]"/> <field name="users" eval="[(4, ref('base.user_root'))]"/> </record> + +</data> +<data noupdate="1"> + <record id="hr_dept_comp_rule" model="ir.rule"> <field name="name">Department multi company rule</field> <field model="ir.model" name="model_id" ref="model_hr_department"/> @@ -25,6 +29,6 @@ <field eval="True" name="global"/> <field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field> </record> - - </data> + +</data> </openerp> diff --git a/addons/hr_attendance/security/ir_rule.xml b/addons/hr_attendance/security/ir_rule.xml index b934dc16f5a..59fa1c103f7 100644 --- a/addons/hr_attendance/security/ir_rule.xml +++ b/addons/hr_attendance/security/ir_rule.xml @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <openerp> - <data noupdate="True"> + <data noupdate="1"> <record id="property_rule_attendace_manager" model="ir.rule"> <field name="name">Manager Attendance</field> diff --git a/addons/hr_evaluation/security/hr_evaluation_security.xml b/addons/hr_evaluation/security/hr_evaluation_security.xml index 232f83fd963..7c7d6f43ee3 100644 --- a/addons/hr_evaluation/security/hr_evaluation_security.xml +++ b/addons/hr_evaluation/security/hr_evaluation_security.xml @@ -1,6 +1,12 @@ <?xml version="1.0" encoding="utf-8"?> <openerp> - <data> +<data noupdate="0"> + + <!-- make Employee users Survey users --> + <record id="base.group_user" model="res.groups"> + <field name="implied_ids" eval="[(4, ref('base.group_survey_user'))]"/> + </record> + <record id="survey.menu_surveys" model="ir.ui.menu"> <field eval="[(4,ref('base.group_hr_manager'))]" name="groups_id"/> </record> @@ -19,7 +25,10 @@ <record id="survey.menu_answer_surveys" model="ir.ui.menu"> <field eval="[(4,ref('base.group_hr_manager'))]" name="groups_id"/> </record> - + +</data> +<data noupdate="1"> + <record id="hr_evaluation_plan_comp_rule" model="ir.rule"> <field name="name">Evaluation Plan multi company rule</field> <field model="ir.model" name="model_id" ref="model_hr_evaluation_plan"/> @@ -50,10 +59,5 @@ <field name="groups" eval="[(4, ref('base.group_hr_user'))]"/> </record> - <!-- make Employee users Survey users --> - <record id="base.group_user" model="res.groups"> - <field name="implied_ids" eval="[(4, ref('base.group_survey_user'))]"/> - </record> - </data> </openerp> diff --git a/addons/hr_timesheet/security/hr_timesheet_security.xml b/addons/hr_timesheet/security/hr_timesheet_security.xml index 9c78204016b..d7cf34fa1fd 100644 --- a/addons/hr_timesheet/security/hr_timesheet_security.xml +++ b/addons/hr_timesheet/security/hr_timesheet_security.xml @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <openerp> - <data noupdate="True"> + <data noupdate="1"> <record id="property_rule_timesheet_manager" model="ir.rule"> <field name="name">Manager HR Analytic Timesheet</field> diff --git a/addons/hr_timesheet_sheet/security/hr_timesheet_sheet_security.xml b/addons/hr_timesheet_sheet/security/hr_timesheet_sheet_security.xml index ff387a898ca..9ef8689f436 100644 --- a/addons/hr_timesheet_sheet/security/hr_timesheet_sheet_security.xml +++ b/addons/hr_timesheet_sheet/security/hr_timesheet_sheet_security.xml @@ -1,6 +1,6 @@ <?xml version="1.0"?> <openerp> - <data> + <data noupdate="1"> <record model="ir.rule" id="timesheet_comp_rule"> <field name="name">Timesheet multi-company</field> diff --git a/addons/l10n_ma/security/compta_security.xml b/addons/l10n_ma/security/compta_security.xml index 8d511ae7154..b053d44a402 100644 --- a/addons/l10n_ma/security/compta_security.xml +++ b/addons/l10n_ma/security/compta_security.xml @@ -1,4 +1,6 @@ -<?xml version="1.0" encoding="utf-8"?><openerp><data noupdate="0"> +<?xml version="1.0" encoding="utf-8"?> +<openerp> +<data noupdate="0"> <record id="group_expert_comptable" model="res.groups"> <field name="name">Finance / Expert Comptable </field> diff --git a/addons/mail/security/mail_security.xml b/addons/mail/security/mail_security.xml index 34fcbac3088..b67ce29a8b6 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"?> <openerp> - <data noupdate="1"> + <data noupdate="0"> <!-- CATEGORY --> <record model="ir.module.category" id="module_category_social"> @@ -16,6 +16,9 @@ <field name="category_id" ref="module_category_social"/> </record> + </data> + <data noupdate="1"> + <!-- RULES --> <record id="group_rule_public_and_joined" model="ir.rule"> <field name="name">Mail.group: access only public and joined groups</field> diff --git a/addons/mrp/security/mrp_security.xml b/addons/mrp/security/mrp_security.xml index f1f26aae1f2..35aae42b53d 100644 --- a/addons/mrp/security/mrp_security.xml +++ b/addons/mrp/security/mrp_security.xml @@ -23,6 +23,8 @@ <field eval="[(6,0,[ref('group_mrp_manager')])]" name="groups_id"/> </record> +</data> +<data noupdate="1"> <!-- Multi --> <record model="ir.rule" id="mrp_production_rule"> <field name="name">mrp_production multi-company</field> 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 7f2e91f1b48..1f2dd5bd8c6 100644 --- a/addons/point_of_sale/security/point_of_sale_security.xml +++ b/addons/point_of_sale/security/point_of_sale_security.xml @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <openerp> -<data noupdate="1"> +<data noupdate="0"> <record id="group_pos_user" model="res.groups"> <field name="name">User</field> diff --git a/addons/portal_event/security/portal_security.xml b/addons/portal_event/security/portal_security.xml index 82044fb8b11..c9aec1edd4b 100644 --- a/addons/portal_event/security/portal_security.xml +++ b/addons/portal_event/security/portal_security.xml @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <openerp> - <data> + <data noupdate="1"> <record id="portal_event_rule" model="ir.rule"> <field name="name">Personal Events</field> diff --git a/addons/procurement/security/procurement_security.xml b/addons/procurement/security/procurement_security.xml index b6b15d565c6..2362db4c355 100644 --- a/addons/procurement/security/procurement_security.xml +++ b/addons/procurement/security/procurement_security.xml @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <openerp> - <data noupdate="0"> + <data noupdate="1"> <record model="ir.rule" id="procurement_rule"> <field name="name">procurement multi-company</field> diff --git a/addons/product/security/product_security.xml b/addons/product/security/product_security.xml index 1d2c795083a..1d57a63e287 100644 --- a/addons/product/security/product_security.xml +++ b/addons/product/security/product_security.xml @@ -1,13 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <openerp> -<data noupdate="1"> - - <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.child_ids','child_of',[user.company_id.id]),('company_id','child_of',[user.company_id.id]),('company_id','=',False)]</field> - </record> +<data noupdate="0"> <record id="group_product_variant" model="res.groups"> <field name="name">Product Variant</field> @@ -44,6 +37,16 @@ <field name="category_id" ref="base.module_category_hidden"/> </record> +</data> +<data noupdate="1"> + + <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.child_ids','child_of',[user.company_id.id]),('company_id','child_of',[user.company_id.id]),('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"/> diff --git a/addons/project/security/project_security.xml b/addons/project/security/project_security.xml index f867285138a..a7ae16427ee 100644 --- a/addons/project/security/project_security.xml +++ b/addons/project/security/project_security.xml @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <openerp> -<data noupdate="1"> +<data noupdate="0"> <record id="group_project_user" model="res.groups"> <field name="name">User</field> @@ -34,6 +34,9 @@ <field name="category_id" ref="base.module_category_hidden"/> </record> +</data> +<data noupdate="1"> + <record model="ir.rule" id="project_comp_rule"> <field name="name">Project multi-company</field> <field name="model_id" ref="model_project_project"/> diff --git a/addons/purchase/security/purchase_security.xml b/addons/purchase/security/purchase_security.xml index 26a4aa14f1c..08c6dfb0782 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"?> <openerp> -<data noupdate="1"> +<data noupdate="0"> <record id="group_purchase_user" model="res.groups"> <field name="name">User</field> @@ -25,6 +25,9 @@ <field name="implied_ids" eval="[(4, ref('analytic.group_analytic_accounting'))]"/> </record> +</data> +<data noupdate="1"> + <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"/> diff --git a/addons/purchase_requisition/security/purchase_tender.xml b/addons/purchase_requisition/security/purchase_tender.xml index 12f9a9e56b8..e60665e202b 100644 --- a/addons/purchase_requisition/security/purchase_tender.xml +++ b/addons/purchase_requisition/security/purchase_tender.xml @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <openerp> -<data noupdate="1"> +<data noupdate="0"> <record model="ir.module.category" id="module_category_purchase_requisition"> <field name="name">Purchase Requisition</field> @@ -19,7 +19,10 @@ <field name="implied_ids" eval="[(4, ref('group_purchase_requisition_user'))]"/> <field name="users" eval="[(4, ref('base.user_root'))]"/> </record> - + +</data> +<data 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"/> diff --git a/addons/sale/security/sale_security.xml b/addons/sale/security/sale_security.xml index 0cb55fb0d30..86bf899820d 100644 --- a/addons/sale/security/sale_security.xml +++ b/addons/sale/security/sale_security.xml @@ -56,6 +56,8 @@ <field eval="[(4, ref('base.group_sale_manager'))]" name="groups_id"/> </record> +</data> +<data noupdate="1"> <!-- Multi - Company Rules --> <record model="ir.rule" id="sale_order_comp_rule"> diff --git a/addons/share/security/share_security.xml b/addons/share/security/share_security.xml index 29971077a2c..2c68cc69937 100644 --- a/addons/share/security/share_security.xml +++ b/addons/share/security/share_security.xml @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <openerp> - <data noupdate="1"> + <data noupdate="0"> <record model="ir.module.category" id="module_category_share"> <field name="name">Sharing</field> <field name="parent_id" ref="base.module_category_tools"/> diff --git a/addons/stock/security/stock_security.xml b/addons/stock/security/stock_security.xml index c9f8a03a378..37f6f80eacf 100644 --- a/addons/stock/security/stock_security.xml +++ b/addons/stock/security/stock_security.xml @@ -33,6 +33,8 @@ <field name="category_id" ref="base.module_category_hidden"/> </record> +</data> +<data noupdate="1"> <!-- multi --> <record model="ir.rule" id="stock_picking_rule"> diff --git a/addons/stock_location/security/stock_location_security.xml b/addons/stock_location/security/stock_location_security.xml index 880f5de70da..310c45da06c 100644 --- a/addons/stock_location/security/stock_location_security.xml +++ b/addons/stock_location/security/stock_location_security.xml @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <openerp> -<data noupdate="0"> +<data noupdate="1"> <!-- multi --> <record model="ir.rule" id="product_pulled_flow_comp_rule"> diff --git a/addons/stock_planning/security/stock_planning_security.xml b/addons/stock_planning/security/stock_planning_security.xml index 62f15e005bb..28289addc97 100644 --- a/addons/stock_planning/security/stock_planning_security.xml +++ b/addons/stock_planning/security/stock_planning_security.xml @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <openerp> -<data noupdate="0"> +<data noupdate="1"> <!-- multi --> <record model="ir.rule" id="stock_planning_comp_rule"> |
