pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[FIX] spreadsheet_account: compute value with format

Browse Source 
This commit actually refactors the code of the accounting functions
to use `computeValueAndFormat` instead of `compute` which doesn't
receive the arguments format.

The goal is to make the actual fix in the next commit easier
to review/understant with minimal noise.

opw-3872445

Part-of: odoo/odoo#163156
This commit is contained in:
Lucas Lefèvre (lul)
2024-04-26 06:49:56 +00:00
parent 6d2f4222e4
commit 2a6f0b4252
1 changed files with 38 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/spreadsheet_account/static/src/accounting_functions.js
+38 -60
View File
@@ -147,36 +147,29 @@ functionRegistry.add("ODOO.CREDIT", {
args: ODOO_FIN_ARGS(),
category: "Odoo",
returns: ["NUMBER"],
compute: function (
computeValueAndFormat: function (
accountCodes,
dateRange,
offset = 0,
companyId = null,
includeUnposted = false
offset = { value: 0 },
companyId = { value: null },
includeUnposted = { value: false }
) {
accountCodes = toString(accountCodes)
accountCodes = toString(accountCodes?.value)
.split(",")
.map((code) => code.trim())
.sort();
offset = toNumber(offset, this.locale);
dateRange = parseAccountingDate(dateRange, this.locale);
includeUnposted = toBoolean(includeUnposted);
return this.getters.getAccountPrefixCredit(
offset = toNumber(offset.value, this.locale);
dateRange = parseAccountingDate(dateRange?.value, this.locale);
includeUnposted = toBoolean(includeUnposted.value);
const value = this.getters.getAccountPrefixCredit(
accountCodes,
dateRange,
offset,
companyId,
companyId.value,
includeUnposted
);
},
computeFormat: function (
accountCodes,
dateRange,
offset = 0,
companyId = null,
includeUnposted = false
) {
return this.getters.getCompanyCurrencyFormat(companyId && companyId.value) || "#,##0.00";
const format = this.getters.getCompanyCurrencyFormat(companyId.value) || "#,##0.00";
return { value, format };
},
});
@@ -185,36 +178,29 @@ functionRegistry.add("ODOO.DEBIT", {
args: ODOO_FIN_ARGS(),
category: "Odoo",
returns: ["NUMBER"],
compute: function (
computeValueAndFormat: function (
accountCodes,
dateRange,
offset = 0,
companyId = null,
includeUnposted = false
offset = { value: 0 },
companyId = { value: null },
includeUnposted = { value: false }
) {
accountCodes = toString(accountCodes)
accountCodes = toString(accountCodes?.value)
.split(",")
.map((code) => code.trim())
.sort();
offset = toNumber(offset, this.locale);
dateRange = parseAccountingDate(dateRange, this.locale);
includeUnposted = toBoolean(includeUnposted);
return this.getters.getAccountPrefixDebit(
offset = toNumber(offset.value, this.locale);
dateRange = parseAccountingDate(dateRange?.value, this.locale);
includeUnposted = toBoolean(includeUnposted.value);
const value = this.getters.getAccountPrefixDebit(
accountCodes,
dateRange,
offset,
companyId,
companyId.value,
includeUnposted
);
},
computeFormat: function (
accountCodes,
dateRange,
offset = 0,
companyId = null,
includeUnposted = false
) {
return this.getters.getCompanyCurrencyFormat(companyId && companyId.value) || "#,##0.00";
const format = this.getters.getCompanyCurrencyFormat(companyId.value) || "#,##0.00";
return { value, format };
},
});
@@ -223,45 +209,37 @@ functionRegistry.add("ODOO.BALANCE", {
args: ODOO_FIN_ARGS(),
category: "Odoo",
returns: ["NUMBER"],
compute: function (
computeValueAndFormat: function (
accountCodes,
dateRange,
offset = 0,
companyId = null,
includeUnposted = false
offset = { value: 0 },
companyId = { value: null },
includeUnposted = { value: false }
) {
accountCodes = toString(accountCodes)
accountCodes = toString(accountCodes?.value)
.split(",")
.map((code) => code.trim())
.sort();
offset = toNumber(offset, this.locale);
dateRange = parseAccountingDate(dateRange, this.locale);
includeUnposted = toBoolean(includeUnposted);
return (
offset = toNumber(offset.value, this.locale);
dateRange = parseAccountingDate(dateRange?.value, this.locale);
includeUnposted = toBoolean(includeUnposted.value);
const value =
this.getters.getAccountPrefixDebit(
accountCodes,
dateRange,
offset,
companyId,
companyId.value,
includeUnposted
) -
this.getters.getAccountPrefixCredit(
accountCodes,
dateRange,
offset,
companyId,
companyId.value,
includeUnposted
)
);
},
computeFormat: function (
accountCodes,
dateRange,
offset = 0,
companyId = null,
includeUnposted = false
) {
return this.getters.getCompanyCurrencyFormat(companyId && companyId.value) || "#,##0.00";
);
const format = this.getters.getCompanyCurrencyFormat(companyId.value) || "#,##0.00";
return { value, format };
},
});