From 02e028cec9f7b79936922fcf10214c2fa6898c9a Mon Sep 17 00:00:00 2001 From: Ajmal Cybro Date: Tue, 11 Jan 2022 17:22:26 +0530 Subject: [PATCH] [IMP] Dynamic report update --- dynamic_accounts_report/__manifest__.py | 2 +- dynamic_accounts_report/doc/RELEASE_NOTES.md | 5 + .../static/src/js/ageing.js | 43 ++++++++- .../static/src/js/cash_flow.js | 53 +++++++++-- .../static/src/js/daybook.js | 55 +++++++++-- .../static/src/js/financial_reports.js | 56 +++++++++-- .../static/src/js/general_ledger.js | 56 +++++++++-- .../static/src/js/partner_ledger.js | 54 +++++++++-- .../static/src/js/trial_balance.js | 54 +++++++++-- .../static/src/xml/ageing.xml | 52 ++++++----- .../static/src/xml/cash_flow_view.xml | 93 +++++++++++-------- .../static/src/xml/daybook.xml | 50 +++++----- .../static/src/xml/financial_reports_view.xml | 91 +++++++++--------- .../static/src/xml/general_ledger_view.xml | 67 +++++++------ .../static/src/xml/partner_ledger_view.xml | 57 +++++++----- .../static/src/xml/trial_balance_view.xml | 66 +++++++------ .../wizard/balance_sheet.py | 5 +- .../wizard/balance_sheet_config.py | 1 - 18 files changed, 605 insertions(+), 255 deletions(-) diff --git a/dynamic_accounts_report/__manifest__.py b/dynamic_accounts_report/__manifest__.py index 38cb46860..b7870b843 100644 --- a/dynamic_accounts_report/__manifest__.py +++ b/dynamic_accounts_report/__manifest__.py @@ -22,7 +22,7 @@ { 'name': 'Dynamic Financial Reports', - 'version': '13.0.1.0.1', + 'version': '13.0.1.0.2', 'category': 'Accounting', 'summary': """Dynamic Financial Reports with drill down and filters– Community Edition""", diff --git a/dynamic_accounts_report/doc/RELEASE_NOTES.md b/dynamic_accounts_report/doc/RELEASE_NOTES.md index a9861982d..927bc5919 100644 --- a/dynamic_accounts_report/doc/RELEASE_NOTES.md +++ b/dynamic_accounts_report/doc/RELEASE_NOTES.md @@ -11,5 +11,10 @@ #### UPDT - Updated +#### 20.12.2021 +#### Version 13.0.1.0.2 +#### 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..b2e338757 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,7 @@ 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 +52,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 +348,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 216c94931..57db392f0 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,7 @@ 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 +48,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; @@ -292,13 +325,21 @@ 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 ($("#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/daybook.js b/dynamic_accounts_report/static/src/js/daybook.js index 11941460c..f0b0e77e2 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,7 @@ 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 +49,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; @@ -344,14 +377,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 e465a2090..c970d7479 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,7 @@ 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 +45,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; @@ -53,6 +86,7 @@ odoo.define('dynamic_accounts_report.financial_reports', function (require) { args: [[this.wizard_id], action_title], }).then(function(datas) { + if (initial_render) { self.$('.filter_view_dfr').html(QWeb.render('DfrFilterView', { filter_data: datas['filters'], @@ -76,6 +110,7 @@ odoo.define('dynamic_accounts_report.financial_reports', function (require) { } var child=[]; + self.$('.table_view_dfr').html(QWeb.render('dfr_table', { report_lines : datas['report_lines'], @@ -86,6 +121,7 @@ odoo.define('dynamic_accounts_report.financial_reports', function (require) { debit_balance : datas['debit_balance'], bs_lines : datas['bs_lines'], })); + }); } catch (el) { @@ -317,13 +353,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 aa6393caa..a449c9dc0 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,7 @@ 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) { @@ -60,6 +64,36 @@ 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; @@ -414,14 +448,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 04be4eac1..38296572f 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,7 @@ 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 +48,36 @@ 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(); @@ -380,13 +414,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 388245b39..9aa5efad5 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,7 @@ 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 +48,36 @@ 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; @@ -223,13 +257,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..886665a7f 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 6781f09cd..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 877cb509d..91c194e23 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..ed9c107d6 100644 --- a/dynamic_accounts_report/static/src/xml/financial_reports_view.xml +++ b/dynamic_accounts_report/static/src/xml/financial_reports_view.xml @@ -65,8 +65,6 @@ - - @@ -117,49 +115,53 @@
-
- -
-
- -
-
-

-
-
+
+
+

+
-

-
-
- - -
+
+ + + Date Range + + +
@@ -249,17 +251,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..83de21772 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 ed3fff88c..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..0f4c1a1ed 100644 --- a/dynamic_accounts_report/wizard/balance_sheet.py +++ b/dynamic_accounts_report/wizard/balance_sheet.py @@ -38,6 +38,7 @@ class BalanceSheetView(models.TransientModel): @api.model def view_report(self, option, tag): + r = self.env['dynamic.balance.sheet.report'].search( [('id', '=', option[0])]) data = { @@ -84,7 +85,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, @@ -161,7 +162,6 @@ class BalanceSheetView(models.TransientModel): parent_list = list(set(parent_list)) final_report_lines = [] - for rec in report_lines_move: if rec['report_type'] != 'accounts': if rec['r_id'] in parent_list: @@ -220,7 +220,6 @@ class BalanceSheetView(models.TransientModel): rec['m_credit'] = "{:,.2f}".format(rec['credit']) + " " + symbol rec['m_balance'] = "{:,.2f}".format( rec['balance']) + " " + symbol - return { 'name': tag, 'type': 'ir.actions.client', diff --git a/dynamic_accounts_report/wizard/balance_sheet_config.py b/dynamic_accounts_report/wizard/balance_sheet_config.py index 6643ad25d..60a8aded7 100644 --- a/dynamic_accounts_report/wizard/balance_sheet_config.py +++ b/dynamic_accounts_report/wizard/balance_sheet_config.py @@ -39,7 +39,6 @@ class BalanceSheet(models.TransientModel): item['level'] = set_report_level(item) data['journal_items'] = journal_items data['report_lines'] = report_lines - return data def _compute_account_balance(self, accounts):