From 844be3a9dd39ff23f9fcd207a5177dea1fe56589 Mon Sep 17 00:00:00 2001
From: Alexandre Fayolle <alexandre.fayolle@camptocamp.com>
Date: Mon, 14 Oct 2019 13:07:03 +0200
Subject: [PATCH] [FIX] agreement_legal: lint warnings

[UPD] Update agreement_legal.pot

Update translation files

Updated by "Update PO files to match POT (msgmerge)" hook in Weblate.

Translation: contract-12.0/contract-12.0-agreement_legal
Translate-URL: https://translation.odoo-community.org/projects/contract-12-0/contract-12-0-agreement_legal/
---
 agreement_legal/i18n/agreement_legal.pot      |  33 +-
 agreement_legal/i18n/fr.po                    |  44 +--
 agreement_legal/i18n/pt_PT.po                 |  33 +-
 agreement_legal/i18n/zh_CN.po                 | 112 +++---
 .../static/src/js/domain_widget_ext.js        |  29 +-
 .../static/src/xml/domain_widget_view.xml     | 328 +++++++++---------
 6 files changed, 267 insertions(+), 312 deletions(-)

diff --git a/agreement_legal/i18n/agreement_legal.pot b/agreement_legal/i18n/agreement_legal.pot
index fee1fa92f..75fc6b2a0 100644
--- a/agreement_legal/i18n/agreement_legal.pot
+++ b/agreement_legal/i18n/agreement_legal.pot
@@ -179,14 +179,12 @@ msgstr ""
 #: model:ir.model.fields,field_description:agreement_legal.field_agreement__agreement_type_id
 #: model:ir.model.fields,field_description:agreement_legal.field_agreement_subtype__agreement_type_id
 #: model_terms:ir.ui.view,arch_db:agreement_legal.partner_agreement_subtype_list_view
-#: model_terms:ir.ui.view,arch_db:agreement_legal.partner_agreement_type_form_view
 msgid "Agreement Type"
 msgstr ""
 
 #. module: agreement_legal
 #: model:ir.actions.act_window,name:agreement_legal.partner_agreement_action_type
 #: model:ir.model,name:agreement_legal.model_agreement_type
-#: model_terms:ir.ui.view,arch_db:agreement_legal.partner_agreement_type_list_view
 msgid "Agreement Types"
 msgstr ""
 
@@ -420,7 +418,6 @@ msgstr ""
 #: model:ir.model.fields,field_description:agreement_legal.field_agreement_section__create_uid
 #: model:ir.model.fields,field_description:agreement_legal.field_agreement_stage__create_uid
 #: model:ir.model.fields,field_description:agreement_legal.field_agreement_subtype__create_uid
-#: model:ir.model.fields,field_description:agreement_legal.field_agreement_type__create_uid
 msgid "Created by"
 msgstr ""
 
@@ -434,7 +431,6 @@ msgstr ""
 #: model:ir.model.fields,field_description:agreement_legal.field_agreement_section__create_date
 #: model:ir.model.fields,field_description:agreement_legal.field_agreement_stage__create_date
 #: model:ir.model.fields,field_description:agreement_legal.field_agreement_subtype__create_date
-#: model:ir.model.fields,field_description:agreement_legal.field_agreement_type__create_date
 msgid "Created on"
 msgstr ""
 
@@ -527,7 +523,6 @@ msgstr ""
 #: model:ir.model.fields,field_description:agreement_legal.field_agreement_section__display_name
 #: model:ir.model.fields,field_description:agreement_legal.field_agreement_stage__display_name
 #: model:ir.model.fields,field_description:agreement_legal.field_agreement_subtype__display_name
-#: model:ir.model.fields,field_description:agreement_legal.field_agreement_type__display_name
 msgid "Display Name"
 msgstr ""
 
@@ -651,7 +646,6 @@ msgstr ""
 #: model:ir.model.fields,field_description:agreement_legal.field_agreement_section__id
 #: model:ir.model.fields,field_description:agreement_legal.field_agreement_stage__id
 #: model:ir.model.fields,field_description:agreement_legal.field_agreement_subtype__id
-#: model:ir.model.fields,field_description:agreement_legal.field_agreement_type__id
 msgid "ID"
 msgstr ""
 
@@ -726,11 +720,6 @@ msgstr ""
 msgid "Is Folded"
 msgstr ""
 
-#. module: agreement_legal
-#: model:ir.model.fields,field_description:agreement_legal.field_agreement__is_template
-msgid "Is a Template?"
-msgstr ""
-
 #. module: agreement_legal
 #: model:ir.model.fields,field_description:agreement_legal.field_agreement_appendix____last_update
 #: model:ir.model.fields,field_description:agreement_legal.field_agreement_clause____last_update
@@ -741,7 +730,6 @@ msgstr ""
 #: model:ir.model.fields,field_description:agreement_legal.field_agreement_section____last_update
 #: model:ir.model.fields,field_description:agreement_legal.field_agreement_stage____last_update
 #: model:ir.model.fields,field_description:agreement_legal.field_agreement_subtype____last_update
-#: model:ir.model.fields,field_description:agreement_legal.field_agreement_type____last_update
 msgid "Last Modified on"
 msgstr ""
 
@@ -755,7 +743,6 @@ msgstr ""
 #: model:ir.model.fields,field_description:agreement_legal.field_agreement_section__write_uid
 #: model:ir.model.fields,field_description:agreement_legal.field_agreement_stage__write_uid
 #: model:ir.model.fields,field_description:agreement_legal.field_agreement_subtype__write_uid
-#: model:ir.model.fields,field_description:agreement_legal.field_agreement_type__write_uid
 msgid "Last Updated by"
 msgstr ""
 
@@ -769,7 +756,6 @@ msgstr ""
 #: model:ir.model.fields,field_description:agreement_legal.field_agreement_section__write_date
 #: model:ir.model.fields,field_description:agreement_legal.field_agreement_stage__write_date
 #: model:ir.model.fields,field_description:agreement_legal.field_agreement_subtype__write_date
-#: model:ir.model.fields,field_description:agreement_legal.field_agreement_type__write_date
 msgid "Last Updated on"
 msgstr ""
 
@@ -863,11 +849,6 @@ msgstr ""
 msgid "Maintenance"
 msgstr ""
 
-#. module: agreement_legal
-#: model:ir.model.fields,help:agreement_legal.field_agreement__is_template
-msgid "Make this agreement a template."
-msgstr ""
-
 #. module: agreement_legal
 #: model_terms:ir.ui.view,arch_db:agreement_legal.res_config_settings_view_form
 msgid "Manage maintenance agreements and contracts"
@@ -920,7 +901,6 @@ msgstr ""
 #: model:ir.model.fields,field_description:agreement_legal.field_agreement_recital__name
 #: model:ir.model.fields,field_description:agreement_legal.field_agreement_section__name
 #: model:ir.model.fields,field_description:agreement_legal.field_agreement_subtype__name
-#: model:ir.model.fields,field_description:agreement_legal.field_agreement_type__name
 msgid "Name"
 msgstr ""
 
@@ -930,9 +910,9 @@ msgid "Name:"
 msgstr ""
 
 #. module: agreement_legal
-#: code:addons/agreement_legal/models/agreement.py:84
-#: code:addons/agreement_legal/models/agreement.py:365
-#: code:addons/agreement_legal/models/agreement.py:368
+#: code:addons/agreement_legal/models/agreement.py:79
+#: code:addons/agreement_legal/models/agreement.py:358
+#: code:addons/agreement_legal/models/agreement.py:361
 #, python-format
 msgid "New"
 msgstr ""
@@ -1317,7 +1297,7 @@ msgstr ""
 
 #. module: agreement_legal
 #: model:ir.model.fields,help:agreement_legal.field_agreement__agreement_type_id
-msgid "Select the type of agreement."
+msgid "Select the type of agreement"
 msgstr ""
 
 #. module: agreement_legal
@@ -1569,11 +1549,6 @@ msgstr ""
 msgid "Type"
 msgstr ""
 
-#. module: agreement_legal
-#: model_terms:ir.ui.view,arch_db:agreement_legal.partner_agreement_type_list_view
-msgid "Type Name"
-msgstr ""
-
 #. module: agreement_legal
 #: model:ir.ui.menu,name:agreement_legal.agreement_types
 msgid "Types"
diff --git a/agreement_legal/i18n/fr.po b/agreement_legal/i18n/fr.po
index 492cb4ca6..cd0b6d2dc 100644
--- a/agreement_legal/i18n/fr.po
+++ b/agreement_legal/i18n/fr.po
@@ -183,14 +183,12 @@ msgstr "Sous-types de l'accord"
 #: model:ir.model.fields,field_description:agreement_legal.field_agreement__agreement_type_id
 #: model:ir.model.fields,field_description:agreement_legal.field_agreement_subtype__agreement_type_id
 #: model_terms:ir.ui.view,arch_db:agreement_legal.partner_agreement_subtype_list_view
-#: model_terms:ir.ui.view,arch_db:agreement_legal.partner_agreement_type_form_view
 msgid "Agreement Type"
 msgstr "Type de l'accord"
 
 #. module: agreement_legal
 #: model:ir.actions.act_window,name:agreement_legal.partner_agreement_action_type
 #: model:ir.model,name:agreement_legal.model_agreement_type
-#: model_terms:ir.ui.view,arch_db:agreement_legal.partner_agreement_type_list_view
 msgid "Agreement Types"
 msgstr "Types de l'accord"
 
@@ -431,7 +429,6 @@ msgstr "Créer un contrat lorsque la commande client est confirmée"
 #: model:ir.model.fields,field_description:agreement_legal.field_agreement_section__create_uid
 #: model:ir.model.fields,field_description:agreement_legal.field_agreement_stage__create_uid
 #: model:ir.model.fields,field_description:agreement_legal.field_agreement_subtype__create_uid
-#: model:ir.model.fields,field_description:agreement_legal.field_agreement_type__create_uid
 msgid "Created by"
 msgstr "Créé par"
 
@@ -445,7 +442,6 @@ msgstr "Créé par"
 #: model:ir.model.fields,field_description:agreement_legal.field_agreement_section__create_date
 #: model:ir.model.fields,field_description:agreement_legal.field_agreement_stage__create_date
 #: model:ir.model.fields,field_description:agreement_legal.field_agreement_subtype__create_date
-#: model:ir.model.fields,field_description:agreement_legal.field_agreement_type__create_date
 msgid "Created on"
 msgstr "Créé le"
 
@@ -538,7 +534,6 @@ msgstr "Description du type de renouvellement."
 #: model:ir.model.fields,field_description:agreement_legal.field_agreement_section__display_name
 #: model:ir.model.fields,field_description:agreement_legal.field_agreement_stage__display_name
 #: model:ir.model.fields,field_description:agreement_legal.field_agreement_subtype__display_name
-#: model:ir.model.fields,field_description:agreement_legal.field_agreement_type__display_name
 msgid "Display Name"
 msgstr "Nom affiché"
 
@@ -665,7 +660,6 @@ msgstr "Assistance"
 #: model:ir.model.fields,field_description:agreement_legal.field_agreement_section__id
 #: model:ir.model.fields,field_description:agreement_legal.field_agreement_stage__id
 #: model:ir.model.fields,field_description:agreement_legal.field_agreement_subtype__id
-#: model:ir.model.fields,field_description:agreement_legal.field_agreement_type__id
 msgid "ID"
 msgstr "ID"
 
@@ -752,11 +746,6 @@ msgstr "Inventaire"
 msgid "Is Folded"
 msgstr "Est replié"
 
-#. module: agreement_legal
-#: model:ir.model.fields,field_description:agreement_legal.field_agreement__is_template
-msgid "Is a Template?"
-msgstr "Modèle ?"
-
 #. module: agreement_legal
 #: model:ir.model.fields,field_description:agreement_legal.field_agreement_appendix____last_update
 #: model:ir.model.fields,field_description:agreement_legal.field_agreement_clause____last_update
@@ -767,7 +756,6 @@ msgstr "Modèle ?"
 #: model:ir.model.fields,field_description:agreement_legal.field_agreement_section____last_update
 #: model:ir.model.fields,field_description:agreement_legal.field_agreement_stage____last_update
 #: model:ir.model.fields,field_description:agreement_legal.field_agreement_subtype____last_update
-#: model:ir.model.fields,field_description:agreement_legal.field_agreement_type____last_update
 msgid "Last Modified on"
 msgstr "Dernière modification le"
 
@@ -781,7 +769,6 @@ msgstr "Dernière modification le"
 #: model:ir.model.fields,field_description:agreement_legal.field_agreement_section__write_uid
 #: model:ir.model.fields,field_description:agreement_legal.field_agreement_stage__write_uid
 #: model:ir.model.fields,field_description:agreement_legal.field_agreement_subtype__write_uid
-#: model:ir.model.fields,field_description:agreement_legal.field_agreement_type__write_uid
 msgid "Last Updated by"
 msgstr "Dernière mise à jour par"
 
@@ -795,7 +782,6 @@ msgstr "Dernière mise à jour par"
 #: model:ir.model.fields,field_description:agreement_legal.field_agreement_section__write_date
 #: model:ir.model.fields,field_description:agreement_legal.field_agreement_stage__write_date
 #: model:ir.model.fields,field_description:agreement_legal.field_agreement_subtype__write_date
-#: model:ir.model.fields,field_description:agreement_legal.field_agreement_type__write_date
 msgid "Last Updated on"
 msgstr "Dernière mise à jour le"
 
@@ -897,11 +883,6 @@ msgstr "Liez vos transferts à un accord"
 msgid "Maintenance"
 msgstr "Entretien"
 
-#. module: agreement_legal
-#: model:ir.model.fields,help:agreement_legal.field_agreement__is_template
-msgid "Make this agreement a template."
-msgstr "Faites de cet accord un modèle."
-
 #. module: agreement_legal
 #: model_terms:ir.ui.view,arch_db:agreement_legal.res_config_settings_view_form
 msgid "Manage maintenance agreements and contracts"
@@ -954,7 +935,6 @@ msgstr "Faites correspondre les enregistrements avec la règle suivante:"
 #: model:ir.model.fields,field_description:agreement_legal.field_agreement_recital__name
 #: model:ir.model.fields,field_description:agreement_legal.field_agreement_section__name
 #: model:ir.model.fields,field_description:agreement_legal.field_agreement_subtype__name
-#: model:ir.model.fields,field_description:agreement_legal.field_agreement_type__name
 msgid "Name"
 msgstr "Nom"
 
@@ -964,9 +944,9 @@ msgid "Name:"
 msgstr "Nom :"
 
 #. module: agreement_legal
-#: code:addons/agreement_legal/models/agreement.py:84
-#: code:addons/agreement_legal/models/agreement.py:365
-#: code:addons/agreement_legal/models/agreement.py:368
+#: code:addons/agreement_legal/models/agreement.py:79
+#: code:addons/agreement_legal/models/agreement.py:358
+#: code:addons/agreement_legal/models/agreement.py:361
 #, python-format
 msgid "New"
 msgstr "Nouveau"
@@ -1358,7 +1338,9 @@ msgstr ""
 
 #. module: agreement_legal
 #: model:ir.model.fields,help:agreement_legal.field_agreement__agreement_type_id
-msgid "Select the type of agreement."
+#, fuzzy
+#| msgid "Select the type of agreement."
+msgid "Select the type of agreement"
 msgstr "Sélectionnez le type d'accord."
 
 #. module: agreement_legal
@@ -1636,11 +1618,6 @@ msgstr "Titre :"
 msgid "Type"
 msgstr "Type"
 
-#. module: agreement_legal
-#: model_terms:ir.ui.view,arch_db:agreement_legal.partner_agreement_type_list_view
-msgid "Type Name"
-msgstr "Nom du type"
-
 #. module: agreement_legal
 #: model:ir.ui.menu,name:agreement_legal.agreement_types
 msgid "Types"
@@ -1787,6 +1764,15 @@ msgstr "| Créé par :"
 msgid "|  Created On:"
 msgstr "| Créé le :"
 
+#~ msgid "Is a Template?"
+#~ msgstr "Modèle ?"
+
+#~ msgid "Make this agreement a template."
+#~ msgstr "Faites de cet accord un modèle."
+
+#~ msgid "Type Name"
+#~ msgstr "Nom du type"
+
 #~ msgid "Agreements Form"
 #~ msgstr "Formulaire des accords"
 
diff --git a/agreement_legal/i18n/pt_PT.po b/agreement_legal/i18n/pt_PT.po
index 0baed96d7..8d126d734 100644
--- a/agreement_legal/i18n/pt_PT.po
+++ b/agreement_legal/i18n/pt_PT.po
@@ -182,14 +182,12 @@ msgstr "Subtipos"
 #: model:ir.model.fields,field_description:agreement_legal.field_agreement__agreement_type_id
 #: model:ir.model.fields,field_description:agreement_legal.field_agreement_subtype__agreement_type_id
 #: model_terms:ir.ui.view,arch_db:agreement_legal.partner_agreement_subtype_list_view
-#: model_terms:ir.ui.view,arch_db:agreement_legal.partner_agreement_type_form_view
 msgid "Agreement Type"
 msgstr "Tipo"
 
 #. module: agreement_legal
 #: model:ir.actions.act_window,name:agreement_legal.partner_agreement_action_type
 #: model:ir.model,name:agreement_legal.model_agreement_type
-#: model_terms:ir.ui.view,arch_db:agreement_legal.partner_agreement_type_list_view
 msgid "Agreement Types"
 msgstr "Tipos"
 
@@ -427,7 +425,6 @@ msgstr "Criar um contrato quando a encomenda for confirmada"
 #: model:ir.model.fields,field_description:agreement_legal.field_agreement_section__create_uid
 #: model:ir.model.fields,field_description:agreement_legal.field_agreement_stage__create_uid
 #: model:ir.model.fields,field_description:agreement_legal.field_agreement_subtype__create_uid
-#: model:ir.model.fields,field_description:agreement_legal.field_agreement_type__create_uid
 msgid "Created by"
 msgstr "Criado por"
 
@@ -441,7 +438,6 @@ msgstr "Criado por"
 #: model:ir.model.fields,field_description:agreement_legal.field_agreement_section__create_date
 #: model:ir.model.fields,field_description:agreement_legal.field_agreement_stage__create_date
 #: model:ir.model.fields,field_description:agreement_legal.field_agreement_subtype__create_date
-#: model:ir.model.fields,field_description:agreement_legal.field_agreement_type__create_date
 msgid "Created on"
 msgstr "Criado em"
 
@@ -534,7 +530,6 @@ msgstr ""
 #: model:ir.model.fields,field_description:agreement_legal.field_agreement_section__display_name
 #: model:ir.model.fields,field_description:agreement_legal.field_agreement_stage__display_name
 #: model:ir.model.fields,field_description:agreement_legal.field_agreement_subtype__display_name
-#: model:ir.model.fields,field_description:agreement_legal.field_agreement_type__display_name
 msgid "Display Name"
 msgstr ""
 
@@ -659,7 +654,6 @@ msgstr ""
 #: model:ir.model.fields,field_description:agreement_legal.field_agreement_section__id
 #: model:ir.model.fields,field_description:agreement_legal.field_agreement_stage__id
 #: model:ir.model.fields,field_description:agreement_legal.field_agreement_subtype__id
-#: model:ir.model.fields,field_description:agreement_legal.field_agreement_type__id
 msgid "ID"
 msgstr ""
 
@@ -738,11 +732,6 @@ msgstr ""
 msgid "Is Folded"
 msgstr ""
 
-#. module: agreement_legal
-#: model:ir.model.fields,field_description:agreement_legal.field_agreement__is_template
-msgid "Is a Template?"
-msgstr ""
-
 #. module: agreement_legal
 #: model:ir.model.fields,field_description:agreement_legal.field_agreement_appendix____last_update
 #: model:ir.model.fields,field_description:agreement_legal.field_agreement_clause____last_update
@@ -753,7 +742,6 @@ msgstr ""
 #: model:ir.model.fields,field_description:agreement_legal.field_agreement_section____last_update
 #: model:ir.model.fields,field_description:agreement_legal.field_agreement_stage____last_update
 #: model:ir.model.fields,field_description:agreement_legal.field_agreement_subtype____last_update
-#: model:ir.model.fields,field_description:agreement_legal.field_agreement_type____last_update
 msgid "Last Modified on"
 msgstr ""
 
@@ -767,7 +755,6 @@ msgstr ""
 #: model:ir.model.fields,field_description:agreement_legal.field_agreement_section__write_uid
 #: model:ir.model.fields,field_description:agreement_legal.field_agreement_stage__write_uid
 #: model:ir.model.fields,field_description:agreement_legal.field_agreement_subtype__write_uid
-#: model:ir.model.fields,field_description:agreement_legal.field_agreement_type__write_uid
 msgid "Last Updated by"
 msgstr ""
 
@@ -781,7 +768,6 @@ msgstr ""
 #: model:ir.model.fields,field_description:agreement_legal.field_agreement_section__write_date
 #: model:ir.model.fields,field_description:agreement_legal.field_agreement_stage__write_date
 #: model:ir.model.fields,field_description:agreement_legal.field_agreement_subtype__write_date
-#: model:ir.model.fields,field_description:agreement_legal.field_agreement_type__write_date
 msgid "Last Updated on"
 msgstr ""
 
@@ -878,11 +864,6 @@ msgstr ""
 msgid "Maintenance"
 msgstr ""
 
-#. module: agreement_legal
-#: model:ir.model.fields,help:agreement_legal.field_agreement__is_template
-msgid "Make this agreement a template."
-msgstr ""
-
 #. module: agreement_legal
 #: model_terms:ir.ui.view,arch_db:agreement_legal.res_config_settings_view_form
 msgid "Manage maintenance agreements and contracts"
@@ -935,7 +916,6 @@ msgstr ""
 #: model:ir.model.fields,field_description:agreement_legal.field_agreement_recital__name
 #: model:ir.model.fields,field_description:agreement_legal.field_agreement_section__name
 #: model:ir.model.fields,field_description:agreement_legal.field_agreement_subtype__name
-#: model:ir.model.fields,field_description:agreement_legal.field_agreement_type__name
 msgid "Name"
 msgstr ""
 
@@ -945,9 +925,9 @@ msgid "Name:"
 msgstr ""
 
 #. module: agreement_legal
-#: code:addons/agreement_legal/models/agreement.py:84
-#: code:addons/agreement_legal/models/agreement.py:365
-#: code:addons/agreement_legal/models/agreement.py:368
+#: code:addons/agreement_legal/models/agreement.py:79
+#: code:addons/agreement_legal/models/agreement.py:358
+#: code:addons/agreement_legal/models/agreement.py:361
 #, python-format
 msgid "New"
 msgstr ""
@@ -1335,7 +1315,7 @@ msgstr ""
 
 #. module: agreement_legal
 #: model:ir.model.fields,help:agreement_legal.field_agreement__agreement_type_id
-msgid "Select the type of agreement."
+msgid "Select the type of agreement"
 msgstr ""
 
 #. module: agreement_legal
@@ -1600,11 +1580,6 @@ msgstr ""
 msgid "Type"
 msgstr ""
 
-#. module: agreement_legal
-#: model_terms:ir.ui.view,arch_db:agreement_legal.partner_agreement_type_list_view
-msgid "Type Name"
-msgstr ""
-
 #. module: agreement_legal
 #: model:ir.ui.menu,name:agreement_legal.agreement_types
 msgid "Types"
diff --git a/agreement_legal/i18n/zh_CN.po b/agreement_legal/i18n/zh_CN.po
index 609b7c133..f5dacab22 100644
--- a/agreement_legal/i18n/zh_CN.po
+++ b/agreement_legal/i18n/zh_CN.po
@@ -1,6 +1,6 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
-#	* agreement_legal
+# 	* agreement_legal
 #
 msgid ""
 msgstr ""
@@ -182,14 +182,12 @@ msgstr "协议子类型"
 #: model:ir.model.fields,field_description:agreement_legal.field_agreement__agreement_type_id
 #: model:ir.model.fields,field_description:agreement_legal.field_agreement_subtype__agreement_type_id
 #: model_terms:ir.ui.view,arch_db:agreement_legal.partner_agreement_subtype_list_view
-#: model_terms:ir.ui.view,arch_db:agreement_legal.partner_agreement_type_form_view
 msgid "Agreement Type"
 msgstr "协议类型"
 
 #. module: agreement_legal
 #: model:ir.actions.act_window,name:agreement_legal.partner_agreement_action_type
 #: model:ir.model,name:agreement_legal.model_agreement_type
-#: model_terms:ir.ui.view,arch_db:agreement_legal.partner_agreement_type_list_view
 msgid "Agreement Types"
 msgstr "协议类型"
 
@@ -226,7 +224,9 @@ msgstr "协议类型表单"
 
 #. module: agreement_legal
 #: model:ir.model.fields,help:agreement_legal.field_agreement__special_terms
-msgid "Any terms that you have agreed to and want to track on the agreement/contract."
+msgid ""
+"Any terms that you have agreed to and want to track on the agreement/"
+"contract."
 msgstr "您同意并希望跟踪协议合同的任何条款。"
 
 #. module: agreement_legal
@@ -400,7 +400,9 @@ msgstr "复制并粘贴内容中的占位符表达式"
 
 #. module: agreement_legal
 #: model_terms:ir.ui.view,arch_db:agreement_legal.partner_agreement_form_view
-msgid "Copy and paste the placeholder expression in the description or the special terms"
+msgid ""
+"Copy and paste the placeholder expression in the description or the special "
+"terms"
 msgstr "复制并粘贴说明或特殊条款中的占位符表达式"
 
 #. module: agreement_legal
@@ -423,7 +425,6 @@ msgstr "确认销售订单时创建协议"
 #: model:ir.model.fields,field_description:agreement_legal.field_agreement_section__create_uid
 #: model:ir.model.fields,field_description:agreement_legal.field_agreement_stage__create_uid
 #: model:ir.model.fields,field_description:agreement_legal.field_agreement_subtype__create_uid
-#: model:ir.model.fields,field_description:agreement_legal.field_agreement_type__create_uid
 msgid "Created by"
 msgstr "创建者"
 
@@ -437,7 +438,6 @@ msgstr "创建者"
 #: model:ir.model.fields,field_description:agreement_legal.field_agreement_section__create_date
 #: model:ir.model.fields,field_description:agreement_legal.field_agreement_stage__create_date
 #: model:ir.model.fields,field_description:agreement_legal.field_agreement_subtype__create_date
-#: model:ir.model.fields,field_description:agreement_legal.field_agreement_type__create_date
 msgid "Created on"
 msgstr "创建时间"
 
@@ -530,7 +530,6 @@ msgstr "续订类型的说明。"
 #: model:ir.model.fields,field_description:agreement_legal.field_agreement_section__display_name
 #: model:ir.model.fields,field_description:agreement_legal.field_agreement_stage__display_name
 #: model:ir.model.fields,field_description:agreement_legal.field_agreement_subtype__display_name
-#: model:ir.model.fields,field_description:agreement_legal.field_agreement_type__display_name
 msgid "Display Name"
 msgstr "显示名称"
 
@@ -630,7 +629,8 @@ msgstr "文件名"
 #: model:ir.model.fields,help:agreement_legal.field_agreement_clause__copyvalue
 #: model:ir.model.fields,help:agreement_legal.field_agreement_recital__copyvalue
 #: model:ir.model.fields,help:agreement_legal.field_agreement_section__copyvalue
-msgid "Final placeholder expression, to be copy-pasted in the desired\n"
+msgid ""
+"Final placeholder expression, to be copy-pasted in the desired\n"
 "         template field."
 msgstr ""
 "最终的占位符表达式，可以在所需的位置进行复制粘贴\n"
@@ -656,7 +656,6 @@ msgstr "服务台"
 #: model:ir.model.fields,field_description:agreement_legal.field_agreement_section__id
 #: model:ir.model.fields,field_description:agreement_legal.field_agreement_stage__id
 #: model:ir.model.fields,field_description:agreement_legal.field_agreement_subtype__id
-#: model:ir.model.fields,field_description:agreement_legal.field_agreement_type__id
 msgid "ID"
 msgstr "ID"
 
@@ -669,17 +668,20 @@ msgstr "用于内部合同跟踪的ID。"
 #: model:ir.model.fields,help:agreement_legal.field_agreement__active
 #: model:ir.model.fields,help:agreement_legal.field_agreement_clause__active
 #: model:ir.model.fields,help:agreement_legal.field_agreement_section__active
-msgid "If unchecked, it will allow you to hide the agreement without removing it."
+msgid ""
+"If unchecked, it will allow you to hide the agreement without removing it."
 msgstr "如果不选中，它将允许您隐藏协议而不删除它。"
 
 #. module: agreement_legal
 #: model:ir.model.fields,help:agreement_legal.field_agreement_appendix__active
-msgid "If unchecked, it will allow you to hide this appendix without removing it."
+msgid ""
+"If unchecked, it will allow you to hide this appendix without removing it."
 msgstr "如果不选中，它将允许您隐藏此附录而不删除它。"
 
 #. module: agreement_legal
 #: model:ir.model.fields,help:agreement_legal.field_agreement_recital__active
-msgid "If unchecked, it will allow you to hide this recital without removing it."
+msgid ""
+"If unchecked, it will allow you to hide this recital without removing it."
 msgstr "如果不选中，它将允许您隐藏此叙述而不删除它。"
 
 #. module: agreement_legal
@@ -704,7 +706,8 @@ msgstr "增加类型"
 
 #. module: agreement_legal
 #: model:ir.model.fields,help:agreement_legal.field_agreement_increasetype__name
-msgid "Increase types describe any increases that may happen during the contract."
+msgid ""
+"Increase types describe any increases that may happen during the contract."
 msgstr "增加类型描述合同期间可能发生的任何增加。"
 
 #. module: agreement_legal
@@ -731,11 +734,6 @@ msgstr "库存"
 msgid "Is Folded"
 msgstr "是折叠"
 
-#. module: agreement_legal
-#: model:ir.model.fields,field_description:agreement_legal.field_agreement__is_template
-msgid "Is a Template?"
-msgstr "是模板吗？"
-
 #. module: agreement_legal
 #: model:ir.model.fields,field_description:agreement_legal.field_agreement_appendix____last_update
 #: model:ir.model.fields,field_description:agreement_legal.field_agreement_clause____last_update
@@ -746,7 +744,6 @@ msgstr "是模板吗？"
 #: model:ir.model.fields,field_description:agreement_legal.field_agreement_section____last_update
 #: model:ir.model.fields,field_description:agreement_legal.field_agreement_stage____last_update
 #: model:ir.model.fields,field_description:agreement_legal.field_agreement_subtype____last_update
-#: model:ir.model.fields,field_description:agreement_legal.field_agreement_type____last_update
 msgid "Last Modified on"
 msgstr "最后修改时间"
 
@@ -760,7 +757,6 @@ msgstr "最后修改时间"
 #: model:ir.model.fields,field_description:agreement_legal.field_agreement_section__write_uid
 #: model:ir.model.fields,field_description:agreement_legal.field_agreement_stage__write_uid
 #: model:ir.model.fields,field_description:agreement_legal.field_agreement_subtype__write_uid
-#: model:ir.model.fields,field_description:agreement_legal.field_agreement_type__write_uid
 msgid "Last Updated by"
 msgstr "最后更新者"
 
@@ -774,14 +770,18 @@ msgstr "最后更新者"
 #: model:ir.model.fields,field_description:agreement_legal.field_agreement_section__write_date
 #: model:ir.model.fields,field_description:agreement_legal.field_agreement_stage__write_date
 #: model:ir.model.fields,field_description:agreement_legal.field_agreement_subtype__write_date
-#: model:ir.model.fields,field_description:agreement_legal.field_agreement_type__write_date
 msgid "Last Updated on"
 msgstr "最后更新时间"
 
 #. module: agreement_legal
 #: model:ir.model.fields,help:agreement_legal.field_agreement__parent_agreement_id
-msgid "Link this agreement to a parent agreement. For example if this agreement is an amendment to another agreement. This list will only show other agreements related to the same account."
-msgstr "将此协议链接到父协议。例如，如果本协议是对另一协议的修正。此列表仅显示与同一帐户相关的其他协议。"
+msgid ""
+"Link this agreement to a parent agreement. For example if this agreement is "
+"an amendment to another agreement. This list will only show other agreements "
+"related to the same account."
+msgstr ""
+"将此协议链接到父协议。例如，如果本协议是对另一协议的修正。此列表仅显示与同一"
+"帐户相关的其他协议。"
 
 #. module: agreement_legal
 #: model_terms:ir.ui.view,arch_db:agreement_legal.res_config_settings_view_form
@@ -868,11 +868,6 @@ msgstr "将您的调拨链接到协议"
 msgid "Maintenance"
 msgstr "维护"
 
-#. module: agreement_legal
-#: model:ir.model.fields,help:agreement_legal.field_agreement__is_template
-msgid "Make this agreement a template."
-msgstr "将此协议设为模板。"
-
 #. module: agreement_legal
 #: model_terms:ir.ui.view,arch_db:agreement_legal.res_config_settings_view_form
 msgid "Manage maintenance agreements and contracts"
@@ -925,7 +920,6 @@ msgstr "将记录与以下规则匹配："
 #: model:ir.model.fields,field_description:agreement_legal.field_agreement_recital__name
 #: model:ir.model.fields,field_description:agreement_legal.field_agreement_section__name
 #: model:ir.model.fields,field_description:agreement_legal.field_agreement_subtype__name
-#: model:ir.model.fields,field_description:agreement_legal.field_agreement_type__name
 msgid "Name"
 msgstr "名称"
 
@@ -935,9 +929,9 @@ msgid "Name:"
 msgstr "名称："
 
 #. module: agreement_legal
-#: code:addons/agreement_legal/models/agreement.py:84
-#: code:addons/agreement_legal/models/agreement.py:365
-#: code:addons/agreement_legal/models/agreement.py:368
+#: code:addons/agreement_legal/models/agreement.py:79
+#: code:addons/agreement_legal/models/agreement.py:358
+#: code:addons/agreement_legal/models/agreement.py:361
 #, python-format
 msgid "New"
 msgstr "新建"
@@ -1199,7 +1193,8 @@ msgstr "续订类型"
 
 #. module: agreement_legal
 #: model:ir.model.fields,help:agreement_legal.field_agreement_renewaltype__name
-msgid "Renewal types describe what happens after the agreement/contract expires."
+msgid ""
+"Renewal types describe what happens after the agreement/contract expires."
 msgstr "续订类型描述协议到期后会发生什么。"
 
 #. module: agreement_legal
@@ -1317,12 +1312,16 @@ msgstr "使用弹出窗口选择字段"
 
 #. module: agreement_legal
 #: model:ir.model.fields,help:agreement_legal.field_agreement__agreement_subtype_id
-msgid "Select the sub-type of this agreement. Sub-Types are related to agreement types."
+msgid ""
+"Select the sub-type of this agreement. Sub-Types are related to agreement "
+"types."
 msgstr "选择此协议的子类型。子类型与协议类型相关。"
 
 #. module: agreement_legal
 #: model:ir.model.fields,help:agreement_legal.field_agreement__agreement_type_id
-msgid "Select the type of agreement."
+#, fuzzy
+#| msgid "Select the type of agreement."
+msgid "Select the type of agreement"
 msgstr "选择协议类型。"
 
 #. module: agreement_legal
@@ -1475,7 +1474,9 @@ msgstr "终止请求日期"
 
 #. module: agreement_legal
 #: model:ir.model.fields,help:agreement_legal.field_agreement__notification_address_id
-msgid "The address to send notificaitons to, if different from customer address.(Address Type = Other)"
+msgid ""
+"The address to send notificaitons to, if different from customer address."
+"(Address Type = Other)"
 msgstr "发送通知的地址，如果与客户地址不同。（地址类型=其他）"
 
 #. module: agreement_legal
@@ -1517,12 +1518,15 @@ msgstr "标题显示在PDF上。这个名字不是。"
 
 #. module: agreement_legal
 #: model:ir.model.fields,help:agreement_legal.field_agreement__company_signed_user_id
-msgid "The user at our company who authorized/signed the agreement or contract."
+msgid ""
+"The user at our company who authorized/signed the agreement or contract."
 msgstr "我们公司的用户授权/签署协议。"
 
 #. module: agreement_legal
 #: model:ir.model.fields,help:agreement_legal.field_agreement__version
-msgid "The versions are used to keep track of document history and previous versions can be referenced."
+msgid ""
+"The versions are used to keep track of document history and previous "
+"versions can be referenced."
 msgstr "这些版本用于跟踪文档历史记录，可以引用以前的版本。"
 
 #. module: agreement_legal
@@ -1530,22 +1534,30 @@ msgstr "这些版本用于跟踪文档历史记录，可以引用以前的版本
 #: model_terms:ir.ui.view,arch_db:agreement_legal.agreement_recital_form
 #: model_terms:ir.ui.view,arch_db:agreement_legal.partner_agreement_clause_form_view
 #: model_terms:ir.ui.view,arch_db:agreement_legal.partner_agreement_section_form_view
-msgid "This section (on the left) allows you to add dynamic fields inside the content."
+msgid ""
+"This section (on the left) allows you to add dynamic fields inside the "
+"content."
 msgstr "此部分（左侧）允许您在内容中添加动态字段。"
 
 #. module: agreement_legal
 #: model_terms:ir.ui.view,arch_db:agreement_legal.partner_agreement_form_view
-msgid "This section (on the left) allows you to add dynamic fields inside the description and special terms."
+msgid ""
+"This section (on the left) allows you to add dynamic fields inside the "
+"description and special terms."
 msgstr "此部分（左侧）允许您在说明和特殊条款中添加动态字段。"
 
 #. module: agreement_legal
 #: model_terms:ir.ui.view,arch_db:agreement_legal.partner_agreement_form_view
-msgid "This section (on the left) allows you to replace the default listing of the parties with custom dynamic content."
+msgid ""
+"This section (on the left) allows you to replace the default listing of the "
+"parties with custom dynamic content."
 msgstr "此部分（左侧）允许您使用自定义动态内容替换缔约方的默认列表。"
 
 #. module: agreement_legal
 #: model_terms:ir.ui.view,arch_db:agreement_legal.partner_agreement_form_view
-msgid "This section is a place where financial records will show the current performance of this agreement."
+msgid ""
+"This section is a place where financial records will show the current "
+"performance of this agreement."
 msgstr "此部分是财务记录显示本协议当前执行情况的地方。"
 
 #. module: agreement_legal
@@ -1574,11 +1586,6 @@ msgstr "标题："
 msgid "Type"
 msgstr "类型"
 
-#. module: agreement_legal
-#: model_terms:ir.ui.view,arch_db:agreement_legal.partner_agreement_type_list_view
-msgid "Type Name"
-msgstr "类型名称"
-
 #. module: agreement_legal
 #: model:ir.ui.menu,name:agreement_legal.agreement_types
 msgid "Types"
@@ -1724,3 +1731,12 @@ msgstr "|  创建者:"
 #: model_terms:ir.ui.view,arch_db:agreement_legal.partner_agreement_form_view
 msgid "|  Created On:"
 msgstr "|  创建于："
+
+#~ msgid "Is a Template?"
+#~ msgstr "是模板吗？"
+
+#~ msgid "Make this agreement a template."
+#~ msgstr "将此协议设为模板。"
+
+#~ msgid "Type Name"
+#~ msgstr "类型名称"
diff --git a/agreement_legal/static/src/js/domain_widget_ext.js b/agreement_legal/static/src/js/domain_widget_ext.js
index 11da12f66..adfedb431 100644
--- a/agreement_legal/static/src/js/domain_widget_ext.js
+++ b/agreement_legal/static/src/js/domain_widget_ext.js
@@ -17,10 +17,10 @@ odoo.define('agreement_legal.domain_widget_ext', function (require) {
             // Add Additional options
             this.partialUse = this.nodeOptions.partial_use || false;
         },
-        
-        //--------------------------------------------------------------------------
+
+        //----------------------------------------------------------------------
         // Private
-        //--------------------------------------------------------------------------
+        //----------------------------------------------------------------------
 
         /**
          * @private
@@ -37,15 +37,17 @@ odoo.define('agreement_legal.domain_widget_ext', function (require) {
             // Convert char value to array value
             var value = this.value || "[]";
 
-            // Create the domain selector or change the value of the current one...
+            // Create the domain selector or change the value of the current
+            // one...
             var def;
             if (!this.domainSelector) {
-                this.domainSelector = new DomainSelector(this, this._domainModel, value, {
-                    readonly: this.mode === "readonly" || this.inDialog,
-                    filters: this.fsFilters,
-                    debugMode: session.debug,
-                    partialUse: this.partialUse || false,
-                });
+                this.domainSelector = new DomainSelector(
+                    this, this._domainModel, value, {
+                        readonly: this.mode === "readonly" || this.inDialog,
+                        filters: this.fsFilters,
+                        debugMode: session.debug,
+                        partialUse: this.partialUse || false,
+                    });
                 def = this.domainSelector.prependTo(this.$el);
             } else {
                 def = this.domainSelector.setDomain(value);
@@ -54,9 +56,10 @@ odoo.define('agreement_legal.domain_widget_ext', function (require) {
             return def.then(this._replaceContent.bind(this));
         },
         /**
-         * Render the field DOM except for the domain selector part. The full field
-         * DOM is composed of a DIV which contains the domain selector widget,
-         * followed by other content. This other content is handled by this method.
+         * Render the field DOM except for the domain selector part. The full
+         * field DOM is composed of a DIV which contains the domain selector
+         * widget, followed by other content. This other content is handled by
+         * this method.
          *
          * @private
          */
diff --git a/agreement_legal/static/src/xml/domain_widget_view.xml b/agreement_legal/static/src/xml/domain_widget_view.xml
index 580d1a2ec..426942532 100644
--- a/agreement_legal/static/src/xml/domain_widget_view.xml
+++ b/agreement_legal/static/src/xml/domain_widget_view.xml
@@ -1,179 +1,179 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <templates id="template" xml:space="preserve">
-<t t-name="FieldDomain.content">
-    <t t-if="partialUse">
-    <div t-if="hasModel" class="o_field_domain_panel">
-        <!--<div t-if="hasModel" class="o_field_domain_panel">
-            <i class="fa fa-arrow-right" role="img" aria-label="Domain" title="Domain"/>
-    
-            <button t-if="isValid" class="btn btn-sm btn-secondary o_domain_show_selection_button" type="button">
-                <t t-esc="nbRecords"/> record(s)
-            </button>
-            <span t-else="" class="text-warning" role="alert"><i class="fa fa-exclamation-triangle" role="img" aria-label="Warning" title="Warning"/> Invalid domain</span>
-    
-            <button t-if="inDialogEdit" class="btn btn-sm btn-primary o_field_domain_dialog_button">Edit Domain</button>
-        </div>
-        <div t-else="">Select a model to add a filter.</div>-->
-    </div>
-    </t>
-    <t t-if="!partialUse">
-	    <div t-if="hasModel" class="o_field_domain_panel">
-	        <i class="fa fa-arrow-right" role="img" aria-label="Domain" title="Domain"/>
-	
-	        <button t-if="isValid" class="btn btn-sm btn-secondary o_domain_show_selection_button" type="button">
-	            <t t-esc="nbRecords"/> record(s)
-	        </button>
-	        <span t-else="" class="text-warning" role="alert"><i class="fa fa-exclamation-triangle" role="img" aria-label="Warning" title="Warning"/> Invalid domain</span>
-	
-	        <button t-if="inDialogEdit" class="btn btn-sm btn-primary o_field_domain_dialog_button">Edit Domain</button>
-	    </div>
-	    <div t-else="">Select a model to add a filter.</div>
-	</t>
-</t>
+    <t t-name="FieldDomain.content">
+        <t t-if="partialUse">
+            <div t-if="hasModel" class="o_field_domain_panel">
+                <!--<div t-if="hasModel" class="o_field_domain_panel">
+                    <i class="fa fa-arrow-right" role="img" aria-label="Domain" title="Domain"/>
 
-<div aria-atomic="true" t-name="DomainSelector" t-attf-class="o_domain_node o_domain_tree o_domain_selector #{widget.readonly ? 'o_read_mode' : 'o_edit_mode'}">
-    <t t-if="widget.options.partialUse">
-        <t t-if="widget.children.length === 0">
-            <span>SMatch <strong>all records</strong></span>
-            <button t-if="!widget.readonly" class="btn btn-sm btn-primary o_domain_add_first_node_button"><i class="fa fa-plus"/> Add filter</button>
+                    <button t-if="isValid" class="btn btn-sm btn-secondary o_domain_show_selection_button" type="button">
+                    <t t-esc="nbRecords"/> record(s)
+                    </button>
+                    <span t-else="" class="text-warning" role="alert"><i class="fa fa-exclamation-triangle" role="img" aria-label="Warning" title="Warning"/> Invalid domain</span>
+
+                    <button t-if="inDialogEdit" class="btn btn-sm btn-primary o_field_domain_dialog_button">Edit Domain</button>
+                    </div>
+                    <div t-else="">Select a model to add a filter.</div>-->
+            </div>
         </t>
-	    <t t-else="">
-	        <div class="o_domain_tree_header">
-	            <t t-if="widget.children.length === 1">Please navigate below and select field:</t>
-	            <t t-else="">
-	                <span>SSMatch records with</span>
-	                <t t-call="DomainTree.OperatorSelector"/>
-	                <span>of the following rules:</span>
-	            </t>
-	        </div>
-	
-	        <div class="o_domain_node_children_container"/>
-	    </t>
-    </t>
-    <t t-if="!widget.options.partialUse">
-        <t t-if="widget.children.length === 0">
-	        <span>Match <strong>all records</strong></span>
-	        <button t-if="!widget.readonly" class="btn btn-sm btn-primary o_domain_add_first_node_button"><i class="fa fa-plus"/> Add filter</button>
-	    </t>
-	    <t t-else="">
-	        <div class="o_domain_tree_header">
-	            <t t-if="widget.children.length === 1">Match records with the following rule:</t>
-	            <t t-else="">
-	                <span>Match records with</span>
-	                <t t-call="DomainTree.OperatorSelector"/>
-	                <span>of the following rules:</span>
-	            </t>
-	        </div>
-	
-	        <div class="o_domain_node_children_container"/>
-	    </t>
-	    
-	    <label t-if="widget.debug &amp;&amp; !widget.readonly" class="o_domain_debug_container">
-	        <span class="small"># Code editor</span>
-	        <input type="text" class="o_domain_debug_input"/>
-	    </label>
-    </t>
-</div>
-<t t-name="DomainNode.ControlPanel">
-    <t t-if="widget.options.partialUse">
-	    <div t-if="!widget.readonly &amp;&amp; !widget.noControlPanel" class="o_domain_node_control_panel" role="toolbar" aria-label="Domain node">
-	    </div>
-    </t>
-    <t t-if="!widget.options.partialUse">
-	    <div t-if="!widget.readonly &amp;&amp; !widget.noControlPanel" class="o_domain_node_control_panel" role="toolbar" aria-label="Domain node">
-	        <button class="btn o_domain_delete_node_button" title="Delete node" aria-label="Delete node"><i class="fa fa-times"/></button>
-	        <button class="btn o_domain_add_node_button" title="Add node" aria-label="Add node"><i class="fa fa-plus-circle"/></button>
-	        <button class="btn o_domain_add_node_button" title="Add branch" aria-label="Add branch" data-branch="1"><i class="fa fa-ellipsis-h"/></button>
-	    </div>
-    </t>
-</t>
-<div t-name="DomainLeaf" t-attf-class="o_domain_node o_domain_leaf o_domain_selector_row #{widget.readonly ? 'o_read_mode' : 'o_edit_mode'}">
-    <t t-call="DomainNode.ControlPanel"/>
+        <t t-if="!partialUse">
+            <div t-if="hasModel" class="o_field_domain_panel">
+                <i class="fa fa-arrow-right" role="img" aria-label="Domain" title="Domain"/>
 
-    <div t-if="!widget.readonly" class="o_domain_leaf_edition">
-        <!-- field selector will be instantiated here -->
-        <t t-if="!widget.options.partialUse">
-        <div> <!-- used for flex stretching -->
-            <select class="o_domain_leaf_operator_select o_input">
-                <option t-foreach="widget.operators" t-as="key"
-                        t-att-value="key"
-                        t-att-selected="widget.displayOperator === key ? 'selected' : None">
-                    <t t-esc="key_value"/>
-                </option>
-            </select>
-        </div>
-        <div t-attf-class="o_ds_value_cell#{_.contains(['set', 'not set'], widget.displayOperator) ? ' d-none' : ''}">
-            <t t-if="widget.selectionChoices !== null">
-                <select class="o_domain_leaf_value_input o_input">
-                    <option t-foreach="widget.selectionChoices" t-as="val"
-                            t-att-value="val[0]"
-                            t-att-selected="_.contains(val, widget.displayValue) ? 'selected' : None">
-                        <t t-esc="val[1]"/>
-                    </option>
-                </select>
+                <button t-if="isValid" class="btn btn-sm btn-secondary o_domain_show_selection_button" type="button">
+                    <t t-esc="nbRecords"/> record(s)
+                </button>
+                <span t-else="" class="text-warning" role="alert"><i class="fa fa-exclamation-triangle" role="img" aria-label="Warning" title="Warning"/> Invalid domain</span>
+
+                <button t-if="inDialogEdit" class="btn btn-sm btn-primary o_field_domain_dialog_button">Edit Domain</button>
+            </div>
+            <div t-else="">Select a model to add a filter.</div>
+        </t>
+    </t>
+
+    <div aria-atomic="true" t-name="DomainSelector" t-attf-class="o_domain_node o_domain_tree o_domain_selector #{widget.readonly ? 'o_read_mode' : 'o_edit_mode'}">
+        <t t-if="widget.options.partialUse">
+            <t t-if="widget.children.length === 0">
+                <span>SMatch <strong>all records</strong></span>
+                <button t-if="!widget.readonly" class="btn btn-sm btn-primary o_domain_add_first_node_button"><i class="fa fa-plus"/> Add filter</button>
             </t>
             <t t-else="">
-                <t t-if="_.contains(['in', 'not in'], widget.operator)">
-                    <div class="o_domain_leaf_value_input">
-                        <span class="badge badge-pill" t-foreach="widget.displayValue" t-as="val">
-                            <t t-esc="val"/> <i class="o_domain_leaf_value_remove_tag_button fa fa-times" t-att-data-value="val" role="img" aria-label="Remove tag" title="Remove tag"/>
-                        </span>
-                    </div>
-                    <div class="o_domain_leaf_value_tags">
-                        <input placeholder="Add new value" type="text" class="o_input"/>
-                        <button class="btn btn-sm btn-primary fa fa-plus o_domain_leaf_value_add_tag_button" aria-label="Add tag" title="Add tag"/>
-                    </div>
-                </t>
-                <t t-else="">
-                    <input class="o_domain_leaf_value_input o_input" type="text" t-att-value="widget.displayValue"/>
-                </t>
-            </t>
-        </div>
-        </t>
-    </div>
-    <div t-else="" class="o_domain_leaf_info">
-        <!-- field selector will be instantiated here -->
-        <t t-if="_.isString(widget.value)">
-            <span class="o_domain_leaf_operator"><t t-esc="widget.operator_mapping[widget.operator]"/></span>
-            <span class="o_domain_leaf_value text-primary">"<t t-esc="widget.value"/>"</span>
-        </t>
-        <t t-if="_.isArray(widget.value)">
-            <span class="o_domain_leaf_operator"><t t-esc="widget.operator_mapping[widget.operator]"/></span>
-            <t t-foreach="widget.value" t-as="v">
-                <span class="o_domain_leaf_value text-primary">"<t t-esc="v"/>"</span>
-                <t t-if="!v_last"> or </t>
+                <div class="o_domain_tree_header">
+                    <t t-if="widget.children.length === 1">Please navigate below and select field:</t>
+                    <t t-else="">
+                        <span>SSMatch records with</span>
+                        <t t-call="DomainTree.OperatorSelector"/>
+                        <span>of the following rules:</span>
+                    </t>
+                </div>
+
+                <div class="o_domain_node_children_container"/>
             </t>
         </t>
-        <t t-if="_.isNumber(widget.value)">
-            <span class="o_domain_leaf_operator"><t t-esc="widget.operator_mapping[widget.operator]"/></span>
-            <span class="o_domain_leaf_value text-primary"><t t-esc="widget.value"></t></span>
-        </t>
-        <t t-if="_.isBoolean(widget.value)">
-            is
-            <t t-if="widget.operator === '=' &amp;&amp; widget.value === false || widget.operator === '!=' &amp;&amp; widget.value === true">not</t>
-            set
+        <t t-if="!widget.options.partialUse">
+            <t t-if="widget.children.length === 0">
+                <span>Match <strong>all records</strong></span>
+                <button t-if="!widget.readonly" class="btn btn-sm btn-primary o_domain_add_first_node_button"><i class="fa fa-plus"/> Add filter</button>
+            </t>
+            <t t-else="">
+                <div class="o_domain_tree_header">
+                    <t t-if="widget.children.length === 1">Match records with the following rule:</t>
+                    <t t-else="">
+                        <span>Match records with</span>
+                        <t t-call="DomainTree.OperatorSelector"/>
+                        <span>of the following rules:</span>
+                    </t>
+                </div>
+
+                <div class="o_domain_node_children_container"/>
+            </t>
+
+            <label t-if="widget.debug &amp;&amp; !widget.readonly" class="o_domain_debug_container">
+                <span class="small"># Code editor</span>
+                <input type="text" class="o_domain_debug_input"/>
+            </label>
         </t>
     </div>
-</div>
-<div aria-atomic="true" t-name="ModelFieldSelector" t-attf-class="o_field_selector#{!widget.options.readonly ? ' o_edit_mode o_input' : ''}">
-    <div class="o_field_selector_value" tabindex="0"/>
-    <t t-if="!widget.options.partialUse">
-    <div class="o_field_selector_controls" tabindex="0">
-        <i role="alert" class="fa fa-exclamation-triangle o_field_selector_warning d-none" title="Invalid field chain" aria-label="Invalid field chain"/>
-    </div>
+    <t t-name="DomainNode.ControlPanel">
+        <t t-if="widget.options.partialUse">
+            <div t-if="!widget.readonly &amp;&amp; !widget.noControlPanel" class="o_domain_node_control_panel" role="toolbar" aria-label="Domain node">
+            </div>
+        </t>
+        <t t-if="!widget.options.partialUse">
+            <div t-if="!widget.readonly &amp;&amp; !widget.noControlPanel" class="o_domain_node_control_panel" role="toolbar" aria-label="Domain node">
+                <button class="btn o_domain_delete_node_button" title="Delete node" aria-label="Delete node"><i class="fa fa-times"/></button>
+                <button class="btn o_domain_add_node_button" title="Add node" aria-label="Add node"><i class="fa fa-plus-circle"/></button>
+                <button class="btn o_domain_add_node_button" title="Add branch" aria-label="Add branch" data-branch="1"><i class="fa fa-ellipsis-h"/></button>
+            </div>
+        </t>
     </t>
-    <div t-if="!widget.options.readonly" class="o_field_selector_popover d-none" tabindex="0">
-        <div class="o_field_selector_popover_header text-center">
-            <i class="fa fa-arrow-left o_field_selector_popover_option o_field_selector_prev_page" title="Previous" role="img" aria-label="Previous"/>
-            <div class="o_field_selector_title"/>
-            <i class="fa fa-times o_field_selector_popover_option o_field_selector_close" title="Close" role="img" aria-label="Close"/>
+    <div t-name="DomainLeaf" t-attf-class="o_domain_node o_domain_leaf o_domain_selector_row #{widget.readonly ? 'o_read_mode' : 'o_edit_mode'}">
+        <t t-call="DomainNode.ControlPanel"/>
+
+        <div t-if="!widget.readonly" class="o_domain_leaf_edition">
+            <!-- field selector will be instantiated here -->
+            <t t-if="!widget.options.partialUse">
+                <div> <!-- used for flex stretching -->
+                    <select class="o_domain_leaf_operator_select o_input">
+                        <option t-foreach="widget.operators" t-as="key"
+                                t-att-value="key"
+                                t-att-selected="widget.displayOperator === key ? 'selected' : None">
+                            <t t-esc="key_value"/>
+                        </option>
+                    </select>
+                </div>
+                <div t-attf-class="o_ds_value_cell#{_.contains(['set', 'not set'], widget.displayOperator) ? ' d-none' : ''}">
+                    <t t-if="widget.selectionChoices !== null">
+                        <select class="o_domain_leaf_value_input o_input">
+                            <option t-foreach="widget.selectionChoices" t-as="val"
+                                    t-att-value="val[0]"
+                                    t-att-selected="_.contains(val, widget.displayValue) ? 'selected' : None">
+                                <t t-esc="val[1]"/>
+                            </option>
+                        </select>
+                    </t>
+                    <t t-else="">
+                        <t t-if="_.contains(['in', 'not in'], widget.operator)">
+                            <div class="o_domain_leaf_value_input">
+                                <span class="badge badge-pill" t-foreach="widget.displayValue" t-as="val">
+                                    <t t-esc="val"/> <i class="o_domain_leaf_value_remove_tag_button fa fa-times" t-att-data-value="val" role="img" aria-label="Remove tag" title="Remove tag"/>
+                                </span>
+                            </div>
+                            <div class="o_domain_leaf_value_tags">
+                                <input placeholder="Add new value" type="text" class="o_input"/>
+                                <button class="btn btn-sm btn-primary fa fa-plus o_domain_leaf_value_add_tag_button" aria-label="Add tag" title="Add tag"/>
+                            </div>
+                        </t>
+                        <t t-else="">
+                            <input class="o_domain_leaf_value_input o_input" type="text" t-att-value="widget.displayValue"/>
+                        </t>
+                    </t>
+                </div>
+            </t>
         </div>
-        <div class="o_field_selector_popover_body">
-            <ul class="o_field_selector_page"/>
-        </div>
-        <div t-if="widget.options.debugMode" class="o_field_selector_popover_footer">
-            <input type="text" class="o_input"/>
+        <div t-else="" class="o_domain_leaf_info">
+            <!-- field selector will be instantiated here -->
+            <t t-if="_.isString(widget.value)">
+                <span class="o_domain_leaf_operator"><t t-esc="widget.operator_mapping[widget.operator]"/></span>
+                <span class="o_domain_leaf_value text-primary">"<t t-esc="widget.value"/>"</span>
+            </t>
+            <t t-if="_.isArray(widget.value)">
+                <span class="o_domain_leaf_operator"><t t-esc="widget.operator_mapping[widget.operator]"/></span>
+                <t t-foreach="widget.value" t-as="v">
+                    <span class="o_domain_leaf_value text-primary">"<t t-esc="v"/>"</span>
+                    <t t-if="!v_last"> or </t>
+                </t>
+            </t>
+            <t t-if="_.isNumber(widget.value)">
+                <span class="o_domain_leaf_operator"><t t-esc="widget.operator_mapping[widget.operator]"/></span>
+                <span class="o_domain_leaf_value text-primary"><t t-esc="widget.value"></t></span>
+            </t>
+            <t t-if="_.isBoolean(widget.value)">
+                is
+                <t t-if="widget.operator === '=' &amp;&amp; widget.value === false || widget.operator === '!=' &amp;&amp; widget.value === true">not</t>
+                set
+            </t>
         </div>
     </div>
-</div>
-</templates>
\ No newline at end of file
+    <div aria-atomic="true" t-name="ModelFieldSelector" t-attf-class="o_field_selector#{!widget.options.readonly ? ' o_edit_mode o_input' : ''}">
+        <div class="o_field_selector_value" tabindex="0"/>
+        <t t-if="!widget.options.partialUse">
+            <div class="o_field_selector_controls" tabindex="0">
+                <i role="alert" class="fa fa-exclamation-triangle o_field_selector_warning d-none" title="Invalid field chain" aria-label="Invalid field chain"/>
+            </div>
+        </t>
+        <div t-if="!widget.options.readonly" class="o_field_selector_popover d-none" tabindex="0">
+            <div class="o_field_selector_popover_header text-center">
+                <i class="fa fa-arrow-left o_field_selector_popover_option o_field_selector_prev_page" title="Previous" role="img" aria-label="Previous"/>
+                <div class="o_field_selector_title"/>
+                <i class="fa fa-times o_field_selector_popover_option o_field_selector_close" title="Close" role="img" aria-label="Close"/>
+            </div>
+            <div class="o_field_selector_popover_body">
+                <ul class="o_field_selector_page"/>
+            </div>
+            <div t-if="widget.options.debugMode" class="o_field_selector_popover_footer">
+                <input type="text" class="o_input"/>
+            </div>
+        </div>
+    </div>
+</templates>