|
@@ -101,7 +104,7 @@
|
- |
- |
- |
|||||
|---|---|---|---|---|---|---|---|---|
|
|
| |||||||
- 
- 
- 
- 
- 
- 
- 
{
currency = account_list.currency_id
totalDebitSum += account_list.total_debit || 0;
+ account_list.total_debit_display = this.formatNumberWithSeparators(account_list.total_debit || 0);
totalCreditSum += account_list.total_credit || 0;
+ account_list.total_credit_display = this.formatNumberWithSeparators(account_list.total_credit || 0);
+ let balance = account_list.total_debit - account_list.total_credit;
+ account_list.balance_display = this.formatNumberWithSeparators(balance);
});
}
- })
+ }
self.state.account = account_list
self.state.account_list = account_list
self.state.account_data_list = self.state.account_data
@@ -79,7 +95,9 @@ class GeneralLedger extends owl.Component {
self.state.account_total = account_totals
self.state.currency = currency
self.state.total_debit = totalDebitSum.toFixed(2)
+ self.state.total_debit_display = this.formatNumberWithSeparators(self.state.total_debit)
self.state.total_credit = totalCreditSum.toFixed(2)
+ self.state.total_credit_display = this.formatNumberWithSeparators(self.state.total_credit)
self.state.title = action_title
}
catch (el) {
@@ -90,9 +108,11 @@ class GeneralLedger extends owl.Component {
ev.preventDefault();
var self = this;
let totals = {
- 'total_debit':this.state.total_debit,
- 'total_credit':this.state.total_credit,
- 'currency':this.state.currency,
+ 'total_debit':this.state.total_debit || false,
+ 'total_debit_display':this.state.total_debit_display || false,
+ 'total_credit':this.state.total_credit || false,
+ 'total_credit_display':this.state.total_credit_display || false,
+ 'currency':this.state.currency || false,
}
var action_title = self.props.action.display_name;
return self.action.doAction({
@@ -102,7 +122,7 @@ class GeneralLedger extends owl.Component {
'report_file': 'dynamic_accounts_report.general_ledger',
'data': {
'account': self.state.account,
- 'data': self.state.account_data,
+ 'account_data': self.state.account_data,
'total': self.state.account_total,
'title': action_title,
'filters': this.filter(),
@@ -116,7 +136,9 @@ class GeneralLedger extends owl.Component {
var self = this;
let totals = {
'total_debit':this.state.total_debit,
+ 'total_debit_display':this.state.total_debit_display || false,
'total_credit':this.state.total_credit,
+ 'total_credit_display':this.state.total_credit_display || false,
'currency':this.state.currency,
}
var action_title = self.props.action.display_name;
diff --git a/dynamic_accounts_report/static/src/js/partner_ledger.js b/dynamic_accounts_report/static/src/js/partner_ledger.js
index 112e98b0f..1a4e2583f 100644
--- a/dynamic_accounts_report/static/src/js/partner_ledger.js
+++ b/dynamic_accounts_report/static/src/js/partner_ledger.js
@@ -26,6 +26,7 @@ class PartnerLedger extends owl.Component {
selected_partner: [],
selected_partner_rec: [],
total_debit: null,
+ total_debit_display:null,
total_credit: null,
partner_list: null,
total_list: null,
@@ -35,8 +36,19 @@ class PartnerLedger extends owl.Component {
message_list : [],
});
this.load_data(self.initial_render = true);
+ }
+ formatNumberWithSeparators(number) {
+ const parsedNumber = parseFloat(number);
+ if (isNaN(parsedNumber)) {
+ return "0.00"; // Fallback to 0.00 if the input is invalid
+ }
+ return parsedNumber.toLocaleString('en-US', {
+ minimumFractionDigits: 2,
+ maximumFractionDigits: 2
+ });
}
+
async load_data() {
/**
* Loads the data for the partner ledger report.
@@ -51,27 +63,35 @@ class PartnerLedger extends owl.Component {
try {
var self = this;
self.state.data = await self.orm.call("account.partner.ledger", "view_report", [[this.wizard_id], action_title,]);
- // Extract partner information from the data
- $.each(self.state.data, function (index, value) {
- if (index !== 'partner_totals') {
- partner_list.push(index)
- }
- else {
- partner_totals = value
- Object.values(partner_totals).forEach(partner_list => {
- currency = partner_list.currency_id
- totalDebitSum += partner_list.total_debit || 0;
- totalCreditSum += partner_list.total_credit || 0;
- });
- }
- })
+ const dataArray = self.state.data;
+ Object.entries(dataArray).forEach(([key, value]) => {
+ if (key !== 'partner_totals') {
+ partner_list.push(key);
+ value.forEach(entry => {
+ entry[0].debit_display = this.formatNumberWithSeparators(entry[0].debit || 0);
+ entry[0].credit_display = this.formatNumberWithSeparators(entry[0].credit || 0);
+ entry[0].amount_currency_display = this.formatNumberWithSeparators(entry[0].amount_currency || 0);
+ });
+ } else {
+ partner_totals = value;
+ }
+ });
+ Object.values(partner_totals).forEach(partner => {
+ currency = partner.currency_id;
+ totalDebitSum += partner.total_debit || 0;
+ totalCreditSum += partner.total_credit || 0;
+ partner.total_debit_display = this.formatNumberWithSeparators(partner.total_debit || 0)
+ partner.total_credit_display = this.formatNumberWithSeparators(partner.total_credit || 0)
+ });
self.state.partners = partner_list
self.state.partner_list = partner_list
self.state.total_list = partner_totals
self.state.total = partner_totals
self.state.currency = currency
self.state.total_debit = totalDebitSum
+ self.state.total_debit_display = this.formatNumberWithSeparators(self.state.total_debit || 0)
self.state.total_credit = totalCreditSum
+ self.state.total_credit_display = this.formatNumberWithSeparators(self.state.total_credit || 0)
self.state.title = action_title
}
catch (el) {
@@ -91,7 +111,9 @@ class PartnerLedger extends owl.Component {
let partner_totals = ''
let totals = {
'total_debit':this.state.total_debit,
+ 'total_debit_display':this.state.total_debit_display,
'total_credit':this.state.total_credit,
+ 'total_credit_display':this.state.total_credit_display,
'currency':this.state.currency,
}
var action_title = this.props.action.display_name;
diff --git a/dynamic_accounts_report/static/src/js/trial_balance.js b/dynamic_accounts_report/static/src/js/trial_balance.js
index 3a4e049e1..c9014b12c 100644
--- a/dynamic_accounts_report/static/src/js/trial_balance.js
+++ b/dynamic_accounts_report/static/src/js/trial_balance.js
@@ -26,6 +26,7 @@ class TrialBalance extends owl.Component {
data: null,
total: null,
journals: null,
+ accounts: null,
selected_analytic: [],
analytic_account: null,
selected_journal_list: [],
@@ -61,6 +62,7 @@ class TrialBalance extends owl.Component {
self.end_date.el.value = endOfMonth.getFullYear() + '-' + String(endOfMonth.getMonth() + 1).padStart(2, '0') + '-' + String(endOfMonth.getDate()).padStart(2, '0');
self.state.date_viewed.push(monthNamesShort[today.getMonth()] + ' ' + today.getFullYear())
self.state.journals = self.state.data[1]['journal_ids']
+ self.state.accounts = self.state.data[0]
$.each(self.state.data, function (index, value) {
self.state.journals = value.journal_ids
})
@@ -242,20 +244,22 @@ class TrialBalance extends owl.Component {
}
this.state.data = await this.orm.call("account.trial.balance", "get_filter_values", [this.start_date.el.value, this.end_date.el.value, this.state.comparison_number, this.state.comparison_type, this.state.selected_journal_list, this.state.selected_analytic, this.state.options,this.state.method,]);
var date_viewed = []
- this.state.data.forEach((value, index) => {
- if (index == 'journal_ids') {
- this.state.journals = value
- }
- if (value.dynamic_date_num) {
- let iterable = Array.isArray(value.dynamic_date_num) ? value.dynamic_date_num
- : Object.values(value.dynamic_date_num);
- for (const date_num of iterable) {
- if (!date_viewed.includes(date_num)) {
- date_viewed.push(date_num);
- }
- }
- }
- })
+// this.state.data.forEach((value, index) => {
+// console.log(index)
+// if (index == 'journal_ids') {
+// this.state.journals = value
+// console.log(this.state.journals)
+// }
+// if (value.dynamic_date_num) {
+// let iterable = Array.isArray(value.dynamic_date_num) ? value.dynamic_date_num
+// : Object.values(value.dynamic_date_num);
+// for (const date_num of iterable) {
+// if (!date_viewed.includes(date_num)) {
+// date_viewed.push(date_num);
+// }
+// }
+// }
+// })
if (date_viewed.length !== 0) {
this.state.date_viewed = date_viewed.reverse()
}
@@ -307,14 +311,15 @@ class TrialBalance extends owl.Component {
this.applyFilter(null, ev)
}
sumByKey(data, key) {
- /**
- * Calculates the sum of values in an array of objects by a specified key.
- *
- * @param {Array} data - Array of objects containing numeric values.
- * @param {string} key - The key to access the numeric value in each object.
- * @returns {number} The sum of the numeric values.
- */
- return data.reduce((acc, item) => acc + (item[key] || 0), 0);
+ if (!Array.isArray(data)) return 0;
+ return data.reduce((acc, item) => {
+ let raw = item[key];
+ if (typeof raw === 'string') {
+ raw = raw.replace(/,/g, ''); // remove commas
+ }
+ const val = parseFloat(raw);
+ return acc + (isNaN(val) ? 0 : val);
+ }, 0);
}
get comparison_number_range() {
/**
@@ -527,4 +532,4 @@ class TrialBalance extends owl.Component {
}
}
TrialBalance.template = 'trl_b_template_new';
-actionRegistry.add("trl_b", TrialBalance);
+actionRegistry.add("trl_b", TrialBalance);
\ No newline at end of file
diff --git a/dynamic_accounts_report/static/src/xml/aged_receivable_report_views.xml b/dynamic_accounts_report/static/src/xml/aged_receivable_report_views.xml
index 53a73c3ea..64b6ae51e 100644
--- a/dynamic_accounts_report/static/src/xml/aged_receivable_report_views.xml
+++ b/dynamic_accounts_report/static/src/xml/aged_receivable_report_views.xml
@@ -191,7 +191,7 @@