diff --git a/dynamic_accounts_report/__manifest__.py b/dynamic_accounts_report/__manifest__.py index f496af639..82b5e91cf 100644 --- a/dynamic_accounts_report/__manifest__.py +++ b/dynamic_accounts_report/__manifest__.py @@ -22,7 +22,7 @@ { 'name': 'Dynamic Financial Reports', - 'version': '14.0.1.2.3', + 'version': '14.0.1.2.4', 'category': 'Accounting', 'live_test_url': 'https://www.youtube.com/watch?v=gVQi9q9Rs-E&t=5s', 'summary': """Dynamic Financial Reports with drill diff --git a/dynamic_accounts_report/doc/RELEASE_NOTES.md b/dynamic_accounts_report/doc/RELEASE_NOTES.md index 542fe7c95..96db51e9e 100644 --- a/dynamic_accounts_report/doc/RELEASE_NOTES.md +++ b/dynamic_accounts_report/doc/RELEASE_NOTES.md @@ -27,4 +27,7 @@ - Style Issue Updated - +#### 20.12.2021 +#### Version 14.0.1.2.4 +#### UPDT +- Translation issue and Calendar format issue diff --git a/dynamic_accounts_report/static/src/js/ageing.js b/dynamic_accounts_report/static/src/js/ageing.js index c5c2a4128..1276af527 100644 --- a/dynamic_accounts_report/static/src/js/ageing.js +++ b/dynamic_accounts_report/static/src/js/ageing.js @@ -9,6 +9,9 @@ odoo.define('dynamic_accounts_report.ageing', function (require) { var QWeb = core.qweb; var _t = core._t; + var datepicker = require('web.datepicker'); + var time = require('web.time'); + window.click_num = 0; var PartnerAgeing = AbstractAction.extend({ template: 'AgeingTemp', @@ -20,6 +23,8 @@ odoo.define('dynamic_accounts_report.ageing', function (require) { 'click #xlsx': 'print_xlsx', 'click .gl-line': 'show_drop_down', 'click .view-account-move': 'view_acc_move', + 'mousedown div.input-group.date[data-target-input="nearest"]': '_onCalendarIconClick', + }, init: function(parent, action) { @@ -48,6 +53,35 @@ odoo.define('dynamic_accounts_report.ageing', function (require) { }) }, + _onCalendarIconClick: function (ev) { + var $calendarInputGroup = $(ev.currentTarget); + + var calendarOptions = { + + minDate: moment({ y: 1000 }), + maxDate: moment().add(200, 'y'), + calendarWeeks: true, + defaultDate: moment().format(), + sideBySide: true, + buttons: { + showClear: true, + showClose: true, + showToday: true, + }, + + icons : { + date: 'fa fa-calendar', + + }, + locale : moment.locale(), + format : time.getLangDateFormat(), + widgetParent: 'body', + allowInputToggle: true, + }; + + $calendarInputGroup.datetimepicker(calendarOptions); + }, + load_data: function (initial_render = true) { @@ -315,10 +349,14 @@ odoo.define('dynamic_accounts_report.ageing', function (require) { var filter_data_selected = {}; - if ($("#date_from").val()) { - var dateString = $("#date_from").val(); +// if ($("#date_from").val()) { +// var dateString = $("#date_from").val(); +// +// filter_data_selected.date_from= dateString; +// } - filter_data_selected.date_from= dateString; + 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'); } var partner_ids = []; var partner_text = []; diff --git a/dynamic_accounts_report/static/src/js/cash_flow.js b/dynamic_accounts_report/static/src/js/cash_flow.js index 66219aa76..73119ccbb 100644 --- a/dynamic_accounts_report/static/src/js/cash_flow.js +++ b/dynamic_accounts_report/static/src/js/cash_flow.js @@ -9,6 +9,9 @@ odoo.define('dynamic_cash_flow_statements.cash_flow', function (require) { var QWeb = core.qweb; var _t = core._t; + var datepicker = require('web.datepicker'); + var time = require('web.time'); + window.click_num = 0; var CashFlow = AbstractAction.extend({ template: 'CFTemp', @@ -19,6 +22,8 @@ odoo.define('dynamic_cash_flow_statements.cash_flow', function (require) { 'click #pdf': 'print_pdf', 'click #xlsx': 'print_xlsx', 'click .cf-line': 'get_move_lines', + 'mousedown div.input-group.date[data-target-input="nearest"]': '_onCalendarIconClick', + }, init: function(parent, action) { @@ -44,6 +49,35 @@ odoo.define('dynamic_cash_flow_statements.cash_flow', function (require) { }) }, + _onCalendarIconClick: function (ev) { + var $calendarInputGroup = $(ev.currentTarget); + + var calendarOptions = { + + minDate: moment({ y: 1000 }), + maxDate: moment().add(200, 'y'), + calendarWeeks: true, + defaultDate: moment().format(), + sideBySide: true, + buttons: { + showClear: true, + showClose: true, + showToday: true, + }, + + icons : { + date: 'fa fa-calendar', + + }, + locale : moment.locale(), + format : time.getLangDateFormat(), + widgetParent: 'body', + allowInputToggle: true, + }; + + $calendarInputGroup.datetimepicker(calendarOptions); + }, + get_move_lines: function(event) { event.preventDefault(); var self = this; @@ -298,15 +332,24 @@ odoo.define('dynamic_cash_flow_statements.cash_flow', function (require) { } } - if ($("#date_from").val()) { - var dateString = $("#date_from").val(); - filter_data_selected.date_from = dateString; + + 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'); } - if ($("#date_to").val()) { - var dateString = $("#date_to").val(); - filter_data_selected.date_to = dateString; + + if (this.$el.find('.datetimepicker-input[name="date_to"]').val()) { + filter_data_selected.date_to = moment(this.$el.find('.datetimepicker-input[name="date_to"]').val(), time.getLangDateFormat()).locale('en').format('YYYY-MM-DD'); } +// if ($("#date_from").val()) { +// var dateString = $("#date_from").val(); +// filter_data_selected.date_from = dateString; +// } +// if ($("#date_to").val()) { +// var dateString = $("#date_to").val(); +// filter_data_selected.date_to = dateString; +// } + if ($(".target_move").length) { var post_res = document.getElementById("post_res") filter_data_selected.target_move = $(".target_move")[1].value diff --git a/dynamic_accounts_report/static/src/js/daybook.js b/dynamic_accounts_report/static/src/js/daybook.js index 47d98c123..b53dbed77 100644 --- a/dynamic_accounts_report/static/src/js/daybook.js +++ b/dynamic_accounts_report/static/src/js/daybook.js @@ -9,6 +9,9 @@ odoo.define('dynamic_partner_daybook.daybook', function (require) { var QWeb = core.qweb; var _t = core._t; + var datepicker = require('web.datepicker'); + var time = require('web.time'); + window.click_num = 0; var DayBook = AbstractAction.extend({ template: 'DaybookTemp', @@ -20,6 +23,8 @@ odoo.define('dynamic_partner_daybook.daybook', function (require) { 'click #xlsx': 'print_xlsx', 'click .db-line': 'show_drop_down', 'click .view-account-move': 'view_acc_move', + 'mousedown div.input-group.date[data-target-input="nearest"]': '_onCalendarIconClick', + }, init: function(parent, action) { @@ -45,6 +50,35 @@ odoo.define('dynamic_partner_daybook.daybook', function (require) { }) }, + _onCalendarIconClick: function (ev) { + var $calendarInputGroup = $(ev.currentTarget); + + var calendarOptions = { + + minDate: moment({ y: 1000 }), + maxDate: moment().add(200, 'y'), + calendarWeeks: true, + defaultDate: moment().format(), + sideBySide: true, + buttons: { + showClear: true, + showClose: true, + showToday: true, + }, + + icons : { + date: 'fa fa-calendar', + + }, + locale : moment.locale(), + format : time.getLangDateFormat(), + widgetParent: 'body', + allowInputToggle: true, + }; + + $calendarInputGroup.datetimepicker(calendarOptions); + }, + load_data: function (initial_render = true) { var self = this; @@ -347,14 +381,22 @@ odoo.define('dynamic_partner_daybook.daybook', function (require) { } filter_data_selected.journal_ids = journal_ids - if ($("#date_from").val()) { - var dateString = $("#date_from").val(); - - filter_data_selected.date_from = dateString; +// if ($("#date_from").val()) { +// var dateString = $("#date_from").val(); +// +// filter_data_selected.date_from = dateString; +// } +// if ($("#date_to").val()) { +// var dateString = $("#date_to").val(); +// filter_data_selected.date_to = dateString; +// } + + 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'); } - if ($("#date_to").val()) { - var dateString = $("#date_to").val(); - filter_data_selected.date_to = dateString; + + if (this.$el.find('.datetimepicker-input[name="date_to"]').val()) { + filter_data_selected.date_to = moment(this.$el.find('.datetimepicker-input[name="date_to"]').val(), time.getLangDateFormat()).locale('en').format('YYYY-MM-DD'); } if ($(".target_move").length) { diff --git a/dynamic_accounts_report/static/src/js/financial_reports.js b/dynamic_accounts_report/static/src/js/financial_reports.js index 5d79f25b9..28934af6c 100644 --- a/dynamic_accounts_report/static/src/js/financial_reports.js +++ b/dynamic_accounts_report/static/src/js/financial_reports.js @@ -9,6 +9,9 @@ odoo.define('dynamic_accounts_report.financial_reports', function (require) { var QWeb = core.qweb; var _t = core._t; + var datepicker = require('web.datepicker'); + var time = require('web.time'); + window.click_num = 0; var ProfitAndLoss = AbstractAction.extend({ template: 'dfr_template_new', @@ -19,6 +22,8 @@ odoo.define('dynamic_accounts_report.financial_reports', function (require) { 'click #pdf': 'print_pdf', 'click #xlsx': 'print_xlsx', 'click .show-gl': 'show_gl', + 'mousedown div.input-group.date[data-target-input="nearest"]': '_onCalendarIconClick', + }, init: function(parent, action) { @@ -41,6 +46,35 @@ odoo.define('dynamic_accounts_report.financial_reports', function (require) { }) }, + _onCalendarIconClick: function (ev) { + var $calendarInputGroup = $(ev.currentTarget); + + var calendarOptions = { + + minDate: moment({ y: 1000 }), + maxDate: moment().add(200, 'y'), + calendarWeeks: true, + defaultDate: moment().format(), + sideBySide: true, + buttons: { + showClear: true, + showClose: true, + showToday: true, + }, + + icons : { + date: 'fa fa-calendar', + + }, + locale : moment.locale(), + format : time.getLangDateFormat(), + widgetParent: 'body', + allowInputToggle: true, + }; + + $calendarInputGroup.datetimepicker(calendarOptions); + }, + load_data: function (initial_render = true) { var self = this; var action_title = self._title; @@ -320,13 +354,21 @@ odoo.define('dynamic_accounts_report.financial_reports', function (require) { filter_data_selected.analytic_tag_ids = analytic_tag_ids - if ($("#date_from").val()) { - var dateString = $("#date_from").val(); - filter_data_selected.date_from = dateString; +// if ($("#date_from").val()) { +// var dateString = $("#date_from").val(); +// filter_data_selected.date_from = dateString; +// } +// if ($("#date_to").val()) { +// var dateString = $("#date_to").val(); +// filter_data_selected.date_to = dateString; +// } + +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'); } - if ($("#date_to").val()) { - var dateString = $("#date_to").val(); - filter_data_selected.date_to = dateString; + + if (this.$el.find('.datetimepicker-input[name="date_to"]').val()) { + filter_data_selected.date_to = moment(this.$el.find('.datetimepicker-input[name="date_to"]').val(), time.getLangDateFormat()).locale('en').format('YYYY-MM-DD'); } if ($(".target_move").length) { diff --git a/dynamic_accounts_report/static/src/js/general_ledger.js b/dynamic_accounts_report/static/src/js/general_ledger.js index b719a3e74..22a710433 100644 --- a/dynamic_accounts_report/static/src/js/general_ledger.js +++ b/dynamic_accounts_report/static/src/js/general_ledger.js @@ -9,6 +9,9 @@ odoo.define('dynamic_cash_flow_statements.general_ledger', function (require) { var QWeb = core.qweb; var _t = core._t; + var datepicker = require('web.datepicker'); + var time = require('web.time'); + window.click_num = 0; var GeneralLedger = AbstractAction.extend({ template: 'GeneralTemp', @@ -20,6 +23,8 @@ odoo.define('dynamic_cash_flow_statements.general_ledger', function (require) { 'click #xlsx': 'print_xlsx', 'click .gl-line': 'show_drop_down', 'click .view-account-move': 'view_acc_move', + 'mousedown div.input-group.date[data-target-input="nearest"]': '_onCalendarIconClick', + }, init: function(parent, action) { @@ -58,6 +63,35 @@ odoo.define('dynamic_cash_flow_statements.general_ledger', function (require) { } }, + _onCalendarIconClick: function (ev) { + var $calendarInputGroup = $(ev.currentTarget); + + var calendarOptions = { + + minDate: moment({ y: 1000 }), + maxDate: moment().add(200, 'y'), + calendarWeeks: true, + defaultDate: moment().format(), + sideBySide: true, + buttons: { + showClear: true, + showClose: true, + showToday: true, + }, + + icons : { + date: 'fa fa-calendar', + + }, + locale : moment.locale(), + format : time.getLangDateFormat(), + widgetParent: 'body', + allowInputToggle: true, + }; + + $calendarInputGroup.datetimepicker(calendarOptions); + }, + load_data: function (initial_render = true) { var self = this; @@ -415,14 +449,22 @@ odoo.define('dynamic_cash_flow_statements.general_ledger', function (require) { } filter_data_selected.analytic_tag_ids = analytic_tag_ids - if ($("#date_from").val()) { - - var dateString = $("#date_from").val(); - filter_data_selected.date_from = dateString; +// if ($("#date_from").val()) { +// +// var dateString = $("#date_from").val(); +// filter_data_selected.date_from = dateString; +// } +// if ($("#date_to").val()) { +// var dateString = $("#date_to").val(); +// filter_data_selected.date_to = dateString; +// } + + if (this.$el.find('.datetimepicker-input[name="gen_date_from"]').val()) { + filter_data_selected.date_from = moment(this.$el.find('.datetimepicker-input[name="gen_date_from"]').val(), time.getLangDateFormat()).locale('en').format('YYYY-MM-DD'); } - if ($("#date_to").val()) { - var dateString = $("#date_to").val(); - filter_data_selected.date_to = dateString; + + if (this.$el.find('.datetimepicker-input[name="gen_date_to"]').val()) { + filter_data_selected.date_to = moment(this.$el.find('.datetimepicker-input[name="gen_date_to"]').val(), time.getLangDateFormat()).locale('en').format('YYYY-MM-DD'); } if ($(".target_move").length) { diff --git a/dynamic_accounts_report/static/src/js/partner_ledger.js b/dynamic_accounts_report/static/src/js/partner_ledger.js index ba78c48eb..6771919bb 100644 --- a/dynamic_accounts_report/static/src/js/partner_ledger.js +++ b/dynamic_accounts_report/static/src/js/partner_ledger.js @@ -9,6 +9,9 @@ odoo.define('dynamic_accounts_report.partner_ledger', function (require) { var QWeb = core.qweb; var _t = core._t; + var datepicker = require('web.datepicker'); + var time = require('web.time'); + window.click_num = 0; var PartnerLedger = AbstractAction.extend({ template: 'PartnerTemp', @@ -20,6 +23,8 @@ odoo.define('dynamic_accounts_report.partner_ledger', function (require) { 'click #xlsx': 'print_xlsx', 'click .pl-line': 'show_drop_down', 'click .view-account-move': 'view_acc_move', + 'mousedown div.input-group.date[data-target-input="nearest"]': '_onCalendarIconClick', + }, @@ -44,6 +49,35 @@ odoo.define('dynamic_accounts_report.partner_ledger', function (require) { }) }, + _onCalendarIconClick: function (ev) { + var $calendarInputGroup = $(ev.currentTarget); + + var calendarOptions = { + + minDate: moment({ y: 1000 }), + maxDate: moment().add(200, 'y'), + calendarWeeks: true, + defaultDate: moment().format(), + sideBySide: true, + buttons: { + showClear: true, + showClose: true, + showToday: true, + }, + + icons : { + date: 'fa fa-calendar', + + }, + locale : moment.locale(), + format : time.getLangDateFormat(), + widgetParent: 'body', + allowInputToggle: true, + }; + + $calendarInputGroup.datetimepicker(calendarOptions); + }, + load_data: function (initial_render = true) { var self = this; self.$(".categ").empty(); @@ -383,13 +417,21 @@ odoo.define('dynamic_accounts_report.partner_ledger', function (require) { } filter_data_selected.partner_category_ids = partner_category_ids - if ($("#date_from").val()) { - var dateString = $("#date_from").val(); - filter_data_selected.date_from = dateString; +// if ($("#date_from").val()) { +// var dateString = $("#date_from").val(); +// filter_data_selected.date_from = dateString; +// } +// if ($("#date_to").val()) { +// var dateString = $("#date_to").val(); +// filter_data_selected.date_to = dateString; +// } + +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'); } - if ($("#date_to").val()) { - var dateString = $("#date_to").val(); - filter_data_selected.date_to = dateString; + + if (this.$el.find('.datetimepicker-input[name="date_to"]').val()) { + filter_data_selected.date_to = moment(this.$el.find('.datetimepicker-input[name="date_to"]').val(), time.getLangDateFormat()).locale('en').format('YYYY-MM-DD'); } if ($(".reconciled").length){ diff --git a/dynamic_accounts_report/static/src/js/trial_balance.js b/dynamic_accounts_report/static/src/js/trial_balance.js index 6d2144517..efb3b09ba 100644 --- a/dynamic_accounts_report/static/src/js/trial_balance.js +++ b/dynamic_accounts_report/static/src/js/trial_balance.js @@ -9,6 +9,9 @@ odoo.define('dynamic_cash_flow_statements.trial', function (require) { var QWeb = core.qweb; var _t = core._t; + var datepicker = require('web.datepicker'); + var time = require('web.time'); + window.click_num = 0; var TrialBalance = AbstractAction.extend({ template: 'TrialTemp', @@ -19,6 +22,8 @@ odoo.define('dynamic_cash_flow_statements.trial', function (require) { 'click #pdf': 'print_pdf', 'click #xlsx': 'print_xlsx', 'click .show-gl': 'show_gl', + 'mousedown div.input-group.date[data-target-input="nearest"]': '_onCalendarIconClick', + }, init: function(parent, action) { @@ -44,6 +49,35 @@ odoo.define('dynamic_cash_flow_statements.trial', function (require) { }) }, + _onCalendarIconClick: function (ev) { + var $calendarInputGroup = $(ev.currentTarget); + + var calendarOptions = { + +// minDate: moment({ y: 1000 }), +// maxDate: moment().add(200, 'y'), +// calendarWeeks: true, +// defaultDate: moment().format(), +// sideBySide: true, +// buttons: { +// showClear: true, +// showClose: true, +// showToday: true, +// }, + + icons : { + date: 'fa fa-calendar', + + }, + locale : moment.locale(), + format : time.getLangDateFormat(), + widgetParent: 'body', + allowInputToggle: true, + }; + + $calendarInputGroup.datetimepicker(calendarOptions); + }, + load_data: function (initial_render = true) { var self = this; @@ -226,13 +260,21 @@ odoo.define('dynamic_cash_flow_statements.trial', function (require) { } filter_data_selected.journal_ids = journal_ids - if ($("#date_from").val()) { - var dateString = $("#date_from").val(); - filter_data_selected.date_from = dateString; +// if ($("#date_from").val()) { +// var dateString = $("#date_from").val(); +// filter_data_selected.date_from = dateString; +// } +// if ($("#date_to").val()) { +// var dateString = $("#date_to").val(); +// filter_data_selected.date_to = dateString; +// } + +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'); } - if ($("#date_to").val()) { - var dateString = $("#date_to").val(); - filter_data_selected.date_to = dateString; + + if (this.$el.find('.datetimepicker-input[name="date_to"]').val()) { + filter_data_selected.date_to = moment(this.$el.find('.datetimepicker-input[name="date_to"]').val(), time.getLangDateFormat()).locale('en').format('YYYY-MM-DD'); } if ($(".target_move").length) { diff --git a/dynamic_accounts_report/static/src/xml/ageing.xml b/dynamic_accounts_report/static/src/xml/ageing.xml index aa63e8800..34c248bbc 100644 --- a/dynamic_accounts_report/static/src/xml/ageing.xml +++ b/dynamic_accounts_report/static/src/xml/ageing.xml @@ -219,38 +219,41 @@ -
-
+
+


-
-
+
-

-
- - As On Date + As on Date -
+
+ -
-
- +
+ + + -
diff --git a/dynamic_accounts_report/static/src/xml/cash_flow_view.xml b/dynamic_accounts_report/static/src/xml/cash_flow_view.xml index 33a3549b6..dbfd049f9 100644 --- a/dynamic_accounts_report/static/src/xml/cash_flow_view.xml +++ b/dynamic_accounts_report/static/src/xml/cash_flow_view.xml @@ -139,41 +139,53 @@ -
-
-
- - -
-
-

-
-
- -

-
-
- - -
+
+
+
+ + +
+
+

+
+ +
+ + + Date Range + + +
@@ -202,15 +214,16 @@ Level:
+
+ +
-
-
-
- + + + -
diff --git a/dynamic_accounts_report/static/src/xml/daybook.xml b/dynamic_accounts_report/static/src/xml/daybook.xml index 653d345ab..8a47be170 100644 --- a/dynamic_accounts_report/static/src/xml/daybook.xml +++ b/dynamic_accounts_report/static/src/xml/daybook.xml @@ -111,45 +111,50 @@ -
-
+
+


-
+
-
- -

-
- Date Range
+ + + +
diff --git a/dynamic_accounts_report/static/src/xml/financial_reports_view.xml b/dynamic_accounts_report/static/src/xml/financial_reports_view.xml index 80997ea69..81145ba90 100644 --- a/dynamic_accounts_report/static/src/xml/financial_reports_view.xml +++ b/dynamic_accounts_report/static/src/xml/financial_reports_view.xml @@ -117,49 +117,53 @@
-
- -
-
- -
-
-

-
-
+
+
+

+
-

-
-
- - -
+
+ + + Date Range + + +
@@ -249,17 +253,18 @@ Target Move:
-
- -
-
+
+ + + +
diff --git a/dynamic_accounts_report/static/src/xml/general_ledger_view.xml b/dynamic_accounts_report/static/src/xml/general_ledger_view.xml index 7a5c582d6..4a5856a98 100644 --- a/dynamic_accounts_report/static/src/xml/general_ledger_view.xml +++ b/dynamic_accounts_report/static/src/xml/general_ledger_view.xml @@ -134,47 +134,54 @@
-
-
+
+


-
-
+
-

-
- Date Range + +
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 db244e56f..05a60216b 100644 --- a/dynamic_accounts_report/static/src/xml/partner_ledger_view.xml +++ b/dynamic_accounts_report/static/src/xml/partner_ledger_view.xml @@ -91,44 +91,50 @@ -
-
+
+


-
-
+
-

-
- Date Range
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 76869be2a..1896d7580 100644 --- a/dynamic_accounts_report/static/src/xml/trial_balance_view.xml +++ b/dynamic_accounts_report/static/src/xml/trial_balance_view.xml @@ -196,45 +196,53 @@ - -
-
+
+


-
-
+
-

-
- Date Range
diff --git a/dynamic_accounts_report/wizard/balance_sheet.py b/dynamic_accounts_report/wizard/balance_sheet.py index ac129752e..038c3face 100644 --- a/dynamic_accounts_report/wizard/balance_sheet.py +++ b/dynamic_accounts_report/wizard/balance_sheet.py @@ -84,7 +84,7 @@ class BalanceSheetView(models.TransientModel): new_records = list(filter(filter_code, records['Accounts'])) records['Accounts'] = new_records - account_report_id = self.env['account.financial.report'].search([ + account_report_id = self.env['account.financial.report'].with_context(lang='en_US').search([ ('name', 'ilike', tag)]) new_data = {'id': self.id, 'date_from': False,