Merge d0a81d395b into 0aa3d6c1ae

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')

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'] += [

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')

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)]