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

[FIX] analytic: display correct analytic when using arrows

Browse Source 
Steps to reproduce:
- activate analytic
- Create two assets with different analytic distribution
- Open the first asset
- Navigate to the second asset via the arrow

Issue:
The analytic account will not be displayed correctly

Cause:
In `jsonToData` the record used is the previous one.

Solution:
Use the record that will efectively be displayed

opw-3698383

closes odoo/odoo#153681

Signed-off-by: Habib Ayob (ayh) <ayh@odoo.com>
This commit is contained in:
yosa-odoo
2024-02-27 20:15:14 +00:00
parent a9ebd07b80
commit 4e9f542cb1
1 changed files with 11 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/analytic/static/src/components/analytic_distribution/analytic_distribution.js
+11 -13
View File
@@ -101,9 +101,9 @@ export class AnalyticDistribution extends Component {
async willStart() {
if (this.editingRecord) {
// for performance in list views, plans are not retrieved until they are required.
await this.fetchAllPlans();
await this.fetchAllPlans(this.props);
}
await this.jsonToData();
await this.jsonToData(this.props.record.data[this.props.name]);
}
async willUpdateRecord(record) {
@@ -120,11 +120,11 @@ export class AnalyticDistribution extends Component {
const productChanged = !shallowEqual(this.lastProduct, currentProduct);
if (valueChanged || accountChanged || productChanged) {
if (!this.props.force_applicability) {
await this.fetchAllPlans();
await this.fetchAllPlans({ record });
}
this.lastAccount = accountChanged && currentAccount || this.lastAccount;
this.lastProduct = productChanged && currentProduct || this.lastProduct;
await this.jsonToData();
await this.jsonToData(record.data[this.props.name]);
}
this.currentValue = record.data[this.props.name];
}
@@ -217,8 +217,7 @@ export class AnalyticDistribution extends Component {
}));
}
async jsonToData() {
const jsonFieldValue = this.props.record.data[this.props.name];
async jsonToData(jsonFieldValue) {
const analyticAccountIds = jsonFieldValue ? Object.keys(jsonFieldValue).map((key) => key.split(',')).flat().map((id) => parseInt(id)) : [];
const analyticAccountDict = analyticAccountIds.length ? await this.fetchAnalyticAccounts([["id", "in", analyticAccountIds]]) : [];
@@ -323,8 +322,7 @@ export class AnalyticDistribution extends Component {
}
// ORM
fetchPlansArgs() {
const { record, name } = this.props;
fetchPlansArgs({ record }) {
let args = {};
if (this.props.business_domain_compute) {
args['business_domain'] = evaluateExpr(this.props.business_domain_compute, record.evalContext);
@@ -341,7 +339,7 @@ export class AnalyticDistribution extends Component {
if (this.props.force_applicability) {
args['applicability'] = this.props.force_applicability;
}
const existing_account_ids = Object.keys(record.data[name]).map((k) => k.split(",")).flat().map((i) => parseInt(i));
const existing_account_ids = Object.keys(record.data[this.props.name]).map((k) => k.split(",")).flat().map((i) => parseInt(i));
if (existing_account_ids.length) {
args['existing_account_ids'] = existing_account_ids;
}
@@ -351,8 +349,8 @@ export class AnalyticDistribution extends Component {
return args;
}
async fetchAllPlans() {
const argsPlan = this.fetchPlansArgs();
async fetchAllPlans(props) {
const argsPlan = this.fetchPlansArgs(props);
this.allPlans = await this.orm.call("account.analytic.plan", "get_relevant_plans", [], argsPlan);
}
@@ -480,8 +478,8 @@ export class AnalyticDistribution extends Component {
async openAnalyticEditor() {
if (!this.allPlans.length) {
await this.fetchAllPlans();
await this.jsonToData();
await this.fetchAllPlans(this.props);
await this.jsonToData(this.props.record.data[this.props.name]);
}
if (!this.state.formattedData.length) {
await this.addLine();