viscous/espocrm
1
0
Fork 0
mirror of https://github.com/espocrm/espocrm.git synced 2026-06-28 06:56:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'fix'

Browse Source
This commit is contained in:
Yurii
2025-11-27 19:49:12 +02:00
parent b7a079b9d3 83439e5384
commit 3ac3f04e3d
2 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
client/src/views/fields/currency.js
View File

@@ -100,6 +100,13 @@ class CurrencyFieldView extends FloatFieldView {
'range',
]
/**
* @protected
* @type {string}
* @since 9.2.6
*/
currencyAttribute
/** @inheritDoc */
data() {
const currencyValue = this.model.get(this.currencyFieldName) ||
@@ -123,7 +130,7 @@ class CurrencyFieldView extends FloatFieldView {
setup() {
super.setup();
this.currencyFieldName = this.name + 'Currency';
this.currencyFieldName = this.currencyAttribute ?? this.name + 'Currency';
this.defaultCurrency = this.getConfig().get('defaultCurrency');
this.currencyList = this.getConfig().get('currencyList') || [this.defaultCurrency];
this.decimalPlaces = this.getConfig().get('currencyDecimalPlaces');

2
client/src/views/modals/related-list.js
View File

@@ -253,7 +253,7 @@ class RelatedListModalView extends ModalView {
this.$header.append(
title ||
$('<span>').text(
this.getLanguage().translate(this.link, 'links', this.entityType)
this.getLanguage().translate(this.link, 'links', this.scope)
)
);