thirdparty
/
CybroAddons
mirror of https://github.com/CybroOdoo/CybroAddons.git
5
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

[UPDT] report filter issue 'dynamic_accounts_report'

pull/179/head
Ajmal Cybro 4 years ago
parent
08e358e98a
commit
a381480cff
11 changed files with 52 additions and 26 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      dynamic_accounts_report/__manifest__.py
  2. 5
      dynamic_accounts_report/doc/RELEASE_NOTES.md
  3. 16
      dynamic_accounts_report/static/src/js/cash_flow.js
  4. 9
      dynamic_accounts_report/static/src/js/daybook.js
  5. 9
      dynamic_accounts_report/static/src/js/financial_reports.js
  6. 9
      dynamic_accounts_report/static/src/js/general_ledger.js
  7. 9
      dynamic_accounts_report/static/src/js/partner_ledger.js
  8. 9
      dynamic_accounts_report/static/src/js/trial_balance.js
  9. 2
      dynamic_accounts_report/static/src/xml/cash_flow_view.xml
  10. 6
      dynamic_accounts_report/static/src/xml/daybook.xml
  11. 2
      dynamic_accounts_report/static/src/xml/trial_balance_view.xml

2
dynamic_accounts_report/__manifest__.py
View File

@ -22,7 +22,7 @@
{ {
'name': 'Dynamic Financial Reports', 'name': 'Dynamic Financial Reports',
'version': '14.0.1.2.2', 'version': '14.0.1.2.3',
'category': 'Accounting', 'category': 'Accounting',
'live_test_url': 'https://www.youtube.com/watch?v=gVQi9q9Rs-E&t=5s', 'live_test_url': 'https://www.youtube.com/watch?v=gVQi9q9Rs-E&t=5s',
'summary': """Dynamic Financial Reports with drill 'summary': """Dynamic Financial Reports with drill

5
dynamic_accounts_report/doc/RELEASE_NOTES.md
View File

@ -21,5 +21,10 @@
#### UPDT #### UPDT
- Updated - Updated
#### 10.08.2021
#### Version 14.0.1.2.3
#### UPDT
- Style Issue Updated

16
dynamic_accounts_report/static/src/js/cash_flow.js
View File

@ -149,6 +149,12 @@ odoo.define('dynamic_cash_flow_statements.cash_flow', function (require) {
self.$el.find('.journals').select2({ self.$el.find('.journals').select2({
placeholder: 'Select Journals...', placeholder: 'Select Journals...',
}); });
self.$el.find('.target_move').select2({
placeholder: 'Target Move...',
});
self.$el.find('.levels').select2({
placeholder: 'Levels...',
});
} }
var child=[]; var child=[];
@ -283,8 +289,8 @@ odoo.define('dynamic_cash_flow_statements.cash_flow', function (require) {
if ($(".levels").length){ if ($(".levels").length){
var level_res = document.getElementById("level_res") var level_res = document.getElementById("level_res")
filter_data_selected.levels = $(".levels")[0].value filter_data_selected.levels = $(".levels")[1].value
level_res.value = $(".levels")[0].value level_res.value = $(".levels")[1].value
level_res.innerHTML=level_res.value; level_res.innerHTML=level_res.value;
if ($(".levels").value==""){ if ($(".levels").value==""){
type_res.innerHTML="summary"; type_res.innerHTML="summary";
@ -303,10 +309,10 @@ odoo.define('dynamic_cash_flow_statements.cash_flow', function (require) {
if ($(".target_move").length) { if ($(".target_move").length) {
var post_res = document.getElementById("post_res") var post_res = document.getElementById("post_res")
filter_data_selected.target_move = $(".target_move")[0].value filter_data_selected.target_move = $(".target_move")[1].value
post_res.value = $(".target_move")[0].value post_res.value = $(".target_move")[1].value
post_res.innerHTML=post_res.value; post_res.innerHTML=post_res.value;
if ($(".target_move")[0].value == "") { if ($(".target_move")[1].value == "") {
post_res.innerHTML="posted"; post_res.innerHTML="posted";
} }

9
dynamic_accounts_report/static/src/js/daybook.js
View File

@ -74,6 +74,9 @@ odoo.define('dynamic_partner_daybook.daybook', function (require) {
self.$el.find('.account').select2({ self.$el.find('.account').select2({
placeholder: ' Accounts...', 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) { if ($(".target_move").length) {
var post_res = document.getElementById("post_res") var post_res = document.getElementById("post_res")
filter_data_selected.target_move = $(".target_move")[0].value filter_data_selected.target_move = $(".target_move")[1].value
post_res.value = $(".target_move")[0].value post_res.value = $(".target_move")[1].value
post_res.innerHTML=post_res.value; post_res.innerHTML=post_res.value;
if ($(".target_move")[0].value == "") { if ($(".target_move")[1].value == "") {
post_res.innerHTML="posted"; post_res.innerHTML="posted";
} }

9
dynamic_accounts_report/static/src/js/financial_reports.js
View File

@ -73,6 +73,9 @@ odoo.define('dynamic_accounts_report.financial_reports', function (require) {
self.$el.find('.analytic-tag').select2({ self.$el.find('.analytic-tag').select2({
placeholder: 'Analytic Tag...', placeholder: 'Analytic Tag...',
}); });
self.$el.find('.target_move').select2({
placeholder: 'Target Move...',
});
} }
var child=[]; var child=[];
@ -328,10 +331,10 @@ odoo.define('dynamic_accounts_report.financial_reports', function (require) {
if ($(".target_move").length) { if ($(".target_move").length) {
var post_res = document.getElementById("post_res") var post_res = document.getElementById("post_res")
filter_data_selected.target_move = $(".target_move")[0].value filter_data_selected.target_move = $(".target_move")[1].value
post_res.value = $(".target_move")[0].value post_res.value = $(".target_move")[1].value
post_res.innerHTML=post_res.value; post_res.innerHTML=post_res.value;
if ($(".target_move")[0].value == "") { if ($(".target_move")[1].value == "") {
post_res.innerHTML="posted"; post_res.innerHTML="posted";
} }

9
dynamic_accounts_report/static/src/js/general_ledger.js
View File

@ -97,6 +97,9 @@ odoo.define('dynamic_cash_flow_statements.general_ledger', function (require) {
self.$el.find('.analytic_tags').select2({ self.$el.find('.analytic_tags').select2({
placeholder: 'Analytic Tags...', placeholder: 'Analytic Tags...',
}); });
self.$el.find('.target_move').select2({
placeholder: 'Target Move...',
});
} }
var child=[]; var child=[];
@ -424,10 +427,10 @@ odoo.define('dynamic_cash_flow_statements.general_ledger', function (require) {
if ($(".target_move").length) { if ($(".target_move").length) {
var post_res = document.getElementById("post_res") var post_res = document.getElementById("post_res")
filter_data_selected.target_move = $(".target_move")[0].value filter_data_selected.target_move = $(".target_move")[1].value
post_res.value = $(".target_move")[0].value post_res.value = $(".target_move")[1].value
post_res.innerHTML=post_res.value; post_res.innerHTML=post_res.value;
if ($(".target_move")[0].value == "") { if ($(".target_move")[1].value == "") {
post_res.innerHTML="posted"; post_res.innerHTML="posted";
} }

9
dynamic_accounts_report/static/src/js/partner_ledger.js
View File

@ -92,6 +92,9 @@ odoo.define('dynamic_accounts_report.partner_ledger', function (require) {
self.$el.find('.acc').select2({ self.$el.find('.acc').select2({
placeholder: 'Select Acc...', placeholder: 'Select Acc...',
}); });
self.$el.find('.target_move').select2({
placeholder: 'Target Move...',
});
} }
var child=[]; var child=[];
@ -402,10 +405,10 @@ odoo.define('dynamic_accounts_report.partner_ledger', function (require) {
if ($(".target_move").length) { if ($(".target_move").length) {
var post_res = document.getElementById("post_res") var post_res = document.getElementById("post_res")
filter_data_selected.target_move = $(".target_move")[0].value filter_data_selected.target_move = $(".target_move")[1].value
post_res.value = $(".target_move")[0].value post_res.value = $(".target_move")[1].value
post_res.innerHTML=post_res.value; post_res.innerHTML=post_res.value;
if ($(".target_move")[0].value == "") { if ($(".target_move")[1].value == "") {
post_res.innerHTML="posted"; post_res.innerHTML="posted";
} }

9
dynamic_accounts_report/static/src/js/trial_balance.js
View File

@ -70,6 +70,9 @@ odoo.define('dynamic_cash_flow_statements.trial', function (require) {
self.$el.find('.journals').select2({ self.$el.find('.journals').select2({
placeholder: 'Select Journals...', placeholder: 'Select Journals...',
}); });
self.$el.find('.target_move').select2({
placeholder: 'Target Move...',
});
} }
var child=[]; var child=[];
@ -234,10 +237,10 @@ odoo.define('dynamic_cash_flow_statements.trial', function (require) {
if ($(".target_move").length) { if ($(".target_move").length) {
var post_res = document.getElementById("post_res") var post_res = document.getElementById("post_res")
filter_data_selected.target_move = $(".target_move")[0].value filter_data_selected.target_move = $(".target_move")[1].value
post_res.value = $(".target_move")[0].value post_res.value = $(".target_move")[1].value
post_res.innerHTML=post_res.value; post_res.innerHTML=post_res.value;
if ($(".target_move")[0].value == "") { if ($(".target_move")[1].value == "") {
post_res.innerHTML="posted"; post_res.innerHTML="posted";
} }

2
dynamic_accounts_report/static/src/xml/cash_flow_view.xml
View File

@ -151,7 +151,7 @@
<div class="" style="right:80x;"> <div class="" style="right:80x;">
<br></br> <br></br>
<div class="row" style="right:80px;top:0px;position: absolute;width:50;"> <div class="row" style="right:110px;top:0px;position: absolute;width:50;">
<div class="time_range" style=""> <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" aria-expanded="false">
<span class="fa fa-calendar" title="Dates" role="img" aria-label="Dates"></span> <span class="fa fa-calendar" title="Dates" role="img" aria-label="Dates"></span>

6
dynamic_accounts_report/static/src/xml/daybook.xml
View File

@ -30,8 +30,8 @@
</tr> </tr>
</thead> </thead>
<tbody style="width:100%;"> <!-- <tbody style="width:100%;">-->
</tbody> <!-- </tbody>-->
<tbody> <tbody>
<t t-foreach="report_lines" t-as="account"> <t t-foreach="report_lines" t-as="account">
<t t-set="common_id" t-value="0"/> <t t-set="common_id" t-value="0"/>
@ -130,7 +130,7 @@
<div class="" style="right:80x;"> <div class="" style="right:80x;">
<br></br> <br></br>
<div class="row" style="right:80px;top:0px;position: absolute;width:50;"> <div class="row" style="right:100px;top:0px;position: absolute;width:50;">
<div class="time_range" style=""> <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" aria-expanded="false">
<span class="fa fa-calendar" title="Dates" role="img" aria-label="Dates"></span> <span class="fa fa-calendar" title="Dates" role="img" aria-label="Dates"></span>

2
dynamic_accounts_report/static/src/xml/trial_balance_view.xml
View File

@ -215,7 +215,7 @@
<div class="" style="right:80x;"> <div class="" style="right:80x;">
<br></br> <br></br>
<div class="row" style="right:80px;top:0px;position: absolute;width:50;"> <div class="row" style="right:110px;top:0px;position: absolute;width:50;">
<div class="time_range" style=""> <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" aria-expanded="false">
<span class="fa fa-calendar" title="Dates" role="img" aria-label="Dates"></span> <span class="fa fa-calendar" title="Dates" role="img" aria-label="Dates"></span>

Write Preview
Loading…
Cancel
Save