diff --git a/account_financial_report_qweb/report/trial_balance_xlsx.py b/account_financial_report_qweb/report/trial_balance_xlsx.py
index 58e780a7..7419df49 100644
--- a/account_financial_report_qweb/report/trial_balance_xlsx.py
+++ b/account_financial_report_qweb/report/trial_balance_xlsx.py
@@ -15,8 +15,7 @@ class TrialBalanceXslx(abstract_report_xlsx.AbstractReportXslx):
super(TrialBalanceXslx, self).__init__(
name, table, rml, parser, header, store)
- def _get_report_name(self, objects):
- report = objects
+ def _get_report_name(self, report):
return _('Trial Balance - %s - %s') % (
report.company_id.name, report.company_id.currency_id.name)
diff --git a/account_financial_report_qweb/wizard/aged_partner_balance_wizard.py b/account_financial_report_qweb/wizard/aged_partner_balance_wizard.py
index 2e066617..8cf0f1b4 100644
--- a/account_financial_report_qweb/wizard/aged_partner_balance_wizard.py
+++ b/account_financial_report_qweb/wizard/aged_partner_balance_wizard.py
@@ -17,7 +17,7 @@ class AgedPartnerBalance(models.TransientModel):
company_id = fields.Many2one(
comodel_name='res.company',
default=lambda self: self.env.user.company_id,
- required=True,
+ required=False,
string='Company'
)
date_at = fields.Date(required=True,
@@ -47,8 +47,22 @@ class AgedPartnerBalance(models.TransientModel):
lambda p: p.company_id == self.company_id or
not p.company_id)
if self.company_id and self.account_ids:
- self.account_ids = self.account_ids.filtered(
- lambda a: a.company_id == self.company_id)
+ if self.receivable_accounts_only or self.payable_accounts_only:
+ self.onchange_type_accounts_only()
+ else:
+ self.account_ids = self.account_ids.filtered(
+ lambda a: a.company_id == self.company_id)
+ res = {'domain': {'account_ids': [],
+ 'partner_ids': []}}
+ if not self.company_id:
+ return res
+ else:
+ res['domain']['account_ids'] += [
+ ('company_id', '=', self.company_id.id)]
+ res['domain']['partner_ids'] += [
+ '|', ('company_id', '=', self.company_id.id),
+ ('company_id', '=', False)]
+ return res
@api.onchange('receivable_accounts_only', 'payable_accounts_only')
def onchange_type_accounts_only(self):
diff --git a/account_financial_report_qweb/wizard/aged_partner_balance_wizard_view.xml b/account_financial_report_qweb/wizard/aged_partner_balance_wizard_view.xml
index 0438f35d..5c426587 100644
--- a/account_financial_report_qweb/wizard/aged_partner_balance_wizard_view.xml
+++ b/account_financial_report_qweb/wizard/aged_partner_balance_wizard_view.xml
@@ -23,8 +23,7 @@
+ options="{'no_create': True}"/>
@@ -33,7 +32,6 @@