tocmo0nlord/Odoo-18.0-20251222
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[ADD] 11.0 account_financial_report: add filter by journals

Browse Source 
To general ledger
This commit is contained in:
mpanarin
2018-07-19 12:31:22 +03:00
committed by chaule97
parent 40e75cd709
commit 72c0e719ed
7 changed files with 86 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
account_financial_report/wizard/general_ledger_wizard.py
View File

@@ -54,6 +54,10 @@ class GeneralLedgerReportWizard(models.TransientModel):
comodel_name='res.partner',
string='Filter partners',
)
account_journal_ids = fields.Many2many(
comodel_name='account.journal',
string='Filter journals',
)
cost_center_ids = fields.Many2many(
comodel_name='account.analytic.account',
string='Filter cost centers',
@@ -122,8 +126,8 @@ class GeneralLedgerReportWizard(models.TransientModel):
self.ensure_one()
action = self.env.ref(
'account_financial_report.action_report_general_ledger')
vals = action.read()[0]
context1 = vals.get('context', {})
action_data = action.read()[0]
context1 = action_data.get('context', {})
if isinstance(context1, pycompat.string_types):
context1 = safe_eval(context1)
model = self.env['report_general_ledger']
@@ -131,8 +135,8 @@ class GeneralLedgerReportWizard(models.TransientModel):
report.compute_data_for_report()
context1['active_id'] = report.id
context1['active_ids'] = report.ids
vals['context'] = context1
return vals
action_data['context'] = context1
return action_data
@api.multi
def button_export_pdf(self):
@@ -158,6 +162,7 @@ class GeneralLedgerReportWizard(models.TransientModel):
'filter_account_ids': [(6, 0, self.account_ids.ids)],
'filter_partner_ids': [(6, 0, self.partner_ids.ids)],
'filter_cost_center_ids': [(6, 0, self.cost_center_ids.ids)],
'filter_journal_ids': [(6, 0, self.account_journal_ids.ids)],
'centralize': self.centralize,
'fy_start_date': self.fy_start_date,
}

4
account_financial_report/wizard/general_ledger_wizard_view.xml
View File

@@ -30,13 +30,15 @@
<group/>
<label for="partner_ids"/>
<field name="partner_ids" nolabel="1" options="{'no_create': True}"/>
<label for="account_journal_ids"/>
<field name="account_journal_ids" widget="many2many_tags" nolabel="1" options="{'no_create': True}"/>
<group/>
<label for="account_ids"/>
<group col="4">
<field name="receivable_accounts_only"/>
<field name="payable_accounts_only"/>
</group>
<field name="account_ids" widget="many2many_tags" nolabel="1" options="{'no_create': True}"/>
<field name="account_ids" widget="many2many_tags" nolabel="1" options="{'no_create': True}"/>
</div>
<div attrs="{'invisible': [('not_only_one_unaffected_earnings_account', '=', False)]}">
<field name="not_only_one_unaffected_earnings_account" invisible="1"/>

4
account_financial_report/wizard/trial_balance_wizard.py
View File

@@ -54,6 +54,9 @@ class TrialBalanceReportWizard(models.TransientModel):
comodel_name='res.partner',
string='Filter partners',
)
journal_ids = fields.Many2many(
comodel_name="account.journal",
)
not_only_one_unaffected_earnings_account = fields.Boolean(
readonly=True,
@@ -157,6 +160,7 @@ class TrialBalanceReportWizard(models.TransientModel):
'company_id': self.company_id.id,
'filter_account_ids': [(6, 0, self.account_ids.ids)],
'filter_partner_ids': [(6, 0, self.partner_ids.ids)],
'filter_journal_ids': [(6, 0, self.partner_ids.ids)],
'fy_start_date': self.fy_start_date,
'hierarchy_on': self.hierarchy_on,
'show_partner_details': self.show_partner_details,

2
account_financial_report/wizard/trial_balance_wizard_view.xml
View File

@@ -28,6 +28,8 @@
</group>
<label for="partner_ids" attrs="{'invisible':[('show_partner_details','!=',True)]}"/>
<field name="partner_ids" nolabel="1" options="{'no_create': True}" attrs="{'invisible':[('show_partner_details','!=',True)]}"/>
<label for="journal_ids"/>
<field name="journal_ids" widget="many2many_tags" nolabel="1" options="{'no_create': True}"/>
<group attrs="{'invisible':[('show_partner_details','!=',True)]}"/>
<label for="account_ids"/>
<group col="4">