diff options
Diffstat (limited to 'addons')
14 files changed, 42 insertions, 42 deletions
diff --git a/addons/account/security/account_security.xml b/addons/account/security/account_security.xml index 5f429270e29..39ed61cc253 100644 --- a/addons/account/security/account_security.xml +++ b/addons/account/security/account_security.xml @@ -16,98 +16,98 @@ <field name="name">Account Entry</field> <field ref="model_account_move" name="model_id"/> <field eval="True" name="global"/> - <field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field> + <field name="domain_force">['|','|',('company_id','=',False),('company_id','child_of',[user.company_id.id]),('company_id.child_ids','child_of',[user.company_id.id])]</field> </record> <record id="account_move_line_comp_rule" model="ir.rule"> <field name="name">Entry lines</field> <field model="ir.model" name="model_id" ref="model_account_move_line"/> <field eval="True" name="global"/> - <field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field> + <field name="domain_force">['|','|',('company_id','=',False),('company_id','child_of',[user.company_id.id]),('company_id.child_ids','child_of',[user.company_id.id])]</field> </record> <record id="journal_period_comp_rule" model="ir.rule"> <field name="name">Journal Period</field> <field model="ir.model" name="model_id" ref="model_account_journal_period"/> <field eval="True" name="global"/> - <field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field> + <field name="domain_force">['|','|',('company_id','=',False),('company_id','child_of',[user.company_id.id]),('company_id.child_ids','child_of',[user.company_id.id])]</field> </record> <record id="journal_comp_rule" model="ir.rule"> <field name="name">Journal multi-company</field> <field model="ir.model" name="model_id" ref="model_account_journal"/> <field eval="True" name="global"/> - <field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field> + <field name="domain_force">['|','|',('company_id','=',False),('company_id','child_of',[user.company_id.id]),('company_id.child_ids','child_of',[user.company_id.id])]</field> </record> <record id="analytic_journal_comp_rule" model="ir.rule"> <field name="name">Analytic journal multi-company</field> <field model="ir.model" name="model_id" ref="model_account_analytic_journal"/> <field eval="True" name="global"/> - <field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field> + <field name="domain_force">['|','|',('company_id','=',False),('company_id','child_of',[user.company_id.id]),('company_id.child_ids','child_of',[user.company_id.id])]</field> </record> <record id="analytic_journal_comp_rule_false" model="ir.rule"> <field name="name">Analytic journal multi-company</field> <field model="ir.model" name="model_id" ref="model_account_analytic_journal"/> <field eval="True" name="global"/> - <field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field> + <field name="domain_force">['|','|',('company_id','=',False),('company_id','child_of',[user.company_id.id]),('company_id.child_ids','child_of',[user.company_id.id])]</field> </record> <record id="period_comp_rule" model="ir.rule"> <field name="name">Period multi-company</field> <field model="ir.model" name="model_id" ref="model_account_period"/> <field eval="True" name="global"/> - <field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field> + <field name="domain_force">['|','|',('company_id','=',False),('company_id','child_of',[user.company_id.id]),('company_id.child_ids','child_of',[user.company_id.id])]</field> </record> <record id="fiscal_year_comp_rule" model="ir.rule"> <field name="name">Fiscal year multi-company</field> <field model="ir.model" name="model_id" ref="model_account_fiscalyear"/> <field eval="True" name="global"/> - <field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field> + <field name="domain_force">['|','|',('company_id','=',False),('company_id','child_of',[user.company_id.id]),('company_id.child_ids','child_of',[user.company_id.id])]</field> </record> <record id="account_comp_rule" model="ir.rule"> <field name="name">Account multi-company</field> <field model="ir.model" name="model_id" ref="model_account_account"/> <field eval="True" name="global"/> - <field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field> + <field name="domain_force">['|','|',('company_id','=',False),('company_id','child_of',[user.company_id.id]),('company_id.child_ids','child_of',[user.company_id.id])]</field> </record> <record id="tax_comp_rule" model="ir.rule"> <field name="name">Tax multi-company</field> <field model="ir.model" name="model_id" ref="model_account_tax"/> <field eval="True" name="global"/> - <field name="domain_force">['|',('company_id','=',False),('company_id','=',user.company_id.id)]</field> + <field name="domain_force">['|','|',('company_id','=',False),('company_id','child_of',[user.company_id.id]),('company_id.child_ids','child_of',[user.company_id.id])]</field> </record> <record id="tax_code_comp_rule" model="ir.rule"> <field name="name">Tax code multi-company</field> <field model="ir.model" name="model_id" ref="model_account_tax_code"/> <field eval="True" name="global"/> - <field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field> + <field name="domain_force">['|','|',('company_id','=',False),('company_id','child_of',[user.company_id.id]),('company_id.child_ids','child_of',[user.company_id.id])]</field> </record> <record id="invoice_comp_rule" model="ir.rule"> <field name="name">Invoice multi-company</field> <field model="ir.model" name="model_id" ref="model_account_invoice"/> <field eval="True" name="global"/> - <field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field> + <field name="domain_force">['|','|',('company_id','=',False),('company_id','child_of',[user.company_id.id]),('company_id.child_ids','child_of',[user.company_id.id])]</field> </record> <record id="account_fiscal_position_comp_rule" model="ir.rule"> <field name="name">Account fiscal Mapping company rule</field> <field model="ir.model" name="model_id" ref="model_account_fiscal_position"/> <field eval="True" name="global"/> - <field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field> + <field name="domain_force">['|','|',('company_id','=',False),('company_id','child_of',[user.company_id.id]),('company_id.child_ids','child_of',[user.company_id.id])]</field> </record> <record id="account_model_comp_rule" model="ir.rule"> <field name="name">Account model company rule</field> <field model="ir.model" name="model_id" ref="model_account_model"/> <field eval="True" name="global"/> - <field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field> + <field name="domain_force">['|','|',('company_id','=',False),('company_id','child_of',[user.company_id.id]),('company_id.child_ids','child_of',[user.company_id.id])]</field> </record> </data></openerp> diff --git a/addons/account_budget/security/account_budget_security.xml b/addons/account_budget/security/account_budget_security.xml index 1fbcd82e86c..1d737d5ddd8 100644 --- a/addons/account_budget/security/account_budget_security.xml +++ b/addons/account_budget/security/account_budget_security.xml @@ -6,21 +6,21 @@ <field name="name">Budget post multi-company</field> <field name="model_id" ref="model_account_budget_post"/> <field eval="True" name="global"/> - <field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field> + <field name="domain_force">['|','|',('company_id','=',False),('company_id','child_of',[user.company_id.id]),('company_id.child_ids','child_of',[user.company_id.id])]</field> </record> <record id="budget_comp_rule" model="ir.rule"> <field name="name">Budget multi-company</field> <field name="model_id" ref="model_crossovered_budget"/> <field eval="True" name="global"/> - <field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field> + <field name="domain_force">['|','|',('company_id','=',False),('company_id','child_of',[user.company_id.id]),('company_id.child_ids','child_of',[user.company_id.id])]</field> </record> <record id="budget_lines_comp_rule" model="ir.rule"> <field name="name">Budget lines multi-company</field> <field name="model_id" ref="model_crossovered_budget_lines"/> <field eval="True" name="global"/> - <field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field> + <field name="domain_force">['|','|',('company_id','=',False),('company_id','child_of',[user.company_id.id]),('company_id.child_ids','child_of',[user.company_id.id])]</field> </record> </data> diff --git a/addons/account_coda/security/account_security.xml b/addons/account_coda/security/account_security.xml index b8fdd32ebe6..3035c8e608b 100644 --- a/addons/account_coda/security/account_security.xml +++ b/addons/account_coda/security/account_security.xml @@ -5,7 +5,7 @@ <field name="name">Account Coda model company rule</field> <field model="ir.model" name="model_id" ref="model_account_coda"/> <field eval="True" name="global"/> - <field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field> + <field name="domain_force">['|','|',('company_id','=',False),('company_id','child_of',[user.company_id.id]),('company_id.child_ids','child_of',[user.company_id.id])]</field> </record> </data></openerp> diff --git a/addons/account_payment/security/account_payment_security.xml b/addons/account_payment/security/account_payment_security.xml index 5977ea36365..dcd2826a65f 100644 --- a/addons/account_payment/security/account_payment_security.xml +++ b/addons/account_payment/security/account_payment_security.xml @@ -10,7 +10,7 @@ <field name="name">Payment Mode company rule</field> <field model="ir.model" name="model_id" ref="model_payment_mode"/> <field eval="True" name="global"/> - <field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field> + <field name="domain_force">['|','|',('company_id','=',False),('company_id','child_of',[user.company_id.id]),('company_id.child_ids','child_of',[user.company_id.id])]</field> </record> </data> diff --git a/addons/account_voucher/security/account_voucher_security.xml b/addons/account_voucher/security/account_voucher_security.xml index df4e58484b5..d368ab858ed 100644 --- a/addons/account_voucher/security/account_voucher_security.xml +++ b/addons/account_voucher/security/account_voucher_security.xml @@ -5,13 +5,13 @@ <field name="name">Voucher multi-company</field> <field model="ir.model" name="model_id" ref="model_account_voucher"/> <field eval="True" name="global"/> - <field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field> + <field name="domain_force">['|','|',('company_id','=',False),('company_id','child_of',[user.company_id.id]),('company_id.child_ids','child_of',[user.company_id.id])]</field> </record> <record id="voucher_line_comp_rule" model="ir.rule"> <field name="name">Voucher Line multi-company</field> <field model="ir.model" name="model_id" ref="model_account_voucher_line"/> <field eval="True" name="global"/> - <field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field> + <field name="domain_force">['|','|',('company_id','=',False),('company_id','child_of',[user.company_id.id]),('company_id.child_ids','child_of',[user.company_id.id])]</field> </record> </data> </openerp> diff --git a/addons/analytic/security/analytic_security.xml b/addons/analytic/security/analytic_security.xml index dfa8c840bb6..58a687fee1b 100644 --- a/addons/analytic/security/analytic_security.xml +++ b/addons/analytic/security/analytic_security.xml @@ -5,7 +5,7 @@ <field name="name">Analytic multi company rule</field> <field model="ir.model" name="model_id" ref="model_account_analytic_account"/> <field eval="True" name="global"/> - <field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field> + <field name="domain_force">['|','|',('company_id','=',False),('company_id','child_of',[user.company_id.id]),('company_id.child_ids','child_of',[user.company_id.id])]</field> </record> <record id="group_analytic_accounting" model="res.groups" context="{'noadmin':True}"> <field name="name">Useability / Analytic Accounting</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 af6786a2a77..f5b346af50e 100644 --- a/addons/hr_timesheet_sheet/security/hr_timesheet_sheet_security.xml +++ b/addons/hr_timesheet_sheet/security/hr_timesheet_sheet_security.xml @@ -6,7 +6,7 @@ <field name="name">Timesheet multi-company</field> <field name="model_id" search="[('model','=','hr_timesheet_sheet.sheet')]" model="ir.model"/> <field name="global" eval="True"/> - <field name="domain_force">[('company_id','child_of',[user.company_id.id])]</field> + <field name="domain_force">['|','|',('company_id','=',False),('company_id','child_of',[user.company_id.id]),('company_id.child_ids','child_of',[user.company_id.id])]</field> </record> </data> diff --git a/addons/mrp/security/mrp_security.xml b/addons/mrp/security/mrp_security.xml index 1cc4c5cea9b..743432af745 100644 --- a/addons/mrp/security/mrp_security.xml +++ b/addons/mrp/security/mrp_security.xml @@ -19,21 +19,21 @@ <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','child_of',[user.company_id.id]),('company_id','=',False)]</field> + <field name="domain_force">['|','|',('company_id','=',False),('company_id','child_of',[user.company_id.id]),('company_id.child_ids','child_of',[user.company_id.id])]</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','child_of',[user.company_id.id]),('company_id','=',False)]</field> + <field name="domain_force">['|','|',('company_id','=',False),('company_id','child_of',[user.company_id.id]),('company_id.child_ids','child_of',[user.company_id.id])]</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','child_of',[user.company_id.id]),('company_id','=',False)]</field> + <field name="domain_force">['|','|',('company_id','=',False),('company_id','child_of',[user.company_id.id]),('company_id.child_ids','child_of',[user.company_id.id])]</field> </record> </data> diff --git a/addons/product/security/product_security.xml b/addons/product/security/product_security.xml index 32399358f68..ce33f8f6eec 100644 --- a/addons/product/security/product_security.xml +++ b/addons/product/security/product_security.xml @@ -20,7 +20,7 @@ <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','=',False),('company_id','child_of',[user.company_id.id])]</field> + <field name="domain_force">['|','|',('company_id','=',False),('company_id','child_of',[user.company_id.id]),('company_id.child_ids','child_of',[user.company_id.id])]</field> </record> <record id="group_product_variant" model="res.groups" context="{'noadmin':True}"> diff --git a/addons/project/security/project_security.xml b/addons/project/security/project_security.xml index b51a5a9c89a..3ec15131419 100644 --- a/addons/project/security/project_security.xml +++ b/addons/project/security/project_security.xml @@ -22,14 +22,14 @@ <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','=',False),('company_id','child_of',[user.company_id.id])]</field> + <field name="domain_force">['|','|',('company_id','=',False),('company_id','child_of',[user.company_id.id]),('company_id.child_ids','child_of',[user.company_id.id])]</field> </record> <record model="ir.rule" id="task_comp_rule"> <field name="name" >Task multi-company</field> <field name="model_id" ref="model_project_task"/> <field name="global" eval="True"/> - <field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field> + <field name="domain_force">['|','|',('company_id','=',False),('company_id','child_of',[user.company_id.id]),('company_id.child_ids','child_of',[user.company_id.id])]</field> </record> <record model="ir.rule" id="task_visibility_rule"> diff --git a/addons/purchase/security/purchase_security.xml b/addons/purchase/security/purchase_security.xml index e1149c91466..e949070cc75 100644 --- a/addons/purchase/security/purchase_security.xml +++ b/addons/purchase/security/purchase_security.xml @@ -13,14 +13,14 @@ <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','child_of',[user.company_id.id])]</field> + <field name="domain_force">['|','|',('company_id','=',False),('company_id','child_of',[user.company_id.id]),('company_id.child_ids','child_of',[user.company_id.id])]</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','child_of',[user.company_id.id])]</field> + <field name="domain_force">['|','|',('company_id','=',False),('company_id','child_of',[user.company_id.id]),('company_id.child_ids','child_of',[user.company_id.id])]</field> </record> </data> diff --git a/addons/purchase_requisition/security/purchase_tender.xml b/addons/purchase_requisition/security/purchase_tender.xml index 595b71008ef..05d76878228 100644 --- a/addons/purchase_requisition/security/purchase_tender.xml +++ b/addons/purchase_requisition/security/purchase_tender.xml @@ -14,14 +14,14 @@ <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','child_of',[user.company_id.id])]</field> + <field name="domain_force">['|','|',('company_id','=',False),('company_id','child_of',[user.company_id.id]),('company_id.child_ids','child_of',[user.company_id.id])]</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','child_of',[user.company_id.id])]</field> + <field name="domain_force">['|','|',('company_id','=',False),('company_id','child_of',[user.company_id.id]),('company_id.child_ids','child_of',[user.company_id.id])]</field> </record> </data> diff --git a/addons/sale/security/sale_security.xml b/addons/sale/security/sale_security.xml index e4a8a880e9c..ac4f7573c5a 100644 --- a/addons/sale/security/sale_security.xml +++ b/addons/sale/security/sale_security.xml @@ -21,14 +21,14 @@ <field name="name">Sale Order multi-company</field> <field name="model_id" ref="model_sale_order"/> <field name="global" eval="True"/> - <field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field> + <field name="domain_force">['|','|',('company_id','=',False),('company_id','child_of',[user.company_id.id]),('company_id.child_ids','child_of',[user.company_id.id])]</field> </record> <record model="ir.rule" id="sale_order_line_comp_rule"> <field name="name">Sale 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','child_of',[user.company_id.id])]</field> + <field name="domain_force">['|','|',('company_id','=',False),('company_id','child_of',[user.company_id.id]),('company_id.child_ids','child_of',[user.company_id.id])]</field> </record> <record id="sale_order_personal_rule" model="ir.rule"> @@ -49,7 +49,7 @@ <field name="name">Sale Shop multi-company</field> <field name="model_id" ref="model_sale_shop"/> <field name="global" eval="True"/> - <field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field> + <field name="domain_force">['|','|',('company_id','=',False),('company_id','child_of',[user.company_id.id]),('company_id.child_ids','child_of',[user.company_id.id])]</field> </record> </data> diff --git a/addons/stock/security/stock_security.xml b/addons/stock/security/stock_security.xml index 717486413c6..dc36e193497 100644 --- a/addons/stock/security/stock_security.xml +++ b/addons/stock/security/stock_security.xml @@ -15,42 +15,42 @@ <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','=',False),('company_id','child_of',[user.company_id.id])]</field> + <field name="domain_force">['|','|',('company_id','=',False),('company_id','child_of',[user.company_id.id]),('company_id.child_ids','child_of',[user.company_id.id])]</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','=',False),('company_id','child_of',[user.company_id.id])]</field> + <field name="domain_force">['|','|',('company_id','=',False),('company_id','child_of',[user.company_id.id]),('company_id.child_ids','child_of',[user.company_id.id])]</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','child_of',[user.company_id.id])]</field> + <field name="domain_force">['|','|',('company_id','=',False),('company_id','child_of',[user.company_id.id]),('company_id.child_ids','child_of',[user.company_id.id])]</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','=',False),('company_id','child_of',[user.company_id.id])]</field> + <field name="domain_force">['|','|',('company_id','=',False),('company_id','child_of',[user.company_id.id]),('company_id.child_ids','child_of',[user.company_id.id])]</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','=',False),('company_id','child_of',[user.company_id.id])]</field> + <field name="domain_force">['|','|',('company_id','=',False),('company_id','child_of',[user.company_id.id]),('company_id.child_ids','child_of',[user.company_id.id])]</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','=',False),('company_id','child_of',[user.company_id.id])]</field> + <field name="domain_force">['|','|',('company_id','=',False),('company_id','child_of',[user.company_id.id]),('company_id.child_ids','child_of',[user.company_id.id])]</field> </record> </data> |