diff --git a/dynamic_accounts_report/__manifest__.py b/dynamic_accounts_report/__manifest__.py
index a717db715..b143909cc 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.1',
+ 'version': '14.0.1.2.2',
'category': 'Accounting',
'summary': """Dynamic Financial Reports with drill
down and filters– Community Edition""",
diff --git a/dynamic_accounts_report/doc/RELEASE_NOTES.md b/dynamic_accounts_report/doc/RELEASE_NOTES.md
index ab3ad9589..3879610cb 100644
--- a/dynamic_accounts_report/doc/RELEASE_NOTES.md
+++ b/dynamic_accounts_report/doc/RELEASE_NOTES.md
@@ -16,4 +16,10 @@
- Ageing Report.
+#### 28.06.2021
+#### Version 14.0.1.2.2
+#### UPDT
+- Updated
+
+
diff --git a/dynamic_accounts_report/static/src/js/ageing.js b/dynamic_accounts_report/static/src/js/ageing.js
index 0c27d64b2..c5c2a4128 100644
--- a/dynamic_accounts_report/static/src/js/ageing.js
+++ b/dynamic_accounts_report/static/src/js/ageing.js
@@ -61,6 +61,17 @@ odoo.define('dynamic_accounts_report.ageing', function (require) {
method: 'view_report',
args: [[this.wizard_id]],
}).then(function(datas) {
+ _.each(datas['report_lines'][0], function(rep_lines) {
+ rep_lines.total = self.format_currency(datas['currency'],rep_lines.total);
+ rep_lines[4] = self.format_currency(datas['currency'],rep_lines[4]);
+ rep_lines[3] = self.format_currency(datas['currency'],rep_lines[3]);
+ rep_lines[2] = self.format_currency(datas['currency'],rep_lines[2]);
+ rep_lines[1] = self.format_currency(datas['currency'],rep_lines[1]);
+ rep_lines[0] = self.format_currency(datas['currency'],rep_lines[0]);
+
+ rep_lines['direction'] = self.format_currency(datas['currency'],rep_lines['direction']);
+
+ });
if (initial_render) {
self.$('.filter_view_tb').html(QWeb.render('AgeingFilterView', {
@@ -97,6 +108,15 @@ odoo.define('dynamic_accounts_report.ageing', function (require) {
window.location.href
}
},
+ format_currency: function(currency, amount) {
+ if (typeof(amount) != 'number') {
+ amount = parseFloat(amount);
+ }
+ var formatted_value = (parseInt(amount)).toLocaleString(currency[2],{
+ minimumFractionDigits: 2
+ })
+ return formatted_value
+ },
print_pdf: function(e) {
e.preventDefault();
@@ -214,8 +234,6 @@ odoo.define('dynamic_accounts_report.ageing', function (require) {
var td = $(event.currentTarget).next('tr').find('td');
if (td.length == 1) {
-
-
self._rpc({
model: 'account.partner.ageing',
method: 'view_report',
@@ -223,19 +241,23 @@ odoo.define('dynamic_accounts_report.ageing', function (require) {
[self.wizard_id]
],
}).then(function(data) {
- for (var i = 0; i < data['report_lines'][0].length; i++) {
- if (account_id == data['report_lines'][0][i]['partner_id'] ){
+ _.each(data['report_lines'][0], function(rep_lines) {
+ _.each(rep_lines['child_lines'], function(child_line) {
+ child_line.amount = self.format_currency(data['currency'],child_line.amount);
+
+ });
+ });
+ for (var i = 0; i < data['report_lines'][0].length; i++) {
+ if (account_id == data['report_lines'][0][i]['partner_id'] ){
$(event.currentTarget).next('tr').find('td .gl-table-div').remove();
$(event.currentTarget).next('tr').find('td ul').after(
QWeb.render('SubSectional', {
account_data: data['report_lines'][0][i]['child_lines'],
-
}))
-
$(event.currentTarget).next('tr').find('td ul li:first a').css({
'background-color': '#00ede8',
'font-weight': 'bold',
@@ -344,7 +366,6 @@ odoo.define('dynamic_accounts_report.ageing', function (require) {
var post_res = document.getElementById("post_res")
filter_data_selected.target_move = $(".target_move")[1].value
- console.log($(".target_move"))
post_res.value = $(".target_move")[1].value
post_res.innerHTML=post_res.value;
diff --git a/dynamic_accounts_report/static/src/js/cash_flow.js b/dynamic_accounts_report/static/src/js/cash_flow.js
index b45406770..216c94931 100644
--- a/dynamic_accounts_report/static/src/js/cash_flow.js
+++ b/dynamic_accounts_report/static/src/js/cash_flow.js
@@ -58,6 +58,37 @@ odoo.define('dynamic_cash_flow_statements.cash_flow', function (require) {
[self.wizard_id]
],
}).then(function(datas) {
+ _.each(datas['journal_res'], function(journal_lines) {
+ _.each(journal_lines['journal_lines'], function(rep_lines) {
+ rep_lines.total_debit = self.format_currency(datas['currency'],rep_lines.total_debit);
+ rep_lines.total_credit = self.format_currency(datas['currency'],rep_lines.total_credit);
+ rep_lines.balance = self.format_currency(datas['currency'],rep_lines.balance);
+
+
+
+
+ });
+
+ });
+ _.each(datas['account_res'], function(journal_lines) {
+ _.each(journal_lines['journal_lines'], function(rep_lines) {
+ rep_lines.total_debit = self.format_currency(datas['currency'],rep_lines.total_debit);
+ rep_lines.total_credit = self.format_currency(datas['currency'],rep_lines.total_credit);
+ rep_lines.total_balance = self.format_currency(datas['currency'],rep_lines.total_balance);
+
+
+ });
+ _.each(journal_lines['move_lines'], function(move_lines) {
+ move_lines.total_debit = self.format_currency(datas['currency'],move_lines.total_debit);
+ move_lines.total_credit = self.format_currency(datas['currency'],move_lines.total_credit);
+ move_lines.balance = self.format_currency(datas['currency'],move_lines.balance);
+
+
+
+
+ });
+ });
+
if(datas['levels']== 'detailed'){
$(event.currentTarget).next('tr').find('td ul').after(
@@ -100,6 +131,17 @@ odoo.define('dynamic_cash_flow_statements.cash_flow', function (require) {
method: 'view_report',
args: [[this.wizard_id]],
}).then(function(datas) {
+
+
+ _.each(datas['fetched_data'], function(rep_lines) {
+ rep_lines.total_debit = self.format_currency(datas['currency'],rep_lines.total_debit);
+ rep_lines.total_credit = self.format_currency(datas['currency'],rep_lines.total_credit);
+ rep_lines.total_balance = self.format_currency(datas['currency'],rep_lines.total_balance);
+
+
+
+
+ });
if (initial_render) {
self.$('.filter_view_tb').html(QWeb.render('CashFilterView', {
filter_data: datas['filters'],
@@ -125,6 +167,16 @@ odoo.define('dynamic_cash_flow_statements.cash_flow', function (require) {
}
},
+ format_currency: function(currency, amount) {
+ if (typeof(amount) != 'number') {
+ amount = parseFloat(amount);
+ }
+ var formatted_value = (parseInt(amount)).toLocaleString(currency[2],{
+ minimumFractionDigits: 2
+ })
+ return formatted_value
+ },
+
show_gl: function(e) {
var self = this;
var account_id = $(e.target).attr('data-account-id');
diff --git a/dynamic_accounts_report/static/src/js/daybook.js b/dynamic_accounts_report/static/src/js/daybook.js
index 514125940..11941460c 100644
--- a/dynamic_accounts_report/static/src/js/daybook.js
+++ b/dynamic_accounts_report/static/src/js/daybook.js
@@ -56,6 +56,12 @@ odoo.define('dynamic_partner_daybook.daybook', 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);
+ rep_lines.balance = self.format_currency(datas['currency'],rep_lines.balance);
+
+ });
if (initial_render) {
@@ -88,6 +94,17 @@ odoo.define('dynamic_partner_daybook.daybook', function (require) {
}
},
+
+ format_currency: function(currency, amount) {
+ if (typeof(amount) != 'number') {
+ amount = parseFloat(amount);
+ }
+ var formatted_value = (parseInt(amount)).toLocaleString(currency[2],{
+ minimumFractionDigits: 2
+ })
+ return formatted_value
+ },
+
print_pdf: function(e) {
e.preventDefault();
@@ -196,6 +213,16 @@ odoo.define('dynamic_partner_daybook.daybook', function (require) {
[self.wizard_id]
],
}).then(function(data) {
+ _.each(data['report_lines'], function(rep_lines) {
+ _.each(rep_lines['child_lines'], function(move_line) {
+
+ move_line.debit = self.format_currency(data['currency'],move_line.debit);
+ move_line.credit = self.format_currency(data['currency'],move_line.credit);
+ move_line.balance = self.format_currency(data['currency'],move_line.balance);
+
+
+ });
+ });
for (var i = 0; i < data['report_lines'].length; i++) {
if (account_id == data['report_lines'][i]['id'] ){
diff --git a/dynamic_accounts_report/static/src/js/financial_reports.js b/dynamic_accounts_report/static/src/js/financial_reports.js
index 22feb5cc5..e465a2090 100644
--- a/dynamic_accounts_report/static/src/js/financial_reports.js
+++ b/dynamic_accounts_report/static/src/js/financial_reports.js
@@ -52,6 +52,7 @@ odoo.define('dynamic_accounts_report.financial_reports', function (require) {
method: 'view_report',
args: [[this.wizard_id], action_title],
}).then(function(datas) {
+
if (initial_render) {
self.$('.filter_view_dfr').html(QWeb.render('DfrFilterView', {
filter_data: datas['filters'],
@@ -92,6 +93,16 @@ odoo.define('dynamic_accounts_report.financial_reports', function (require) {
}
},
+ format_currency: function(currency, amount) {
+ if (typeof(amount) != 'number') {
+ amount = parseFloat(amount);
+ }
+ var formatted_value = (parseInt(amount)).toLocaleString(currency[2],{
+ minimumFractionDigits: 2
+ })
+ return formatted_value
+ },
+
show_gl: function(e) {
var self = this;
var account_id = $(e.target).attr('data-account-id');
diff --git a/dynamic_accounts_report/static/src/js/general_ledger.js b/dynamic_accounts_report/static/src/js/general_ledger.js
index 0f4ccbd52..9991a6a45 100644
--- a/dynamic_accounts_report/static/src/js/general_ledger.js
+++ b/dynamic_accounts_report/static/src/js/general_ledger.js
@@ -70,6 +70,15 @@ odoo.define('dynamic_cash_flow_statements.general_ledger', function (require) {
method: 'view_report',
args: [[this.wizard_id], action_title],
}).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);
+ rep_lines.balance = self.format_currency(datas['currency'],rep_lines.balance);
+
+
+
+
+ });
if (initial_render) {
self.$('.filter_view_tb').html(QWeb.render('GLFilterView', {
@@ -205,6 +214,15 @@ odoo.define('dynamic_cash_flow_statements.general_ledger', function (require) {
});
},
+ format_currency: function(currency, amount) {
+ if (typeof(amount) != 'number') {
+ amount = parseFloat(amount);
+ }
+ var formatted_value = (parseInt(amount)).toLocaleString(currency[2],{
+ minimumFractionDigits: 2
+ })
+ return formatted_value
+ },
show_drop_down: function(event) {
event.preventDefault();
@@ -221,6 +239,16 @@ odoo.define('dynamic_cash_flow_statements.general_ledger', function (require) {
[self.wizard_id], action_title
],
}).then(function(data) {
+ _.each(data['report_lines'], function(rep_lines) {
+ _.each(rep_lines['move_lines'], function(move_line) {
+
+ move_line.debit = self.format_currency(data['currency'],move_line.debit);
+ move_line.credit = self.format_currency(data['currency'],move_line.credit);
+ move_line.balance = self.format_currency(data['currency'],move_line.balance);
+
+
+ });
+ });
for (var i = 0; i < data['report_lines'].length; i++) {
@@ -390,7 +418,7 @@ odoo.define('dynamic_cash_flow_statements.general_ledger', function (require) {
filter_data_selected.date_from = dateString;
}
if ($("#date_to").val()) {
- var dateString = $("#date_from").val();
+ var dateString = $("#date_to").val();
filter_data_selected.date_to = dateString;
}
diff --git a/dynamic_accounts_report/static/src/js/partner_ledger.js b/dynamic_accounts_report/static/src/js/partner_ledger.js
index 4e55ed54c..04be4eac1 100644
--- a/dynamic_accounts_report/static/src/js/partner_ledger.js
+++ b/dynamic_accounts_report/static/src/js/partner_ledger.js
@@ -54,6 +54,18 @@ odoo.define('dynamic_accounts_report.partner_ledger', 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);
+ rep_lines.balance = self.format_currency(datas['currency'],rep_lines.balance);
+
+
+
+
+ });
+
+
+
if (initial_render) {
self.$('.filter_view_tb').html(QWeb.render('PLFilterView', {
filter_data: datas['filters'],
@@ -99,6 +111,18 @@ odoo.define('dynamic_accounts_report.partner_ledger', function (require) {
}
},
+
+
+ format_currency: function(currency, amount) {
+ if (typeof(amount) != 'number') {
+ amount = parseFloat(amount);
+ }
+ var formatted_value = (parseInt(amount)).toLocaleString(currency[2],{
+ minimumFractionDigits: 2
+ })
+ return formatted_value
+ },
+
print_pdf: function(e) {
e.preventDefault();
var self = this;
@@ -185,6 +209,16 @@ odoo.define('dynamic_accounts_report.partner_ledger', function (require) {
[self.wizard_id]
],
}).then(function(data) {
+ _.each(data['report_lines'], function(rep_lines) {
+ _.each(rep_lines['move_lines'], function(move_line) {
+
+ move_line.debit = self.format_currency(data['currency'],move_line.debit);
+ move_line.credit = self.format_currency(data['currency'],move_line.credit);
+ move_line.balance = self.format_currency(data['currency'],move_line.balance);
+
+
+ });
+ });
for (var i = 0; i < data['report_lines'].length; i++) {
if (account_id == data['report_lines'][i]['id'] ){
diff --git a/dynamic_accounts_report/static/src/js/trial_balance.js b/dynamic_accounts_report/static/src/js/trial_balance.js
index c0a956e91..388245b39 100644
--- a/dynamic_accounts_report/static/src/js/trial_balance.js
+++ b/dynamic_accounts_report/static/src/js/trial_balance.js
@@ -55,6 +55,14 @@ odoo.define('dynamic_cash_flow_statements.trial', 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);
+ rep_lines.balance = self.format_currency(datas['currency'],rep_lines.balance);
+
+
+
+ });
if (initial_render) {
self.$('.filter_view_tb').html(QWeb.render('TrialFilterView', {
filter_data: datas['filters'],
@@ -70,8 +78,8 @@ odoo.define('dynamic_cash_flow_statements.trial', function (require) {
report_lines : datas['report_lines'],
filter : datas['filters'],
currency : datas['currency'],
- credit_total : datas['credit_total'],
- debit_total : datas['debit_total'],
+ credit_total : self.format_currency(datas['currency'],datas['debit_total']),
+ debit_total : self.format_currency(datas['currency'],datas['debit_total']),
}));
});
@@ -131,6 +139,17 @@ odoo.define('dynamic_cash_flow_statements.trial', function (require) {
});
},
+
+ format_currency: function(currency, amount) {
+ if (typeof(amount) != 'number') {
+ amount = parseFloat(amount);
+ }
+ var formatted_value = (parseInt(amount)).toLocaleString(currency[2],{
+ minimumFractionDigits: 2
+ })
+ return formatted_value
+ },
+
print_xlsx: function() {
var self = this;
self._rpc({
diff --git a/dynamic_accounts_report/static/src/xml/ageing.xml b/dynamic_accounts_report/static/src/xml/ageing.xml
index d226c479f..aa63e8800 100644
--- a/dynamic_accounts_report/static/src/xml/ageing.xml
+++ b/dynamic_accounts_report/static/src/xml/ageing.xml
@@ -59,7 +59,8 @@