Merge PR #2921 into 17.0

Signed-off-by pedrobaeza
pull/2942/head
OCA-git-bot 2024-09-16 06:47:58 +00:00
commit a5c82072b5
1 changed files with 11 additions and 1 deletions

View File

@ -6,7 +6,11 @@ import {
} from "@web/views/fields/many2many_tags/many2many_tags_field"; } from "@web/views/fields/many2many_tags/many2many_tags_field";
import {Many2OneField, many2OneField} from "@web/views/fields/many2one/many2one_field"; import {Many2OneField, many2OneField} from "@web/views/fields/many2one/many2one_field";
import {FormController} from "@web/views/form/form_controller"; import {FormController} from "@web/views/form/form_controller";
import {Many2OneAvatarField} from "@web/views/fields/many2one_avatar/many2one_avatar_field"; import {
KanbanMany2OneAvatarField,
Many2OneAvatarField,
} from "@web/views/fields/many2one_avatar/many2one_avatar_field";
import {Many2XAutocomplete} from "@web/views/fields/relational_utils"; import {Many2XAutocomplete} from "@web/views/fields/relational_utils";
import {evaluateBooleanExpr} from "@web/core/py_js/py"; import {evaluateBooleanExpr} from "@web/core/py_js/py";
import {isX2Many} from "@web/views/utils"; import {isX2Many} from "@web/views/utils";
@ -25,6 +29,12 @@ Many2XAutocomplete.props = {
fieldColorOptions: {type: Object, optional: true}, fieldColorOptions: {type: Object, optional: true},
}; };
KanbanMany2OneAvatarField.props = {
...KanbanMany2OneAvatarField.props,
fieldColor: {type: String, optional: true},
fieldColorOptions: {type: Object, optional: true},
};
Many2OneAvatarField.props = { Many2OneAvatarField.props = {
...Many2OneAvatarField.props, ...Many2OneAvatarField.props,
noSearchMore: {type: Boolean, optional: true}, noSearchMore: {type: Boolean, optional: true},