From d0a81d395b1281793001488b1f5e1f5d68d2dd34 Mon Sep 17 00:00:00 2001
From: JesusVMayor <jesus@comunitea.com>
Date: Wed, 17 Apr 2019 18:47:38 +0200
Subject: [PATCH] [FIX]account_financial_report: Do not add company domain to
 partner_ids field when the partners are shared among the companies.

---
 .../wizard/aged_partner_balance_wizard.py          | 14 +++++++++-----
 .../wizard/general_ledger_wizard.py                | 14 +++++++++-----
 .../wizard/open_items_wizard.py                    | 14 +++++++++-----
 .../wizard/trial_balance_wizard.py                 | 14 +++++++++-----
 4 files changed, 36 insertions(+), 20 deletions(-)

diff --git a/account_financial_report/wizard/aged_partner_balance_wizard.py b/account_financial_report/wizard/aged_partner_balance_wizard.py
index a01586a7..082d5c86 100644
--- a/account_financial_report/wizard/aged_partner_balance_wizard.py
+++ b/account_financial_report/wizard/aged_partner_balance_wizard.py
@@ -59,11 +59,15 @@ class AgedPartnerBalanceWizard(models.TransientModel):
         else:
             res['domain']['account_ids'] += [
                 ('company_id', '=', self.company_id.id)]
-            res['domain']['partner_ids'] += [
-                '&',
-                '|', ('company_id', '=', self.company_id.id),
-                ('company_id', '=', False),
-                ('parent_id', '=', False)]
+            if self.env.ref('base.res_partner_rule').active:
+                res['domain']['partner_ids'] += [
+                    '&',
+                    '|', ('company_id', '=', self.company_id.id),
+                    ('company_id', '=', False),
+                    ('parent_id', '=', False)]
+            else:
+                res['domain']['partner_ids'] += [
+                    ('parent_id', '=', False)]
         return res
 
     @api.onchange('receivable_accounts_only', 'payable_accounts_only')
diff --git a/account_financial_report/wizard/general_ledger_wizard.py b/account_financial_report/wizard/general_ledger_wizard.py
index 621cc070..0b97724a 100644
--- a/account_financial_report/wizard/general_ledger_wizard.py
+++ b/account_financial_report/wizard/general_ledger_wizard.py
@@ -167,11 +167,15 @@ class GeneralLedgerReportWizard(models.TransientModel):
                 ('company_id', '=', self.company_id.id)]
             res['domain']['account_journal_ids'] += [
                 ('company_id', '=', self.company_id.id)]
-            res['domain']['partner_ids'] += [
-                '&',
-                '|', ('company_id', '=', self.company_id.id),
-                ('company_id', '=', False),
-                ('parent_id', '=', False)]
+            if self.env.ref('base.res_partner_rule').active:
+                res['domain']['partner_ids'] += [
+                    '&',
+                    '|', ('company_id', '=', self.company_id.id),
+                    ('company_id', '=', False),
+                    ('parent_id', '=', False)]
+            else:
+                res['domain']['partner_ids'] += [
+                    ('parent_id', '=', False)]
             res['domain']['cost_center_ids'] += [
                 ('company_id', '=', self.company_id.id)]
             res['domain']['date_range_id'] += [
diff --git a/account_financial_report/wizard/open_items_wizard.py b/account_financial_report/wizard/open_items_wizard.py
index 976c7983..39da2e26 100644
--- a/account_financial_report/wizard/open_items_wizard.py
+++ b/account_financial_report/wizard/open_items_wizard.py
@@ -90,11 +90,15 @@ class OpenItemsReportWizard(models.TransientModel):
         else:
             res['domain']['account_ids'] += [
                 ('company_id', '=', self.company_id.id)]
-            res['domain']['partner_ids'] += [
-                '&',
-                '|', ('company_id', '=', self.company_id.id),
-                ('company_id', '=', False),
-                ('parent_id', '=', False)]
+            if self.env.ref('base.res_partner_rule').active:
+                res['domain']['partner_ids'] += [
+                    '&',
+                    '|', ('company_id', '=', self.company_id.id),
+                    ('company_id', '=', False),
+                    ('parent_id', '=', False)]
+            else:
+                res['domain']['partner_ids'] += [
+                    ('parent_id', '=', False)]
         return res
 
     @api.onchange('receivable_accounts_only', 'payable_accounts_only')
diff --git a/account_financial_report/wizard/trial_balance_wizard.py b/account_financial_report/wizard/trial_balance_wizard.py
index f9eac02f..62bac4bd 100644
--- a/account_financial_report/wizard/trial_balance_wizard.py
+++ b/account_financial_report/wizard/trial_balance_wizard.py
@@ -137,11 +137,15 @@ class TrialBalanceReportWizard(models.TransientModel):
         else:
             res['domain']['account_ids'] += [
                 ('company_id', '=', self.company_id.id)]
-            res['domain']['partner_ids'] += [
-                '&',
-                '|', ('company_id', '=', self.company_id.id),
-                ('company_id', '=', False),
-                ('parent_id', '=', False)]
+            if self.env.ref('base.res_partner_rule').active:
+                res['domain']['partner_ids'] += [
+                    '&',
+                    '|', ('company_id', '=', self.company_id.id),
+                    ('company_id', '=', False),
+                    ('parent_id', '=', False)]
+            else:
+                res['domain']['partner_ids'] += [
+                    ('parent_id', '=', False)]
             res['domain']['date_range_id'] += [
                 '|', ('company_id', '=', self.company_id.id),
                 ('company_id', '=', False)]