diff --git a/dynamic_accounts_report/__manifest__.py b/dynamic_accounts_report/__manifest__.py index 288e91f20..0380e8062 100644 --- a/dynamic_accounts_report/__manifest__.py +++ b/dynamic_accounts_report/__manifest__.py @@ -21,7 +21,7 @@ ################################################################################ { 'name': 'Odoo18 Dynamic Accounting Reports', - 'version': '18.0.1.1.1', + 'version': '18.0.1.1.2', 'category': 'Accounting', 'summary': "Odoo 18 Accounting Financial Reports,Dynamic Accounting Reports, Dynamic Financial Reports,Dynamic Report Odoo18, Odoo18,Financial Reports, Odoo18 Accounting,Accounting, Odoo Apps", 'description': "This module creates dynamic Accounting General Ledger, Trial" diff --git a/dynamic_accounts_report/doc/RELEASE_NOTES.md b/dynamic_accounts_report/doc/RELEASE_NOTES.md index e4c5be32c..5a8b464ac 100644 --- a/dynamic_accounts_report/doc/RELEASE_NOTES.md +++ b/dynamic_accounts_report/doc/RELEASE_NOTES.md @@ -8,4 +8,9 @@ #### 13.12.2024 #### Version 18.0.1.1.1 #### UPDT +- Fixed the errors in the filters. + +#### 27.01.2025 +#### Version 18.0.1.1.2 +#### UPDT - Fixed the errors in the filters. \ No newline at end of file diff --git a/dynamic_accounts_report/models/account_trial_balance.py b/dynamic_accounts_report/models/account_trial_balance.py index c807457d5..5dd50f778 100644 --- a/dynamic_accounts_report/models/account_trial_balance.py +++ b/dynamic_accounts_report/models/account_trial_balance.py @@ -87,7 +87,11 @@ class AccountTrialBalance(models.TransientModel): 'end_total_credit': end_total_credit } move_line_list.append(data) - return move_line_list + journal = { + 'journal_ids': self.env['account.journal'].search_read([], [ + 'name']) + } + return move_line_list, journal @api.model def get_filter_values(self, start_date, end_date, comparison_number, diff --git a/dynamic_accounts_report/static/src/js/general_ledger.js b/dynamic_accounts_report/static/src/js/general_ledger.js index a61f22812..995edf552 100644 --- a/dynamic_accounts_report/static/src/js/general_ledger.js +++ b/dynamic_accounts_report/static/src/js/general_ledger.js @@ -49,7 +49,11 @@ class GeneralLedger extends owl.Component { var action_title = self.props.action.display_name; try { var self = this; - self.state.account_data = await self.orm.call("account.general.ledger", "view_report", [[this.wizard_id], action_title,]); + let filtered_data = await this.orm.call("account.general.ledger", "get_filter_values", [self.state.selected_journal_list, self.state.date_range, self.state.options, self.state.selected_analytic_list,self.state.method]); + self.state.journals = filtered_data['journal_ids'] + self.state.analytics = filtered_data['analytic_ids'] + account_totals = filtered_data['account_totals'] + self.state.account_data = await self.orm.call("account.general.ledger", "view_report", [self.wizard_id, action_title,]); $.each(self.state.account_data, function (index, value) { if (index !== 'account_totals' && index !== 'journal_ids' && index !== 'analytic_ids') { account_list.push(index) diff --git a/dynamic_accounts_report/static/src/js/trial_balance.js b/dynamic_accounts_report/static/src/js/trial_balance.js index 543e869b6..3a4e049e1 100644 --- a/dynamic_accounts_report/static/src/js/trial_balance.js +++ b/dynamic_accounts_report/static/src/js/trial_balance.js @@ -60,6 +60,7 @@ class TrialBalance extends owl.Component { self.start_date.el.value = startOfMonth.getFullYear() + '-' + String(startOfMonth.getMonth() + 1).padStart(2, '0') + '-' + String(startOfMonth.getDate()).padStart(2, '0'); self.end_date.el.value = endOfMonth.getFullYear() + '-' + String(endOfMonth.getMonth() + 1).padStart(2, '0') + '-' + String(endOfMonth.getDate()).padStart(2, '0'); self.state.date_viewed.push(monthNamesShort[today.getMonth()] + ' ' + today.getFullYear()) + self.state.journals = self.state.data[1]['journal_ids'] $.each(self.state.data, function (index, value) { self.state.journals = value.journal_ids }) diff --git a/dynamic_accounts_report/static/src/xml/partner_ledger_view.xml b/dynamic_accounts_report/static/src/xml/partner_ledger_view.xml index b404346e1..8da9ab218 100644 --- a/dynamic_accounts_report/static/src/xml/partner_ledger_view.xml +++ b/dynamic_accounts_report/static/src/xml/partner_ledger_view.xml @@ -12,7 +12,7 @@