diff --git a/dynamic_accounts_report/__manifest__.py b/dynamic_accounts_report/__manifest__.py index 58e462893..575d9d7e9 100644 --- a/dynamic_accounts_report/__manifest__.py +++ b/dynamic_accounts_report/__manifest__.py @@ -22,7 +22,7 @@ { 'name': 'Dynamic Financial Reports V16', - 'version': '16.0.1.0.14', + 'version': '16.0.2.0.14', 'category': 'Accounting', 'live_test_url': 'https://www.youtube.com/watch?v=gVQi9q9Rs-E&t=5s', 'summary': "Odoo 16 Accounting Financial Reports", diff --git a/dynamic_accounts_report/doc/RELEASE_NOTES.md b/dynamic_accounts_report/doc/RELEASE_NOTES.md index 0123a856b..10d5fb6f9 100644 --- a/dynamic_accounts_report/doc/RELEASE_NOTES.md +++ b/dynamic_accounts_report/doc/RELEASE_NOTES.md @@ -50,3 +50,8 @@ ### version 16.0.1.0.12, ### BUGFIX - Report Bug Fix: Problem with rounding issue. +- +### 12.03.2025 +### version 16.0.2.0.0, +### UPDT +- Added new filter display accounts in trial balance. diff --git a/dynamic_accounts_report/static/src/css/report.css b/dynamic_accounts_report/static/src/css/report.css index b97878b48..90cfb084c 100644 --- a/dynamic_accounts_report/static/src/css/report.css +++ b/dynamic_accounts_report/static/src/css/report.css @@ -10,7 +10,7 @@ width: 300px !important; .table{ margin-bottom: none !important; } -.time_range, .category_filter, .search-Target-move, .partner_filter, .search-Result-Selection, .acccount_type_filter, .journals_filter, .acc_filter, .search-Reconciled, .accounts_filter, .account_tags_filter { +.time_range, .category_filter, .search-Target-move,.search-display_account, .partner_filter, .search-Result-Selection, .acccount_type_filter, .journals_filter, .acc_filter, .search-Reconciled, .accounts_filter, .account_tags_filter { float: left; width: auto; } \ No newline at end of file diff --git a/dynamic_accounts_report/static/src/js/trial_balance.js b/dynamic_accounts_report/static/src/js/trial_balance.js index 057260f80..39f15861e 100644 --- a/dynamic_accounts_report/static/src/js/trial_balance.js +++ b/dynamic_accounts_report/static/src/js/trial_balance.js @@ -72,15 +72,11 @@ odoo.define('dynamic_accounts_report.trial_balance', function(require) { ], }).then(function(datas) { - - _.each(datas['report_lines'], function(rep_lines) { rep_lines.debit = self.format_currency(datas['currency'], rep_lines.debit); rep_lines.credit = self.format_currency(datas['currency'], rep_lines.credit); rep_lines.balance = self.format_currency(datas['currency'], rep_lines.balance); - - }); if (initial_render) { self.$('.filter_view_tb').html(QWeb.render('TrialFilterView', { @@ -92,9 +88,9 @@ odoo.define('dynamic_accounts_report.trial_balance', function(require) { self.$el.find('.target_move').select2({ placeholder: 'Target Move...', }); - // self.$el.find('#start_dateee').select2({ - // placeholder: 'Date.', - // }); + self.$el.find('.display_account').select2({ + placeholder: 'Display Accounts...', + }); } var child = []; @@ -263,32 +259,32 @@ odoo.define('dynamic_accounts_report.trial_balance', function(require) { apply_filter: function(event) { - event.preventDefault(); - var self = this; - self.initial_render = false; - var filter_data_selected = {}; - var journal_ids = []; - var journal_text = []; - var journal_res = document.getElementById("journal_res") - var journal_list = $(".journals").select2('data') - - for (var i = 0; i < journal_list.length; i++) { - if (journal_list[i].element[0].selected === true) { - - journal_ids.push(parseInt(journal_list[i].id)) - if (journal_text.includes(journal_list[i].text) === false) { - journal_text.push(journal_list[i].text) - } - journal_res.value = journal_text - journal_res.innerHTML = journal_res.value; - } - } - if (journal_list.length == 0) { - journal_res.value = "" - journal_res.innerHTML = ""; - - } - filter_data_selected.journal_ids = journal_ids + event.preventDefault(); + var self = this; + self.initial_render = false; + var filter_data_selected = {}; + var journal_ids = []; + var journal_text = []; + var journal_res = document.getElementById("journal_res"); + var journal_list = $(".journals").select2('data'); + + for (var i = 0; i < journal_list.length; i++) { + if (journal_list[i].element[0].selected === true) { + journal_ids.push(parseInt(journal_list[i].id)); + if (journal_text.includes(journal_list[i].text) === false) { + journal_text.push(journal_list[i].text); + } + journal_res.value = journal_text; + journal_res.innerHTML = journal_res.value; + } + } + + if (journal_list.length == 0) { + journal_res.value = ""; + journal_res.innerHTML = ""; + } + + filter_data_selected.journal_ids = journal_ids; if (this.$el.find('.datetimepicker-input[name="date_from"]').val()) { filter_data_selected.date_from = moment(this.$el.find('.datetimepicker-input[name="date_from"]').val(), time.getLangDateFormat()).locale('en').format('YYYY-MM-DD'); @@ -318,6 +314,21 @@ odoo.define('dynamic_accounts_report.trial_balance', function(require) { } } + // Display Accounts Filter +// if ($(".display_account").length) { +// var display_account_res = document.getElementById("display_account_res"); +// var display_account_select = $("#display_accounts"); +// var selectedValue = display_account_select.val() || "all"; +// filter_data_selected.display_account = selectedValue; +// display_account_res.innerHTML = selectedValue; +// } + if ($(".display_account").length) { + var display_account_res = document.getElementById("display_account_res"); + var display_account_select = $("#display_accounts"); + var selectedOption = display_account_select.find("option:selected").text(); + filter_data_selected.display_account = display_account_select.val(); + display_account_res.innerHTML = selectedOption; + } rpc.query({ model: 'account.trial.balance', method: 'write', diff --git a/dynamic_accounts_report/static/src/xml/trial_balance_view.xml b/dynamic_accounts_report/static/src/xml/trial_balance_view.xml index 43b3b4237..914a3d1b3 100644 --- a/dynamic_accounts_report/static/src/xml/trial_balance_view.xml +++ b/dynamic_accounts_report/static/src/xml/trial_balance_view.xml @@ -58,7 +58,8 @@
  • - View General Ledger @@ -77,22 +78,22 @@ - + - + - + - + @@ -163,14 +164,14 @@ - + - + @@ -216,93 +217,108 @@

    -
    - - - Date Range - - + - +
    diff --git a/dynamic_accounts_report/wizard/trial_balance.py b/dynamic_accounts_report/wizard/trial_balance.py index 16a6baccf..97f56bdf9 100644 --- a/dynamic_accounts_report/wizard/trial_balance.py +++ b/dynamic_accounts_report/wizard/trial_balance.py @@ -184,7 +184,6 @@ class TrialView(models.TransientModel): return res def _get_accounts(self, accounts, display_account, data): - account_result = {} # Prepare sql query base on selected parameters from wizard tables, where_clause, where_params = self.env['account.move.line']._query_get()