From d43307f106252a400cb84c2417e35359bb90f57f Mon Sep 17 00:00:00 2001
From: Ajmal Cybro <ajmal@cybrosys.in>
Date: Tue, 11 Jan 2022 17:34:44 +0530
Subject: [PATCH] [IMP] Dynamic report update

---
 dynamic_accounts_report/__manifest__.py       |  2 +-
 dynamic_accounts_report/doc/RELEASE_NOTES.md  |  4 +
 .../report/trial_balance.xml                  | 10 +-
 .../static/src/css/report.css                 |  3 +-
 .../static/src/js/ageing.js                   | 44 ++++++++-
 .../static/src/js/cash_flow.js                | 52 +++++++++--
 .../static/src/js/daybook.js                  | 55 +++++++++--
 .../static/src/js/financial_reports.js        | 53 +++++++++--
 .../static/src/js/general_ledger.js           | 56 +++++++++--
 .../static/src/js/partner_ledger.js           | 53 +++++++++--
 .../static/src/js/trial_balance.js            | 67 +++++++++++--
 .../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 | 89 +++++++++---------
 .../static/src/xml/general_ledger_view.xml    | 67 +++++++------
 .../static/src/xml/partner_ledger_view.xml    | 57 +++++++-----
 .../static/src/xml/trial_balance_view.xml     | 64 +++++++------
 dynamic_accounts_report/views/kit_menus.xml   | 48 +++++-----
 .../wizard/balance_sheet_config.py            |  2 +
 .../wizard/trial_balance.py                   |  2 +
 21 files changed, 646 insertions(+), 277 deletions(-)

diff --git a/dynamic_accounts_report/__manifest__.py b/dynamic_accounts_report/__manifest__.py
index 74dcc3e3b..e6b61ad24 100644
--- a/dynamic_accounts_report/__manifest__.py
+++ b/dynamic_accounts_report/__manifest__.py
@@ -22,7 +22,7 @@
 
 {
     'name': 'Dynamic Financial Reports',
-    'version': '15.0.1.0.0',
+    'version': '15.0.1.0.1',
     '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 b26671140..6367f1b1f 100644
--- a/dynamic_accounts_report/doc/RELEASE_NOTES.md
+++ b/dynamic_accounts_report/doc/RELEASE_NOTES.md
@@ -7,3 +7,7 @@
 
 
 
+#### 20.12.2021
+#### Version 15.0.1.0.1
+#### UPDT
+- Translation issue and Calendar format issue
\ No newline at end of file
diff --git a/dynamic_accounts_report/report/trial_balance.xml b/dynamic_accounts_report/report/trial_balance.xml
index b021220ac..9a93033f7 100644
--- a/dynamic_accounts_report/report/trial_balance.xml
+++ b/dynamic_accounts_report/report/trial_balance.xml
@@ -1,8 +1,14 @@
 <odoo>
 
-
-
     <template id="dynamic_accounts_report.trial_balance">
+<!--    <t t-call="web.html_container">-->
+<!--        <t t-foreach="docs" t-as="doc">-->
+            <t t-call="dynamic_accounts_report.trial_balance1" t-lang="request.env.user.lang"/>
+<!--        </t>-->
+<!--    </t>-->
+</template>
+
+    <template id="dynamic_accounts_report.trial_balance1">
         <t t-call="web.html_container">
             <t t-call="web.internal_layout">
                 <div class="page">
diff --git a/dynamic_accounts_report/static/src/css/report.css b/dynamic_accounts_report/static/src/css/report.css
index a1f6e984c..3f2c97e44 100644
--- a/dynamic_accounts_report/static/src/css/report.css
+++ b/dynamic_accounts_report/static/src/css/report.css
@@ -6,4 +6,5 @@ text-align: right;
 .cf_fld{
 text-align: right;
 width: 300px !important;
-}
\ No newline at end of file
+}
+
diff --git a/dynamic_accounts_report/static/src/js/ageing.js b/dynamic_accounts_report/static/src/js/ageing.js
index 195b7b4fb..d8abb992a 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) {
 
@@ -316,11 +349,14 @@ odoo.define('dynamic_accounts_report.ageing', function (require) {
 
             var filter_data_selected = {};
 
-            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');
             }
+
+
+
+
+
             var partner_ids = [];
             var partner_text = [];
             var span_res = document.getElementById("partner_res")
diff --git a/dynamic_accounts_report/static/src/js/cash_flow.js b/dynamic_accounts_report/static/src/js/cash_flow.js
index 4e9cba889..8ab61cd16 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) {
@@ -43,6 +47,34 @@ odoo.define('dynamic_cash_flow_statements.cash_flow', function (require) {
                 self.load_data(self.initial_render);
             })
         },
+        _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();
@@ -299,13 +331,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 e292c9de5..5aee52962 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;
@@ -348,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 bf30549ab..b43395a46 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;
@@ -321,13 +354,20 @@ 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) {
@@ -340,6 +380,7 @@ odoo.define('dynamic_accounts_report.financial_reports', function (require) {
 
                   }
             }
+
             rpc.query({
                 model: 'dynamic.balance.sheet.report',
                 method: 'write',
diff --git a/dynamic_accounts_report/static/src/js/general_ledger.js b/dynamic_accounts_report/static/src/js/general_ledger.js
index 292a734ae..75c6d0c9f 100644
--- a/dynamic_accounts_report/static/src/js/general_ledger.js
+++ b/dynamic_accounts_report/static/src/js/general_ledger.js
@@ -10,6 +10,9 @@ odoo.define('dynamic_accounts_report.general_ledger', function (require) {
     var _t = core._t;
     var trial = require('dynamic_accounts_report.trial_balance');
 
+    var datepicker = require('web.datepicker');
+    var time = require('web.time');
+
     window.click_num = 0;
     var GeneralLedger = AbstractAction.extend({
     template: 'GeneralTemp',
@@ -21,6 +24,7 @@ odoo.define('dynamic_accounts_report.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_accounts_report.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;
                 self.$(".categ").empty();
@@ -422,14 +456,22 @@ odoo.define('dynamic_accounts_report.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 a72ca44ee..574c20720 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,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();
@@ -384,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 b31c3ff22..a3cd51bb9 100644
--- a/dynamic_accounts_report/static/src/js/trial_balance.js
+++ b/dynamic_accounts_report/static/src/js/trial_balance.js
@@ -6,10 +6,15 @@ odoo.define('dynamic_accounts_report.trial_balance', function (require) {
     var rpc = require('web.rpc');
     var session = require('web.session');
     var utils = require('web.utils');
+
     var QWeb = core.qweb;
     var _t = core._t;
     var framework = require('web.framework');
 
+
+    var datepicker = require('web.datepicker');
+    var time = require('web.time');
+
 //    import framework from 'web.framework';
 //    import { download } from "@web/core/network/download";
 
@@ -27,6 +32,7 @@ odoo.define('dynamic_accounts_report.trial_balance', 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) {
@@ -63,6 +69,9 @@ odoo.define('dynamic_accounts_report.trial_balance', function (require) {
                         method: 'view_report',
                         args: [[this.wizard_id]],
                     }).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);
@@ -81,6 +90,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.',
+//                                    });
                             }
                             var child=[];
 
@@ -92,6 +104,7 @@ odoo.define('dynamic_accounts_report.trial_balance', function (require) {
                                             credit_total : self.format_currency(datas['currency'],datas['debit_total']),
                                             debit_total : self.format_currency(datas['currency'],datas['debit_total']),
                                         }));
+
                 });
 
                     }
@@ -150,6 +163,36 @@ odoo.define('dynamic_accounts_report.trial_balance', 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);
+    },
+
+
 
         format_currency: function(currency, amount) {
             if (typeof(amount) != 'number') {
@@ -222,6 +265,9 @@ odoo.define('dynamic_accounts_report.trial_balance', function (require) {
             var self = this;
             self.initial_render = false;
 
+
+
+
             var filter_data_selected = {};
              var journal_ids = [];
             var journal_text = [];
@@ -246,14 +292,23 @@ odoo.define('dynamic_accounts_report.trial_balance', 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 (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")
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 @@
 
 
     <t t-name="AgeingFilterView">
-        <div class="" style="position: relative;">
-            <div class="sub_container_left">
+        <div class="row" style="margin-right: 10px; margin-left: 10px;">
+            <div class="sub_container_left" style="width:70%;">
                 <div class="report_print">
                     <button type="button" class="btn btn-primary" id="pdf"
-                            style="left:10px; height:30px;position: relative;color:white;background-color: #00A0AD;border-color: #00A0AD; padding:3px;">
+                            style="position: relative;height:30px;color:white;background-color: #00A0AD;border-color: #00A0AD; padding:3px;">
                         Print (PDF)
                     </button>
                     <button type="button" class="btn btn-primary" id="xlsx"
-                            style="left:10px; height:30px;position: relative;color:white;background-color: #00A0AD;border-color: #00A0AD; padding:3px;">
+                            style="position: relative;height:30px;color:white;background-color: #00A0AD;border-color: #00A0AD; padding:3px;">
                         Export (XLSX)
                     </button>
                 </div>
             </div>
             <br></br>
-            <div class="sub_container_right" style="width:50%;height:3%;right:0px;top:0px;position: absolute;">
-                <div class="" style="right:80x;">
+            <div class="sub_container_right row" style="width:30%;height:3%;top:0px;position: relative;">
 
-                    <br></br>
-                    <div class="row" style="right:100px;top:0px;position: absolute;width:50;">
                         <div class="time_range" style="">
-                            <a type="button" class="dropdown-toggle" data-toggle="dropdown" aria-expanded="false">
+                            <a type="button" class="dropdown-toggle" data-toggle="dropdown" >
                                 <span class="fa fa-calendar" title="Dates" role="img" aria-label="Dates"></span>
-                                As On Date
+                                As on Date
                             </a>
                             <div class="dropdown-menu" role="menu">
-                                <div class="">
-                                    <label class="" for="date_from">As On Date :</label>
-                                    <div class="">
-                                        <div class="" aria-atomic="true" id="">
-                                            <input type="date" id="date_from"></input>
+                                <div class="form-group">
+                                    <label class="" for="date_from">As on Date :</label>
+                                        <div class="input-group date" id="date_from" data-target-input="nearest">
+                                            <input type="text" name="date_from" class="form-control datetimepicker-input" data-target="#date_from" t-att-name="prefix"/>
+                                            <div class="input-group-append" data-target="#date_from" data-toggle="datetimepicker">
+                                                <span class="input-group-text">
+                                                    <span class="fa fa-calendar" role="img" aria-label="Calendar"></span>
+                                                </span>
+                                            </div>
                                         </div>
-                                    </div>
+
+
+
                                 </div>
                             </div>
                         </div>
@@ -314,16 +317,17 @@
                             </select>
                             <span id="post_res"></span>
                         </div>
-                    </div>
+                        <div style="">
+                            <button type="button" id="apply_filter" class="btn btn-primary"
+                                    style="top:0px;height:30px;color:white;background-color: #00A0AD;border-color: #00A0AD;">
+                                Apply
+                            </button>
 
-                </div>
-                <div style="">
-                    <button type="button" id="apply_filter" class="btn btn-primary"
-                            style="top:0px;height:30px;right:20px;position: absolute;color:white;background-color: #00A0AD;border-color: #00A0AD;">
-                        Apply
-                    </button>
+                        </div>
+<!--                    </div>-->
+
+<!--                </div>-->
 
-                </div>
             </div>
         </div>
     </t>
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 00b447d15..f086d847d 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 @@
 
     <t t-name="CashFilterView">
 
-		<div class="" style="position: relative;">
-			<div class="sub_container_left">
-				<div class="report_print">
-					<button type="button" class="btn btn-primary" id="pdf" style="left:10px; height:30px;position: relative;color:white;background-color: #00A0AD;border-color: #00A0AD; padding:3px;">Print (PDF)</button>
-					<button type="button" class="btn btn-primary" id="xlsx" style="left:10px; height:30px;position: relative;color:white;background-color: #00A0AD;border-color: #00A0AD; padding:3px;">Export (XLSX)</button>
-				</div>
-			</div>
-			<br></br>
-			<div class="sub_container_right" style="width:50%;height:3%;right:0px;top:0px;position: absolute;">
-				<div class="" style="right:80x;">
-
-					<br></br>
-					<div class="row" style="right:110px;top:0px;position: absolute;width:50;">
-						<div class="time_range" style="">
-						<a type="button" class="dropdown-toggle" data-toggle="dropdown" aria-expanded="false">
-							<span class="fa fa-calendar" title="Dates" role="img" aria-label="Dates"></span>
-Date Range
-						</a>
-						<div class="dropdown-menu" role="menu">
-							<div class="" >
-								<label class="" for="date_from">Start Date :</label>
-								<div class="">
-									<div class="" aria-atomic="true" id="" >
-										<input type="date" id="date_from"></input>
-									</div>
-								</div>
-								<label class="" for="date_to">End Date :</label>
-								<div class="">
-									<div class="" aria-atomic="true" id="" >
-										<input type="date" id="date_to"></input>
-									</div>
-								</div>
-							</div>
-						</div>
-					</div>
+		<div class="row" style="margin-right: 10px; margin-left: 10px;">
+            <div class="sub_container_left" style="width:70%;">
+                <div class="report_print">
+                    <button type="button" class="btn btn-primary" id="pdf"
+                            style="position: relative;height:30px;color:white;background-color: #00A0AD;border-color: #00A0AD; padding:3px;">
+                        Print (PDF)
+                    </button>
+                    <button type="button" class="btn btn-primary" id="xlsx"
+                            style="position: relative;height:30px;color:white;background-color: #00A0AD;border-color: #00A0AD; padding:3px;">
+                        Export (XLSX)
+                    </button>
+                </div>
+            </div>
+            <br></br>
+            <div class="sub_container_right row" style="width:30%;height:3%;top:0px;position: relative;">
+
+                        <div class="time_range" style="">
+                            <a type="button" class="dropdown-toggle" data-toggle="dropdown" >
+                                <span class="fa fa-calendar" title="Dates" role="img" aria-label="Dates"></span>
+                                Date Range
+                            </a>
+                            <div class="dropdown-menu" role="menu">
+                                <div class="form-group">
+                                    <label class="" for="date_from">Start Date :</label>
+                                        <div class="input-group date" id="date_from" data-target-input="nearest">
+                                            <input type="text" name="date_from" class="form-control datetimepicker-input" data-target="#date_from" t-att-name="prefix"/>
+                                            <div class="input-group-append" data-target="#date_from" data-toggle="datetimepicker">
+                                                <span class="input-group-text">
+                                                    <span class="fa fa-calendar" role="img" aria-label="Calendar"></span>
+                                                </span>
+                                            </div>
+                                        </div>
+
+                                    <label class="" for="date_to">End Date :</label>
+                                    <div class="input-group date" id="date_to" data-target-input="nearest">
+
+                                        <input type="text" name="date_to" class="form-control datetimepicker-input" data-target="#date_to" t-att-name="prefix"/>
+                                        <div class="input-group-append" data-target="#date_to" data-toggle="datetimepicker">
+                                            <span class="input-group-text">
+                                                <span class="fa fa-calendar" role="img" aria-label="Calendar"></span>
+                                            </span>
+                                        </div>
+                                    </div>
+
+                                </div>
+                            </div>
+                        </div>
 
 
 					<div class="search-Target-move" style="">
@@ -202,15 +214,16 @@ Level:
 						</select>
 						<span id="level_res"> </span>
 					</div>
+				<div style="">
+						<button type="button" id="apply_filter" class="btn btn-primary" style="top:0px;height:30px;color:white;background-color: #00A0AD;border-color: #00A0AD;">Apply</button>
 
+				</div>
 
-					</div>
 
-				</div>
-				<div style="">
-						<button type="button" id="apply_filter" class="btn btn-primary" style="top:0px;height:30px;right:20px;position: absolute;color:white;background-color: #00A0AD;border-color: #00A0AD;">Apply</button>
+<!--					</div>-->
+
+<!--				</div>-->
 
-				</div>
 			</div>
 		</div>
 	</t>
diff --git a/dynamic_accounts_report/static/src/xml/daybook.xml b/dynamic_accounts_report/static/src/xml/daybook.xml
index 0501d3e8a..af70e32a7 100644
--- a/dynamic_accounts_report/static/src/xml/daybook.xml
+++ b/dynamic_accounts_report/static/src/xml/daybook.xml
@@ -111,45 +111,50 @@
 
 
     <t t-name="DayFilterView">
-        <div class="" style="position: relative;">
-            <div class="sub_container_left">
+       <div class="row" style="margin-right: 10px; margin-left: 10px;">
+            <div class="sub_container_left" style="width:70%;">
                 <div class="report_print">
                     <button type="button" class="btn btn-primary" id="pdf"
-                            style="left:10px; height:30px;position: relative;color:white;background-color: #00A0AD;border-color: #00A0AD; padding:3px;">
+                            style="position: relative;height:30px;color:white;background-color: #00A0AD;border-color: #00A0AD; padding:3px;">
                         Print (PDF)
                     </button>
                     <button type="button" class="btn btn-primary" id="xlsx"
-                            style="left:10px; height:30px;position: relative;color:white;background-color: #00A0AD;border-color: #00A0AD; padding:3px;">
+                            style="position: relative;height:30px;color:white;background-color: #00A0AD;border-color: #00A0AD; padding:3px;">
                         Export (XLSX)
                     </button>
                 </div>
             </div>
             <br></br>
-            <div class="sub_container_right" style="width:50%;height:3%;right:0px;top:0px;position: absolute;">
+            <div class="sub_container_right row" style="width:30%;height:3%;top:0px;position: relative;">
 
-                <div class="" style="right:80x;">
-
-                    <br></br>
-                    <div class="row" style="right:100px;top:0px;position: absolute;width:50;">
                         <div class="time_range" style="">
-                            <a type="button" class="dropdown-toggle" data-toggle="dropdown" aria-expanded="false">
+                            <a type="button" class="dropdown-toggle" data-toggle="dropdown" >
                                 <span class="fa fa-calendar" title="Dates" role="img" aria-label="Dates"></span>
                                 Date Range
                             </a>
                             <div class="dropdown-menu" role="menu">
-                                <div class="">
+                                <div class="form-group">
                                     <label class="" for="date_from">Start Date :</label>
-                                    <div class="">
-                                        <div class="" aria-atomic="true" id="">
-                                            <input type="date" id="date_from"></input>
+                                        <div class="input-group date" id="date_from" data-target-input="nearest">
+                                            <input type="text" name="date_from" class="form-control datetimepicker-input" data-target="#date_from" t-att-name="prefix"/>
+                                            <div class="input-group-append" data-target="#date_from" data-toggle="datetimepicker">
+                                                <span class="input-group-text">
+                                                    <span class="fa fa-calendar" role="img" aria-label="Calendar"></span>
+                                                </span>
+                                            </div>
                                         </div>
-                                    </div>
+
                                     <label class="" for="date_to">End Date :</label>
-                                    <div class="">
-                                        <div class="" aria-atomic="true" id="">
-                                            <input type="date" id="date_to"></input>
+                                    <div class="input-group date" id="date_to" data-target-input="nearest">
+
+                                        <input type="text" name="date_to" class="form-control datetimepicker-input" data-target="#date_to" t-att-name="prefix"/>
+                                        <div class="input-group-append" data-target="#date_to" data-toggle="datetimepicker">
+                                            <span class="input-group-text">
+                                                <span class="fa fa-calendar" role="img" aria-label="Calendar"></span>
+                                            </span>
                                         </div>
                                     </div>
+
                                 </div>
                             </div>
                         </div>
@@ -196,16 +201,17 @@
                             </select>
                             <span id="post_res"></span>
                         </div>
-                    </div>
-
-                </div>
                 <div style="">
                     <button type="button" id="apply_filter" class="btn btn-primary"
-                            style="top:0px;height:30px;right:20px;position: absolute;color:white;background-color: #00A0AD;border-color: #00A0AD;">
+                            style="top:0px;height:30px;color:white;background-color: #00A0AD;border-color: #00A0AD;">
                         Apply
                     </button>
 
                 </div>
+<!--                    </div>-->
+
+<!--                </div>-->
+
             </div>
         </div>
     </t>
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 6c329f135..3b2849039 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 @@
 				</h1>
 
 		</div>
-		<div class="" style="position: relative;">
-
-			<div class="sub_container_left">
-				<div class="report_print">
-					<button type="button" class="btn btn-primary" id="pdf"
-                            style="left:10px; height:30px;position: relative;color:white;background-color: #00A0AD;border-color: #00A0AD;
-									padding:3px;">
+		<div class="row" style="margin-right: 10px; margin-left: 10px;">
+            <div class="sub_container_left" style="width:70%;">
+                <div class="report_print">
+                    <button type="button" class="btn btn-primary" id="pdf"
+                            style="position: relative;height:30px;color:white;background-color: #00A0AD;border-color: #00A0AD; padding:3px;">
                         Print (PDF)
                     </button>
                     <button type="button" class="btn btn-primary" id="xlsx"
-                            style="left:20px; height:30px;position: relative;color:white;background-color: #00A0AD;border-color: #00A0AD;">
+                            style="position: relative;height:30px;color:white;background-color: #00A0AD;border-color: #00A0AD; padding:3px;">
                         Export (XLSX)
                     </button>
-				</div>
-			</div>
-			<br></br>
-			<div class="sub_container_right" style="width:50%;height:3%;right:0px;top:0px;position: absolute;">
-				<div class="" style="right:80x;">
+                </div>
+            </div>
+            <br></br>
+            <div class="sub_container_right row" style="width:30%;height:3%;top:0px;position: relative;">
 
-					<br></br>
-					<div class="row" style="right:80px;top:0px;position: absolute;width:50;">
-						<div class="time_range" style="">
-						<a type="button" class="dropdown-toggle" data-toggle="dropdown" aria-expanded="false">
-							<span class="fa fa-calendar" title="Dates" role="img" aria-label="Dates"></span>
-Date Range
-						</a>
-						<div class="dropdown-menu" role="menu">
-							<div class="" >
-								<label class="" for="date_from">Start Date :</label>
-								<div class="">
-									<div class="" aria-atomic="true" id="" >
-										<input type="date" id="date_from"></input>
-									</div>
-								</div>
-								<label class="" for="date_to">End Date :</label>
-								<div class="">
-									<div class="" aria-atomic="true" id="" >
-										<input type="date" id="date_to"></input>
-									</div>
-								</div>
-							</div>
-						</div>
-					</div>
+                        <div class="time_range" style="">
+                            <a type="button" class="dropdown-toggle" data-toggle="dropdown" >
+                                <span class="fa fa-calendar" title="Dates" role="img" aria-label="Dates"></span>
+                                Date Range
+                            </a>
+                            <div class="dropdown-menu" role="menu">
+                                <div class="form-group">
+                                    <label class="" for="date_from">Start Date :</label>
+                                        <div class="input-group date" id="date_from" data-target-input="nearest">
+                                            <input type="text" name="date_from" class="form-control datetimepicker-input" data-target="#date_from" t-att-name="prefix"/>
+                                            <div class="input-group-append" data-target="#date_from" data-toggle="datetimepicker">
+                                                <span class="input-group-text">
+                                                    <span class="fa fa-calendar" role="img" aria-label="Calendar"></span>
+                                                </span>
+                                            </div>
+                                        </div>
+
+                                    <label class="" for="date_to">End Date :</label>
+                                    <div class="input-group date" id="date_to" data-target-input="nearest">
+
+                                        <input type="text" name="date_to" class="form-control datetimepicker-input" data-target="#date_to" t-att-name="prefix"/>
+                                        <div class="input-group-append" data-target="#date_to" data-toggle="datetimepicker">
+                                            <span class="input-group-text">
+                                                <span class="fa fa-calendar" role="img" aria-label="Calendar"></span>
+                                            </span>
+                                        </div>
+                                    </div>
+
+                                </div>
+                            </div>
+                        </div>
 					<div class="journals_filter" style="">
 						<a type="button" class="dropdown-toggle" data-toggle="dropdown">
 							<span class="fa fa-book"></span>
@@ -249,17 +253,18 @@ Target Move:
 						</select>
 						<span id="post_res"></span>
 					</div>
-					</div>
-
-				</div>
 				<div style="">
                     <button type="button" id="apply_filter" class="btn btn-primary"
-                            style="top:0px;height:30px;right:20px;position: absolute;color:white;background-color: #00A0AD;border-color: #00A0AD;">
+                            style="top:0px;height:30px;color:white;background-color: #00A0AD;border-color: #00A0AD;">
                         Apply
                     </button>
 
                 </div>
-			</div>
+					</div>
+
+<!--				</div>-->
+<!--				-->
+<!--			</div>-->
 		</div>
 	</t>
 
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 77e130fe2..4c5635cb5 100644
--- a/dynamic_accounts_report/static/src/xml/general_ledger_view.xml
+++ b/dynamic_accounts_report/static/src/xml/general_ledger_view.xml
@@ -129,44 +129,50 @@
                 </h1>
 
             </div>
-        <div class="" style="position: relative;">
-            <div class="sub_container_left">
+       <div class="row" style="margin-right: 10px; margin-left: 10px;">
+            <div class="sub_container_left" style="width:70%;">
                 <div class="report_print">
                     <button type="button" class="btn btn-primary" id="pdf"
-                            style="left:10px; height:30px;position: relative;color:white;background-color: #00A0AD;border-color: #00A0AD; padding:3px;">
+                            style="position: relative;height:30px;color:white;background-color: #00A0AD;border-color: #00A0AD; padding:3px;">
                         Print (PDF)
                     </button>
                     <button type="button" class="btn btn-primary" id="xlsx"
-                            style="left:10px; height:30px;position: relative;color:white;background-color: #00A0AD;border-color: #00A0AD; padding:3px;">
+                            style="position: relative;height:30px;color:white;background-color: #00A0AD;border-color: #00A0AD; padding:3px;">
                         Export (XLSX)
                     </button>
                 </div>
             </div>
             <br></br>
-            <div class="sub_container_right" style="width:50%;height:3%;right:0px;top:0px;position: absolute;">
-                  <div class="" style="right:80x;">
+            <div class="sub_container_right row" style="width:30%;height:3%;top:0px;position: relative;">
 
-                    <br></br>
-                    <div class="row" style="right:80px;top:0px;position: absolute;width:50;">
                         <div class="time_range" style="">
-                            <a type="button" class="dropdown-toggle" data-toggle="dropdown" aria-expanded="false">
+                            <a type="button" class="dropdown-toggle" data-toggle="dropdown" >
                                 <span class="fa fa-calendar" title="Dates" role="img" aria-label="Dates"></span>
                                 Date Range
                             </a>
                             <div class="dropdown-menu" role="menu">
-                                <div class="">
-                                    <label class="" for="date_from">Start Date :</label>
-                                    <div class="">
-                                        <div class="" aria-atomic="true" id="">
-                                            <input type="date" id="date_from"></input>
+                                <div class="form-group">
+                                    <label class="" for="gen_date_from">Start Date :</label>
+                                        <div class="input-group date" id="gen_date_from" data-target-input="nearest">
+                                            <input type="text" name="gen_date_from" class="form-control datetimepicker-input" data-target="#gen_date_from" t-att-name="prefix"/>
+                                            <div class="input-group-append" data-target="#gen_date_from" data-toggle="datetimepicker">
+                                                <span class="input-group-text">
+                                                    <span class="fa fa-calendar" role="img" aria-label="Calendar"></span>
+                                                </span>
+                                            </div>
                                         </div>
-                                    </div>
-                                    <label class="" for="date_to">End Date :</label>
-                                    <div class="">
-                                        <div class="" aria-atomic="true" id="">
-                                            <input type="date" id="date_to"></input>
+
+                                    <label class="" for="gen_date_to">End Date :</label>
+                                    <div class="input-group date" id="gen_date_to" data-target-input="nearest">
+
+                                        <input type="text" name="gen_date_to" class="form-control datetimepicker-input" data-target="#gen_date_to" t-att-name="prefix"/>
+                                        <div class="input-group-append" data-target="#gen_date_to" data-toggle="datetimepicker">
+                                            <span class="input-group-text">
+                                                <span class="fa fa-calendar" role="img" aria-label="Calendar"></span>
+                                            </span>
                                         </div>
                                     </div>
+
                                 </div>
                             </div>
                         </div>
@@ -246,17 +252,24 @@
                             </select>
                             <span id="post_res"></span>
                         </div>
+                        <div style="">
+                            <button type="button" id="apply_filter" class="btn btn-primary"
+                                    style="top:0px;height:30px;color:white;background-color: #00A0AD;border-color: #00A0AD;">
+                                Apply
+                            </button>
+
+                        </div>
                     </div>
 
-                </div>
-                <div style="">
-                    <button type="button" id="apply_filter" class="btn btn-primary"
-                            style="top:0px;height:30px;right:20px;position: absolute;color:white;background-color: #00A0AD;border-color: #00A0AD;">
-                        Apply
-                    </button>
+<!--                </div>-->
+<!--                <div style="">-->
+<!--                    <button type="button" id="apply_filter" class="btn btn-primary"-->
+<!--                            style="top:0px;height:30px;right:20px;position: absolute;color:white;background-color: #00A0AD;border-color: #00A0AD;">-->
+<!--                        Apply-->
+<!--                    </button>-->
 
-                </div>
-            </div>
+<!--                </div>-->
+<!--            </div>-->
         </div>
     </t>
 
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 6f75333ae..c131f7a7b 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 @@
     </t>
 
     <t t-name="PLFilterView">
-        <div class="" style="position: relative;">
-            <div class="sub_container_left">
+        <div class="row" style="margin-right: 10px; margin-left: 10px;">
+            <div class="sub_container_left" style="width:70%;">
                 <div class="report_print">
                     <button type="button" class="btn btn-primary" id="pdf"
-                            style="left:10px; height:30px;position: relative;color:white;background-color: #00A0AD;border-color: #00A0AD; padding:3px;">
+                            style="position: relative;height:30px;color:white;background-color: #00A0AD;border-color: #00A0AD; padding:3px;">
                         Print (PDF)
                     </button>
                     <button type="button" class="btn btn-primary" id="xlsx"
-                            style="left:10px; height:30px;position: relative;color:white;background-color: #00A0AD;border-color: #00A0AD; padding:3px;">
+                            style="position: relative;height:30px;color:white;background-color: #00A0AD;border-color: #00A0AD; padding:3px;">
                         Export (XLSX)
                     </button>
                 </div>
             </div>
             <br></br>
-            <div class="sub_container_right" style="width:50%;height:3%;right:0px;top:0px;position: absolute;">
-                <div class="" style="right:80x;">
+            <div class="sub_container_right row" style="width:30%;height:3%;top:0px;position: relative;">
 
-                    <br></br>
-                    <div class="row" style="right:80px;top:0px;position: absolute;width:50;">
                         <div class="time_range" style="">
-                            <a type="button" class="dropdown-toggle" data-toggle="dropdown" aria-expanded="false">
+                            <a type="button" class="dropdown-toggle" data-toggle="dropdown" >
                                 <span class="fa fa-calendar" title="Dates" role="img" aria-label="Dates"></span>
                                 Date Range
                             </a>
                             <div class="dropdown-menu" role="menu">
-                                <div class="">
+                                <div class="form-group">
                                     <label class="" for="date_from">Start Date :</label>
-                                    <div class="">
-                                        <div class="" aria-atomic="true" id="">
-                                            <input type="date" id="date_from"></input>
+                                        <div class="input-group date" id="date_from" data-target-input="nearest">
+                                            <input type="text" name="date_from" class="form-control datetimepicker-input" data-target="#date_from" t-att-name="prefix"/>
+                                            <div class="input-group-append" data-target="#date_from" data-toggle="datetimepicker">
+                                                <span class="input-group-text">
+                                                    <span class="fa fa-calendar" role="img" aria-label="Calendar"></span>
+                                                </span>
+                                            </div>
                                         </div>
-                                    </div>
+
                                     <label class="" for="date_to">End Date :</label>
-                                    <div class="">
-                                        <div class="" aria-atomic="true" id="">
-                                            <input type="date" id="date_to"></input>
+                                    <div class="input-group date" id="date_to" data-target-input="nearest">
+
+                                        <input type="text" name="date_to" class="form-control datetimepicker-input" data-target="#date_to" t-att-name="prefix"/>
+                                        <div class="input-group-append" data-target="#date_to" data-toggle="datetimepicker">
+                                            <span class="input-group-text">
+                                                <span class="fa fa-calendar" role="img" aria-label="Calendar"></span>
+                                            </span>
                                         </div>
                                     </div>
+
                                 </div>
                             </div>
                         </div>
@@ -224,16 +230,17 @@
                             </select>
                             <span id="post_res"></span>
                         </div>
-                    </div>
+                        <div style="">
+                            <button type="button" id="apply_filter" class="btn btn-primary"
+                                    style="top:0px;height:30px;color:white;background-color: #00A0AD;border-color: #00A0AD;">
+                                Apply
+                            </button>
 
-                </div>
-                <div style="">
-                    <button type="button" id="apply_filter" class="btn btn-primary"
-                            style="top:0px;height:30px;right:20px;position: absolute;color:white;background-color: #00A0AD;border-color: #00A0AD;">
-                        Apply
-                    </button>
+                        </div>
+<!--                    </div>-->
+
+<!--                </div>-->
 
-                </div>
             </div>
         </div>
     </t>
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 42b71f960..7c27429f8 100644
--- a/dynamic_accounts_report/static/src/xml/trial_balance_view.xml
+++ b/dynamic_accounts_report/static/src/xml/trial_balance_view.xml
@@ -1,5 +1,5 @@
 <templates>
-    <t t-name="TrialTemp">
+    <t t-name="TrialTemp" >
         <div class="">
             <div class="">
                 <h1 style="padding:10px">
@@ -196,45 +196,53 @@
 
 
     <t t-name="TrialFilterView">
-
-        <div class="" style="position: relative;">
-            <div class="sub_container_left">
+        <div class="row" style="margin-right: 10px; margin-left: 10px;">
+            <div class="sub_container_left" style="width:70%;">
                 <div class="report_print">
                     <button type="button" class="btn btn-primary" id="pdf"
-                            style="left:10px; height:30px;position: relative;color:white;background-color: #00A0AD;border-color: #00A0AD; padding:3px;">
+                            style="position: relative;height:30px;color:white;background-color: #00A0AD;border-color: #00A0AD; padding:3px;">
                         Print (PDF)
                     </button>
                     <button type="button" class="btn btn-primary" id="xlsx"
-                            style="left:10px; height:30px;position: relative;color:white;background-color: #00A0AD;border-color: #00A0AD; padding:3px;">
+                            style="position: relative;height:30px;color:white;background-color: #00A0AD;border-color: #00A0AD; padding:3px;">
                         Export (XLSX)
                     </button>
                 </div>
             </div>
             <br></br>
-            <div class="sub_container_right" style="width:50%;height:3%;right:0px;top:0px;position: absolute;">
-                <div class="" style="right:80x;">
+            <div class="sub_container_right row" style="width:30%;height:3%;top:0px;position: relative;">
 
-                    <br></br>
-                    <div class="row" style="right:110px;top:0px;position: absolute;width:50;">
                         <div class="time_range" style="">
-                            <a type="button" class="dropdown-toggle" data-toggle="dropdown" aria-expanded="false">
+                            <a type="button" class="dropdown-toggle" data-toggle="dropdown" >
                                 <span class="fa fa-calendar" title="Dates" role="img" aria-label="Dates"></span>
                                 Date Range
                             </a>
                             <div class="dropdown-menu" role="menu">
-                                <div class="">
+                                <div class="form-group">
                                     <label class="" for="date_from">Start Date :</label>
-                                    <div class="">
-                                        <div class="" aria-atomic="true" id="">
-                                            <input type="date" id="date_from"></input>
+                                        <div class="input-group date" id="date_from" data-target-input="nearest">
+<!--                                            <t t-set='date_formatted'><t t-options='{"widget": "date"}' t-esc="filter_data.date_from"/></t>-->
+<!--                                            <input type="text" name="date_from" class="form-control datetimepicker-input" t-att-value="date_formatted"  data-target="#date_from" t-att-name="prefix"/>-->
+                                            <input type="text" name="date_from" class="form-control datetimepicker-input" data-target="#date_from" t-att-name="prefix"/>
+
+                                            <div class="input-group-append" data-target="#date_from" data-toggle="datetimepicker">
+                                                <span class="input-group-text">
+                                                    <span class="fa fa-calendar" role="img" aria-label="Calendar"></span>
+                                                </span>
+                                            </div>
                                         </div>
-                                    </div>
+
                                     <label class="" for="date_to">End Date :</label>
-                                    <div class="">
-                                        <div class="" aria-atomic="true" id="">
-                                            <input type="date" id="date_to"></input>
+                                    <div class="input-group date" id="date_to" data-target-input="nearest">
+
+                                        <input type="text" name="date_to" class="form-control datetimepicker-input" data-target="#date_to" t-att-name="prefix"/>
+                                        <div class="input-group-append" data-target="#date_to" data-toggle="datetimepicker">
+                                            <span class="input-group-text">
+                                                <span class="fa fa-calendar" role="img" aria-label="Calendar"></span>
+                                            </span>
                                         </div>
                                     </div>
+
                                 </div>
                             </div>
                         </div>
@@ -266,16 +274,18 @@
                             </select>
                             <span id="post_res"></span>
                         </div>
-                    </div>
+                        <div style="">
+                            <button type="button" id="apply_filter" class="btn btn-primary"
+                                    style="top:0px;height:30px;color:white;background-color: #00A0AD;border-color: #00A0AD;">
+                                Apply
+                            </button>
 
-                </div>
-                <div style="">
-                    <button type="button" id="apply_filter" class="btn btn-primary"
-                            style="top:0px;height:30px;right:20px;position: absolute;color:white;background-color: #00A0AD;border-color: #00A0AD;">
-                        Apply
-                    </button>
+                        </div>
+<!--                    </div>-->
+
+
+<!--                </div>-->
 
-                </div>
             </div>
         </div>
     </t>
diff --git a/dynamic_accounts_report/views/kit_menus.xml b/dynamic_accounts_report/views/kit_menus.xml
index 14c4fa630..de2d765c5 100644
--- a/dynamic_accounts_report/views/kit_menus.xml
+++ b/dynamic_accounts_report/views/kit_menus.xml
@@ -1,30 +1,30 @@
 
 <odoo>
 
-    <record id="base_accounting_kit.menu_Balance_report" model="ir.ui.menu">
-        <field name="active" eval="False"/>
-    </record>
-    <record id="base_accounting_kit.menu_general_ledger" model="ir.ui.menu">
-        <field name="active" eval="False"/>
-    </record>
-    <record id="base_accounting_kit.menu_aged_trial_balance" model="ir.ui.menu">
-        <field name="active" eval="False"/>
-    </record>
-    <record id="base_accounting_kit.menu_partner_ledger" model="ir.ui.menu">
-        <field name="active" eval="False"/>
-    </record>
-    <record id="base_accounting_kit._account_financial_reports_balance_sheet" model="ir.ui.menu">
-        <field name="active" eval="False"/>
-    </record>
-    <record id="base_accounting_kit.account_financial_reports_profit_loss" model="ir.ui.menu">
-        <field name="active" eval="False"/>
-    </record>
-        <record id="base_accounting_kit.account_reports_daily_reports" model="ir.ui.menu">
-        <field name="active" eval="False"/>
-    </record>
-    <record id="base_accounting_kit.menu_account_cash_flow_report" model="ir.ui.menu">
-        <field name="active" eval="False"/>
-    </record>
+<!--    <record id="base_accounting_kit.menu_Balance_report" model="ir.ui.menu">-->
+<!--        <field name="active" eval="False"/>-->
+<!--    </record>-->
+<!--    <record id="base_accounting_kit.menu_general_ledger" model="ir.ui.menu">-->
+<!--        <field name="active" eval="False"/>-->
+<!--    </record>-->
+<!--    <record id="base_accounting_kit.menu_aged_trial_balance" model="ir.ui.menu">-->
+<!--        <field name="active" eval="False"/>-->
+<!--    </record>-->
+<!--    <record id="base_accounting_kit.menu_partner_ledger" model="ir.ui.menu">-->
+<!--        <field name="active" eval="False"/>-->
+<!--    </record>-->
+<!--    <record id="base_accounting_kit._account_financial_reports_balance_sheet" model="ir.ui.menu">-->
+<!--        <field name="active" eval="False"/>-->
+<!--    </record>-->
+<!--    <record id="base_accounting_kit.account_financial_reports_profit_loss" model="ir.ui.menu">-->
+<!--        <field name="active" eval="False"/>-->
+<!--    </record>-->
+<!--        <record id="base_accounting_kit.account_reports_daily_reports" model="ir.ui.menu">-->
+<!--        <field name="active" eval="False"/>-->
+<!--    </record>-->
+<!--    <record id="base_accounting_kit.menu_account_cash_flow_report" model="ir.ui.menu">-->
+<!--        <field name="active" eval="False"/>-->
+<!--    </record>-->
 
 
 </odoo>
diff --git a/dynamic_accounts_report/wizard/balance_sheet_config.py b/dynamic_accounts_report/wizard/balance_sheet_config.py
index 6643ad25d..d8ceb9f17 100644
--- a/dynamic_accounts_report/wizard/balance_sheet_config.py
+++ b/dynamic_accounts_report/wizard/balance_sheet_config.py
@@ -6,6 +6,7 @@ class BalanceSheet(models.TransientModel):
     _inherit = "dynamic.balance.sheet.report"
 
     def view_report_pdf(self, acc, form):
+
         data = dict()
         report_lines = acc
         data['form'] = form
@@ -136,6 +137,7 @@ class BalanceSheet(models.TransientModel):
 
     def get_account_lines(self, data):
 
+
         lines = []
         account_report = data['account_report_id']
         child_reports = account_report._get_children_by_order()
diff --git a/dynamic_accounts_report/wizard/trial_balance.py b/dynamic_accounts_report/wizard/trial_balance.py
index 14ef1db51..36cfba1ad 100644
--- a/dynamic_accounts_report/wizard/trial_balance.py
+++ b/dynamic_accounts_report/wizard/trial_balance.py
@@ -81,6 +81,8 @@ class TrialView(models.TransientModel):
         filters['journals_list'] = data.get('journals_list')
         filters['company_name'] = data.get('company_name')
         filters['target_move'] = data.get('target_move').capitalize()
+        filters['date_from'] = data.get('date_from')
+        filters['date_to'] = data.get('date_to')
 
         return filters