diff --git a/dynamic_accounts_report/__manifest__.py b/dynamic_accounts_report/__manifest__.py index eaf6dc8ac..f496af639 100644 --- a/dynamic_accounts_report/__manifest__.py +++ b/dynamic_accounts_report/__manifest__.py @@ -22,7 +22,7 @@ { 'name': 'Dynamic Financial Reports', - 'version': '14.0.1.2.2', + 'version': '14.0.1.2.3', '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 3879610cb..542fe7c95 100644 --- a/dynamic_accounts_report/doc/RELEASE_NOTES.md +++ b/dynamic_accounts_report/doc/RELEASE_NOTES.md @@ -21,5 +21,10 @@ #### UPDT - Updated +#### 10.08.2021 +#### Version 14.0.1.2.3 +#### UPDT +- Style Issue Updated + diff --git a/dynamic_accounts_report/static/src/js/cash_flow.js b/dynamic_accounts_report/static/src/js/cash_flow.js index 216c94931..66219aa76 100644 --- a/dynamic_accounts_report/static/src/js/cash_flow.js +++ b/dynamic_accounts_report/static/src/js/cash_flow.js @@ -149,6 +149,12 @@ odoo.define('dynamic_cash_flow_statements.cash_flow', function (require) { self.$el.find('.journals').select2({ placeholder: 'Select Journals...', }); + self.$el.find('.target_move').select2({ + placeholder: 'Target Move...', + }); + self.$el.find('.levels').select2({ + placeholder: 'Levels...', + }); } var child=[]; @@ -283,8 +289,8 @@ odoo.define('dynamic_cash_flow_statements.cash_flow', function (require) { if ($(".levels").length){ var level_res = document.getElementById("level_res") - filter_data_selected.levels = $(".levels")[0].value - level_res.value = $(".levels")[0].value + filter_data_selected.levels = $(".levels")[1].value + level_res.value = $(".levels")[1].value level_res.innerHTML=level_res.value; if ($(".levels").value==""){ type_res.innerHTML="summary"; @@ -303,10 +309,10 @@ odoo.define('dynamic_cash_flow_statements.cash_flow', function (require) { if ($(".target_move").length) { var post_res = document.getElementById("post_res") - filter_data_selected.target_move = $(".target_move")[0].value - post_res.value = $(".target_move")[0].value + filter_data_selected.target_move = $(".target_move")[1].value + post_res.value = $(".target_move")[1].value post_res.innerHTML=post_res.value; - if ($(".target_move")[0].value == "") { + if ($(".target_move")[1].value == "") { post_res.innerHTML="posted"; } diff --git a/dynamic_accounts_report/static/src/js/daybook.js b/dynamic_accounts_report/static/src/js/daybook.js index 11941460c..47d98c123 100644 --- a/dynamic_accounts_report/static/src/js/daybook.js +++ b/dynamic_accounts_report/static/src/js/daybook.js @@ -74,6 +74,9 @@ odoo.define('dynamic_partner_daybook.daybook', function (require) { self.$el.find('.account').select2({ placeholder: ' Accounts...', }); + self.$el.find('.target_move').select2({ + placeholder: 'Target Move...', + }); } @@ -357,10 +360,10 @@ odoo.define('dynamic_partner_daybook.daybook', function (require) { if ($(".target_move").length) { var post_res = document.getElementById("post_res") - filter_data_selected.target_move = $(".target_move")[0].value - post_res.value = $(".target_move")[0].value + filter_data_selected.target_move = $(".target_move")[1].value + post_res.value = $(".target_move")[1].value post_res.innerHTML=post_res.value; - if ($(".target_move")[0].value == "") { + if ($(".target_move")[1].value == "") { post_res.innerHTML="posted"; } diff --git a/dynamic_accounts_report/static/src/js/financial_reports.js b/dynamic_accounts_report/static/src/js/financial_reports.js index e465a2090..5d79f25b9 100644 --- a/dynamic_accounts_report/static/src/js/financial_reports.js +++ b/dynamic_accounts_report/static/src/js/financial_reports.js @@ -73,6 +73,9 @@ odoo.define('dynamic_accounts_report.financial_reports', function (require) { self.$el.find('.analytic-tag').select2({ placeholder: 'Analytic Tag...', }); + self.$el.find('.target_move').select2({ + placeholder: 'Target Move...', + }); } var child=[]; @@ -328,10 +331,10 @@ odoo.define('dynamic_accounts_report.financial_reports', function (require) { if ($(".target_move").length) { var post_res = document.getElementById("post_res") - filter_data_selected.target_move = $(".target_move")[0].value - post_res.value = $(".target_move")[0].value + filter_data_selected.target_move = $(".target_move")[1].value + post_res.value = $(".target_move")[1].value post_res.innerHTML=post_res.value; - if ($(".target_move")[0].value == "") { + if ($(".target_move")[1].value == "") { post_res.innerHTML="posted"; } diff --git a/dynamic_accounts_report/static/src/js/general_ledger.js b/dynamic_accounts_report/static/src/js/general_ledger.js index 9991a6a45..b719a3e74 100644 --- a/dynamic_accounts_report/static/src/js/general_ledger.js +++ b/dynamic_accounts_report/static/src/js/general_ledger.js @@ -97,6 +97,9 @@ odoo.define('dynamic_cash_flow_statements.general_ledger', function (require) { self.$el.find('.analytic_tags').select2({ placeholder: 'Analytic Tags...', }); + self.$el.find('.target_move').select2({ + placeholder: 'Target Move...', + }); } var child=[]; @@ -424,10 +427,10 @@ odoo.define('dynamic_cash_flow_statements.general_ledger', function (require) { if ($(".target_move").length) { var post_res = document.getElementById("post_res") - filter_data_selected.target_move = $(".target_move")[0].value - post_res.value = $(".target_move")[0].value + filter_data_selected.target_move = $(".target_move")[1].value + post_res.value = $(".target_move")[1].value post_res.innerHTML=post_res.value; - if ($(".target_move")[0].value == "") { + if ($(".target_move")[1].value == "") { post_res.innerHTML="posted"; } diff --git a/dynamic_accounts_report/static/src/js/partner_ledger.js b/dynamic_accounts_report/static/src/js/partner_ledger.js index 04be4eac1..ba78c48eb 100644 --- a/dynamic_accounts_report/static/src/js/partner_ledger.js +++ b/dynamic_accounts_report/static/src/js/partner_ledger.js @@ -92,6 +92,9 @@ odoo.define('dynamic_accounts_report.partner_ledger', function (require) { self.$el.find('.acc').select2({ placeholder: 'Select Acc...', }); + self.$el.find('.target_move').select2({ + placeholder: 'Target Move...', + }); } var child=[]; @@ -402,10 +405,10 @@ odoo.define('dynamic_accounts_report.partner_ledger', function (require) { if ($(".target_move").length) { var post_res = document.getElementById("post_res") - filter_data_selected.target_move = $(".target_move")[0].value - post_res.value = $(".target_move")[0].value + filter_data_selected.target_move = $(".target_move")[1].value + post_res.value = $(".target_move")[1].value post_res.innerHTML=post_res.value; - if ($(".target_move")[0].value == "") { + if ($(".target_move")[1].value == "") { post_res.innerHTML="posted"; } diff --git a/dynamic_accounts_report/static/src/js/trial_balance.js b/dynamic_accounts_report/static/src/js/trial_balance.js index 388245b39..6d2144517 100644 --- a/dynamic_accounts_report/static/src/js/trial_balance.js +++ b/dynamic_accounts_report/static/src/js/trial_balance.js @@ -70,6 +70,9 @@ odoo.define('dynamic_cash_flow_statements.trial', function (require) { self.$el.find('.journals').select2({ placeholder: 'Select Journals...', }); + self.$el.find('.target_move').select2({ + placeholder: 'Target Move...', + }); } var child=[]; @@ -234,10 +237,10 @@ odoo.define('dynamic_cash_flow_statements.trial', function (require) { if ($(".target_move").length) { var post_res = document.getElementById("post_res") - filter_data_selected.target_move = $(".target_move")[0].value - post_res.value = $(".target_move")[0].value + filter_data_selected.target_move = $(".target_move")[1].value + post_res.value = $(".target_move")[1].value post_res.innerHTML=post_res.value; - if ($(".target_move")[0].value == "") { + if ($(".target_move")[1].value == "") { post_res.innerHTML="posted"; } 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..33a3549b6 100644 --- a/dynamic_accounts_report/static/src/xml/cash_flow_view.xml +++ b/dynamic_accounts_report/static/src/xml/cash_flow_view.xml @@ -151,7 +151,7 @@


-
+