From b7b3c33aa3dc9417c45f3bbb35e108c9af436000 Mon Sep 17 00:00:00 2001
From: Kaushalya Mandaliya <kma@odoo.com>
Date: Wed, 3 Jul 2019 13:17:32 +0000
Subject: [PATCH] [IMP] account, *: adding domain in analytic account fields

*: hr_expense, project

Adding required domain which will allow to only select analytic accounts whose
company is same as current one or blank.

task-1966016

closes odoo/odoo#37450

Closes: #34270
Signed-off-by: Quentin De Paoli (qdp) <qdp@openerp.com>
---
 addons/account/views/account_move_views.xml  | 4 +++-
 addons/account/views/account_view.xml        | 4 ++--
 addons/hr_expense/views/hr_expense_views.xml | 4 ++--
 addons/project/views/project_views.xml       | 2 +-
 4 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/addons/account/views/account_move_views.xml b/addons/account/views/account_move_views.xml
index 8d51e4d96fa..ed526fd5676 100644
--- a/addons/account/views/account_move_views.xml
+++ b/addons/account/views/account_move_views.xml
@@ -69,6 +69,7 @@
                                     </group>
                                     <group string="Analytic" groups="analytic.group_analytic_accounting,analytic.group_analytic_tags">
                                         <field name="analytic_account_id" groups="analytic.group_analytic_accounting"
+                                            domain="['|', ('company_id', '=', company_id), ('company_id', '=', False)]" 
                                             attrs="{'readonly':[('parent_state','=','posted')]}"/>
                                         <field name="analytic_tag_ids" groups="analytic.group_analytic_tags"
                                             widget="many2many_tags"/>
@@ -145,7 +146,7 @@
                     <field name="statement_id" invisible="1"/>
                     <field name="ref" optional="show"/>
                     <field name="name" optional="show"/>
-                    <field name="analytic_account_id" groups="account.group_account_user" optional="show"/>
+                    <field name="analytic_account_id" domain="['|', ('company_id', '=', company_id), ('company_id', '=', False)]" groups="account.group_account_user" optional="show" />
                     <field name="analytic_tag_ids" widget="many2many_tags" groups="analytic.group_analytic_tags" optional="hide"/>
                     <field name="tax_ids" widget="many2many_tags" width="0.5" optional="show" attrs="{'readonly':[('parent_state','=','posted')]}"/>
                     <field name="debit" sum="Total Debit"/>
@@ -776,6 +777,7 @@
                                         <field name="name" widget="section_and_note_text" optional="show"/>
                                         <field name="analytic_account_id"
                                                optional="hide"
+                                               domain="['|', ('company_id', '=', parent.company_id), ('company_id', '=', False)]"
                                                groups="analytic.group_analytic_accounting"
                                                attrs="{'invisible': [('display_type', 'in', ('line_section', 'line_note'))]}"/>
                                         <field name="analytic_tag_ids"
diff --git a/addons/account/views/account_view.xml b/addons/account/views/account_view.xml
index 9276f638f59..3abbb121871 100644
--- a/addons/account/views/account_view.xml
+++ b/addons/account/views/account_view.xml
@@ -956,7 +956,7 @@ action = model.setting_init_bank_account_action()
                                 <field name="show_force_tax_included" invisible="1"/>
                                 <field name="force_tax_included"
                                        attrs="{'invisible': [('show_force_tax_included', '=', False)]}" force_save="1"/>
-                                <field name="analytic_account_id" groups="analytic.group_analytic_accounting"/>
+                                <field name="analytic_account_id" domain="['|', ('company_id', '=', company_id), ('company_id', '=', False)]" groups="analytic.group_analytic_accounting"/>
                                 <field name="analytic_tag_ids" groups="analytic.group_analytic_tags" widget="many2many_tags"/>
                                 <field name="company_id" groups="base.group_multi_company"/>
                             </group>
@@ -991,7 +991,7 @@ action = model.setting_init_bank_account_action()
                                 <field name="show_second_force_tax_included" invisible="1"/>
                                 <field name="force_second_tax_included"
                                        attrs="{'invisible': [('show_second_force_tax_included', '=', False)]}" force_save="1"/>
-                                <field name="second_analytic_account_id" string="Analytic Account" groups="analytic.group_analytic_accounting"/>
+                                <field name="second_analytic_account_id" domain="['|', ('company_id', '=', company_id), ('company_id', '=', False)]" string="Analytic Account" groups="analytic.group_analytic_accounting"/>
                                 <field name="second_analytic_tag_ids" groups="analytic.group_analytic_tags" widget="many2many_tags"/>
                             </group>
                             <group>
diff --git a/addons/hr_expense/views/hr_expense_views.xml b/addons/hr_expense/views/hr_expense_views.xml
index f7e84bdddef..cec7242758f 100644
--- a/addons/hr_expense/views/hr_expense_views.xml
+++ b/addons/hr_expense/views/hr_expense_views.xml
@@ -98,7 +98,7 @@
                             <field name="employee_id" groups="hr_expense.group_hr_expense_team_approver"/>
                             <field name="sheet_id" invisible="1"/>
                             <field name="currency_id" groups="base.group_multi_currency"/>
-                            <field name="analytic_account_id" groups="analytic.group_analytic_accounting" attrs="{'readonly': [('is_editable', '=', False)]}"/>
+                            <field name="analytic_account_id" domain="['|', ('company_id', '=', company_id), ('company_id', '=', False)]" groups="analytic.group_analytic_accounting" attrs="{'readonly': [('is_editable', '=', False)]}"/>
                             <field name="analytic_tag_ids" widget="many2many_tags" groups="analytic.group_analytic_tags" attrs="{'readonly': [('is_editable', '=', False)]}"/>
                             <field name="company_id" groups="base.group_multi_company"/>
                         </group><group>
@@ -507,7 +507,7 @@
                                 <field name="date"/>
                                 <field name="name"/>
                                 <field name="state" invisible="1"/>
-                                <field name="analytic_account_id" groups="analytic.group_analytic_accounting"/>
+                                <field name="analytic_account_id" domain="['|', ('company_id', '=', parent.company_id), ('company_id', '=', False)]" groups="analytic.group_analytic_accounting"/>
                                 <field name="analytic_tag_ids" widget="many2many_tags" groups="analytic.group_analytic_tags"/>
                                 <field name="message_unread" invisible="1"/>
                                 <field name="attachment_number" string=" "/>
diff --git a/addons/project/views/project_views.xml b/addons/project/views/project_views.xml
index 36b52d5e28c..7940111441a 100644
--- a/addons/project/views/project_views.xml
+++ b/addons/project/views/project_views.xml
@@ -131,7 +131,7 @@
                                     <field name="partner_id" string="Customer"/>
                                 </group>
                                 <group>
-                                    <field name="analytic_account_id" context="{'default_partner_id': partner_id}" groups="analytic.group_analytic_accounting"/>
+                                    <field name="analytic_account_id" domain="['|', ('company_id', '=', company_id), ('company_id', '=', False)]" context="{'default_partner_id': partner_id}" groups="analytic.group_analytic_accounting"/>
                                     <field name="privacy_visibility" widget="radio"/>
 
                                     <field name="subtask_project_id" groups="project.group_subtask_project"/>