diff options
| author | Robot Odoo <xmo+roboto@odoo.com> | 2019-07-04 18:42:51 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-07-04 18:42:51 +0200 |
| commit | 3fc2a27808ca4e4ce74884580543e70537d5ce3b (patch) | |
| tree | dcc607ed9bf97adfa0bc12ce1695cc332da7254c /addons/project/security/project_security.xml | |
| parent | caf900e89ea292c56ed773232792a2aab19de8d5 (diff) | |
| parent | 2511841da1c42622b2d83f2235417bb83d14a76a (diff) | |
[MERGE] project, sale_timesheet: multi company fixes
Impacted modules: project, sale, sale_timesheet and project_timesheet_holidays.
Since a5b6f31cf28e5381e1c85f66730bcdb55998e643, the multi company environment is contextualized,
allowing people to see several company documents at the same time. This reveals
some problem in such env.
To solve this, we need to force the "company_id" field as required on some business
model, and to correctly propagate the company when a document generate another one.
The guidelines is to stop using company of current user, but the one of the document
itself.
See subcommits for more details.
Task-1999686
closes odoo/odoo#33739
Signed-off-by: Jérome Maes (jem) <jem@openerp.com>
Diffstat (limited to 'addons/project/security/project_security.xml')
| -rw-r--r-- | addons/project/security/project_security.xml | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/addons/project/security/project_security.xml b/addons/project/security/project_security.xml index c50386bb6ec..eecc68d1ccb 100644 --- a/addons/project/security/project_security.xml +++ b/addons/project/security/project_security.xml @@ -38,10 +38,7 @@ <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', 'in', company_ids), - ]</field> + <field name="domain_force">[('company_id', 'in', company_ids)]</field> </record> <record model="ir.rule" id="project_project_manager_rule"> @@ -67,10 +64,7 @@ <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', '=', False), - ('company_id', 'in', company_ids), - ]</field> + <field name="domain_force">[('company_id', 'in', company_ids)]</field> </record> <record model="ir.rule" id="task_visibility_rule"> @@ -100,7 +94,7 @@ <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','=',False),('company_id', 'in', company_ids)]</field> + <field name="domain_force">[('company_id', 'in', company_ids)]</field> </record> <!-- Portal --> |