Browse Source
Merge pull request #566 from Eficent/11.0-fix-revert-show-inactive-partners
[11.0][FIX] account_financial_report: revert of: "[IMP] Show inactive partners in wizard"
pull/568/head
Pedro M. Baeza
6 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with
4 additions and
8 deletions
-
account_financial_report/wizard/aged_partner_balance_wizard.py
-
account_financial_report/wizard/general_ledger_wizard.py
-
account_financial_report/wizard/open_items_wizard.py
-
account_financial_report/wizard/trial_balance_wizard.py
|
@ -53,8 +53,7 @@ class AgedPartnerBalanceWizard(models.TransientModel): |
|
|
self.account_ids = self.account_ids.filtered( |
|
|
self.account_ids = self.account_ids.filtered( |
|
|
lambda a: a.company_id == self.company_id) |
|
|
lambda a: a.company_id == self.company_id) |
|
|
res = {'domain': {'account_ids': [], |
|
|
res = {'domain': {'account_ids': [], |
|
|
'partner_ids': ['|', ('active', '=', False), |
|
|
|
|
|
('active', '=', True)]}} |
|
|
|
|
|
|
|
|
'partner_ids': []}} |
|
|
if not self.company_id: |
|
|
if not self.company_id: |
|
|
return res |
|
|
return res |
|
|
else: |
|
|
else: |
|
|
|
@ -154,8 +154,7 @@ class GeneralLedgerReportWizard(models.TransientModel): |
|
|
self.cost_center_ids = self.cost_center_ids.filtered( |
|
|
self.cost_center_ids = self.cost_center_ids.filtered( |
|
|
lambda c: c.company_id == self.company_id) |
|
|
lambda c: c.company_id == self.company_id) |
|
|
res = {'domain': {'account_ids': [], |
|
|
res = {'domain': {'account_ids': [], |
|
|
'partner_ids': ['|', ('active', '=', False), |
|
|
|
|
|
('active', '=', True)], |
|
|
|
|
|
|
|
|
'partner_ids': [], |
|
|
'account_journal_ids': [], |
|
|
'account_journal_ids': [], |
|
|
'cost_center_ids': [], |
|
|
'cost_center_ids': [], |
|
|
'date_range_id': [] |
|
|
'date_range_id': [] |
|
|
|
@ -84,8 +84,7 @@ class OpenItemsReportWizard(models.TransientModel): |
|
|
self.account_ids = self.account_ids.filtered( |
|
|
self.account_ids = self.account_ids.filtered( |
|
|
lambda a: a.company_id == self.company_id) |
|
|
lambda a: a.company_id == self.company_id) |
|
|
res = {'domain': {'account_ids': [], |
|
|
res = {'domain': {'account_ids': [], |
|
|
'partner_ids': ['|', ('active', '=', False), |
|
|
|
|
|
('active', '=', True)]}} |
|
|
|
|
|
|
|
|
'partner_ids': []}} |
|
|
if not self.company_id: |
|
|
if not self.company_id: |
|
|
return res |
|
|
return res |
|
|
else: |
|
|
else: |
|
|
|
@ -127,8 +127,7 @@ class TrialBalanceReportWizard(models.TransientModel): |
|
|
self.account_ids = self.account_ids.filtered( |
|
|
self.account_ids = self.account_ids.filtered( |
|
|
lambda a: a.company_id == self.company_id) |
|
|
lambda a: a.company_id == self.company_id) |
|
|
res = {'domain': {'account_ids': [], |
|
|
res = {'domain': {'account_ids': [], |
|
|
'partner_ids': ['|', ('active', '=', False), |
|
|
|
|
|
('active', '=', True)], |
|
|
|
|
|
|
|
|
'partner_ids': [], |
|
|
'date_range_id': [], |
|
|
'date_range_id': [], |
|
|
'journal_ids': [], |
|
|
'journal_ids': [], |
|
|
} |
|
|
} |
|
|