Skip to content
Snippets Groups Projects
Commit d8429c2a authored by Cédric Krier's avatar Cédric Krier
Browse files

BASE, MULTI_COMPANY_*: improve rules 

- prevent infinit recursion
- add global rules
- more generic rules

bzr revid: ced-86f7994ddf6b901682a44ac51b9c807fb465abab
parent 5ac07652
Branches
Tags
No related merge requests found
Hide whitespace changes
Inline Side-by-side
addons/multi_company_account/multi_company_account_data.xml
+ 46
− 44
View file @ d8429c2a
......@@ -12,112 +12,114 @@
<field name="company_id" ref="base.main_company"/>
</record>
<record model="ir.rule" id="journal_comp_rule">
<record model="ir.rule.group" id="journal_comp_rule_group">
<field name="name">Journal multi-company</field>
<field name="type">sub</field>
<field name="model_id" search="[('model','=','account.journal')]" model="ir.model"/>
<field name="global" eval="True"/>
</record>
<record model="ir.rule" id="journal_comp_rule">
<field name="field_id" search="[('model','=','account.journal'),('name','=','company_id')]" model="ir.model.fields"/>
<field name="operator">=</field>
<field name="operand">user.company_id.id</field>
<field name="domain">[('company_id', '=', user.company_id.id)]</field>
<field name="rule_group" ref="journal_comp_rule_group"/>
</record>
<record model="ir.rule" id="analytic_journal_comp_rule">
<record model="ir.rule.group" id="analytic_journal_comp_rule_group">
<field name="name">Analytic journal multi-company</field>
<field name="type">sub</field>
<field name="model_id" search="[('model','=','account.analytic.journal')]" model="ir.model"/>
<field name="global" eval="True"/>
</record>
<record model="ir.rule" id="analytic_journal_comp_rule">
<field name="field_id" search="[('model','=','account.analytic.journal'),('name','=','company_id')]" model="ir.model.fields"/>
<field name="operator">=</field>
<field name="operand">user.company_id.id</field>
<field name="domain">[('company_id', '=', user.company_id.id)]</field>
<field name="rule_group" ref="analytic_journal_comp_rule_group"/>
</record>
<record model="ir.rule" id="budget_post_comp_rule">
<record model="ir.rule.group" id="budget_post_comp_rule_group">
<field name="name">Budget post multi-company</field>
<field name="type">sub</field>
<field name="model_id" search="[('model','=','account.budget.post')]" model="ir.model"/>
<field name="global" eval="True"/>
</record>
<record model="ir.rule" id="budget_post_comp_rule">
<field name="field_id" search="[('model','=','account.budget.post'),('name','=','company_id')]" model="ir.model.fields"/>
<field name="operator">=</field>
<field name="operand">user.company_id.id</field>
<field name="domain">[('company_id', '=', user.company_id.id)]</field>
<field name="rule_group" ref="budget_post_comp_rule_group"/>
</record>
<record model="ir.rule" id="period_comp_rule">
<record model="ir.rule.group" id="period_comp_rule_group">
<field name="name">Period multi-company</field>
<field name="type">sub</field>
<field name="model_id" search="[('model','=','account.period')]" model="ir.model"/>
<field name="global" eval="True"/>
</record>
<record model="ir.rule" id="period_comp_rule">
<field name="field_id" search="[('model','=','account.period'),('name','=','company_id')]" model="ir.model.fields"/>
<field name="operator">=</field>
<field name="operand">user.company_id.id</field>
<field name="domain">[('company_id', '=', user.company_id.id)]</field>
<field name="rule_group" ref="period_comp_rule_group"/>
</record>
<record model="ir.rule" id="fiscal_year_comp_rule">
<record model="ir.rule.group" id="fiscal_year_comp_rule_group">
<field name="name">Fiscal year multi-company</field>
<field name="type">sub</field>
<field name="model_id" search="[('model','=','account.fiscalyear')]" model="ir.model"/>
<field name="global" eval="True"/>
</record>
<record model="ir.rule" id="fiscal_year_comp_rule">
<field name="field_id" search="[('model','=','account.fiscalyear'),('name','=','company_id')]" model="ir.model.fields"/>
<field name="operator">=</field>
<field name="operand">user.company_id.id</field>
<field name="domain">[('company_id', '=', user.company_id.id)]</field>
<field name="rule_group" ref="fiscal_year_comp_rule_group"/>
</record>
<record model="ir.rule" id="account_comp_rule">
<record model="ir.rule.group" id="account_comp_rule_group">
<field name="name">Account multi-company</field>
<field name="type">sub</field>
<field name="model_id" search="[('model','=','account.account')]" model="ir.model"/>
<field name="global" eval="True"/>
</record>
<record model="ir.rule" id="account_comp_rule">
<field name="field_id" search="[('model','=','account.account'),('name','=','company_id')]" model="ir.model.fields"/>
<field name="operator">=</field>
<field name="operand">user.company_id.id</field>
<field name="domain">[('company_id', '=', user.company_id.id)]</field>
<field name="rule_group" ref="account_comp_rule_group"/>
</record>
<record model="ir.rule" id="tax_comp_rule">
<record model="ir.rule.group" id="tax_comp_rule_group">
<field name="name">Tax multi-company</field>
<field name="type">sub</field>
<field name="model_id" search="[('model','=','account.tax')]" model="ir.model"/>
<field name="global" eval="True"/>
</record>
<record model="ir.rule" id="tax_comp_rule">
<field name="field_id" search="[('model','=','account.tax'),('name','=','company_id')]" model="ir.model.fields"/>
<field name="operator">=</field>
<field name="operand">user.company_id.id</field>
<field name="domain">[('company_id', '=', user.company_id.id)]</field>
<field name="rule_group" ref="tax_comp_rule_group"/>
</record>
<record model="ir.rule" id="tax_code_comp_rule">
<record model="ir.rule.group" id="tax_code_comp_rule_group">
<field name="name">Tax code multi-company</field>
<field name="type">sub</field>
<field name="model_id" search="[('model','=','account.tax.code')]" model="ir.model"/>
<field name="global" eval="True"/>
</record>
<record model="ir.rule" id="tax_code_comp_rule">
<field name="field_id" search="[('model','=','acount.tax.code'),('name','=','company_id')]" model="ir.model.fields"/>
<field name="operator">=</field>
<field name="operand">user.company_id.id</field>
<field name="domain">[('company_id', '=', user.company_id.id)]</field>
<field name="rule_group" ref="tax_code_comp_rule_group"/>
</record>
<record model="ir.rule" id="invoice_comp_rule">
<record model="ir.rule.group" id="invoice_comp_rule_group">
<field name="name">Invoice multi-company</field>
<field name="type">sub</field>
<field name="model_id" search="[('model','=','account.invoice')]" model="ir.model"/>
<field name="global" eval="True"/>
</record>
<record model="ir.rule" id="invoice_comp_rule">
<field name="field_id" search="[('model','=','account.invoice'),('name','=','company_id')]" model="ir.model.fields"/>
<field name="operator">=</field>
<field name="operand">user.company_id.id</field>
<field name="domain">[('company_id', '=', user.company_id.id)]</field>
<field name="rule_group" ref="invoice_comp_rule_group"/>
</record>
<!-- <record model="ir.rule" id="_comp_rule"> -->
<!-- <field name="name"> multi-company</field> -->
<!-- <field name="type">sub</field> -->
<!-- <field name="model_id" search="[('model','=','')]" model="ir.model"/> -->
<!-- <field name="field_id" search="[('model','=',''),('name','=','company_id')]" model="ir.model.fields"/> -->
<!-- <field name="operator">=</field> -->
<!-- <field name="operand">user.company_id.id</field> -->
<!-- <field name="domain">[('company_id', '=', user.company_id.id)]</field> -->
<!-- </record> -->
</data>
</terp>
addons/multi_company_hr_timesheet_sheet/multi_company_hr_timesheet_sheet_data.xml
+ 5
− 5
View file @ d8429c2a
......@@ -2,17 +2,17 @@
<terp>
<data>
<record model="ir.rule" id="timesheet_comp_rule">
<record model="ir.rule.group" id="timesheet_comp_rule_group">
<field name="name">Timesheet multi-company</field>
<field name="type">sub</field>
<field name="model_id" search="[('model','=','hr_timesheet_sheet.sheet')]" model="ir.model"/>
<field name="global" eval="True"/>
</record>
<record model="ir.rule" id="timesheet_comp_rule">
<field name="field_id" search="[('model','=','hr_timesheet_sheet.sheet'),('name','=','company_id')]" model="ir.model.fields"/>
<field name="operator">=</field>
<field name="operand">user.company_id.id</field>
<field name="domain">[('company_id', '=', user.company_id.id)]</field>
<field name="rule_group" ref="timesheet_comp_rule_group"/>
</record>
</data>
</terp>
addons/multi_company_project/multi_company_project_data.xml
+ 10
− 6
View file @ d8429c2a
......@@ -2,24 +2,28 @@
<terp>
<data>
<record model="ir.rule" id="project_comp_rule">
<record model="ir.rule.group" id="project_comp_rule_group">
<field name="name">Project multi-company</field>
<field name="type">sub</field>
<field name="model_id" search="[('model','=','project.project')]" model="ir.model"/>
<field name="global" eval="True"/>
</record>
<record model="ir.rule" id="project_comp_rule">
<field name="field_id" search="[('model','=','project.project'),('name','=','company_id')]" model="ir.model.fields"/>
<field name="operator">=</field>
<field name="operand">user.company_id.id</field>
<field name="domain">[('company_id', '=', user.company_id.id)]</field>
<field name="rule_group" ref="project_comp_rule_group"/>
</record>
<record model="ir.rule" id="task_comp_rule">
<record model="ir.rule.group" id="task_comp_rule_group">
<field name="name" >Task multi-company</field>
<field name="type">sub</field>
<field name="model_id" search="[('model','=','project.task')]" model="ir.model"/>
<field name="global" eval="True"/>
</record>
<record model="ir.rule" id="task_comp_rule">
<field name="field_id" search="[('model','=','project.task'),('name','=','company_id')]" model="ir.model.fields"/>
<field name="operator">=</field>
<field name="operand">user.company_id.id</field>
<field name="domain">[('company_id', '=', user.company_id.id)]</field>
<field name="rule_group" ref="task_comp_rule_group"/>
</record>
</data>
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment