diff --git a/app_base_chinese/models/res_currency.py b/app_base_chinese/models/res_currency.py
index ad714fac..3f55e337 100644
--- a/app_base_chinese/models/res_currency.py
+++ b/app_base_chinese/models/res_currency.py
@@ -16,7 +16,7 @@ class ResCurrency(models.Model):
:return 返回值是对应阿拉伯数字的绝对值的中文数字
"""
if self.name != 'CNY':
- return;
+ return
rmbmap = [u"零", u"壹", u"贰", u"叁", u"肆", u"伍", u"陆", u"柒", u"捌", u"玖"]
unit = [u"分", u"角", u"元", u"拾", u"佰", u"仟", u"万", u"拾", u"佰", u"仟", u"亿",
u"拾", u"佰", u"仟", u"万", u"拾", u"佰", u"仟", u"兆"]
diff --git a/app_common/__manifest__.py b/app_common/__manifest__.py
index f6f25b2a..69687cdc 100644
--- a/app_common/__manifest__.py
+++ b/app_common/__manifest__.py
@@ -33,7 +33,7 @@
{
'name': "Sunpop Odooapp Common Func",
- 'version': '13.20.10.15',
+ 'version': '13.21.01.20',
'author': 'Sunpop.cn',
'category': 'Base',
'website': 'https://www.sunpop.cn',
diff --git a/app_common/models/ir_ui_view.py b/app_common/models/ir_ui_view.py
index 4884f766..166f8240 100644
--- a/app_common/models/ir_ui_view.py
+++ b/app_common/models/ir_ui_view.py
@@ -21,9 +21,9 @@ def app_valid_field_in_tree(arch, **kwargs):
def app_relaxng(view_type):
""" Return a validator for the given view type, or None. """
if view_type not in _relaxng_cache:
- # tree 特殊
- if view_type == 'tree':
- _file = get_resource_path('app_common', 'rng', 'tree_view.rng')
+ # tree, search 特殊
+ if view_type in ['tree', 'search']:
+ _file = get_resource_path('app_common', 'rng', '%s_view.rng' % view_type)
else:
_file = get_resource_path('base', 'rng', '%s_view.rng' % view_type)
with tools.file_open(_file) as frng:
diff --git a/app_common/rng/search_view.rng b/app_common/rng/search_view.rng
index dfa6059d..69a03bfc 100644
--- a/app_common/rng/search_view.rng
+++ b/app_common/rng/search_view.rng
@@ -12,6 +12,19 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -29,7 +42,9 @@
+
+
diff --git a/app_web_enterprise/static/src/scss/app_style.scss b/app_web_enterprise/static/src/scss/app_style.scss
index 15a4ab7e..1b2fa9de 100644
--- a/app_web_enterprise/static/src/scss/app_style.scss
+++ b/app_web_enterprise/static/src/scss/app_style.scss
@@ -103,4 +103,7 @@
height: 99.5%;
}
}
-
+//m2o字段,只读情况下也可换行
+.o_list_view .o_list_table tbody > tr > td.o_readonly_modifier {
+ white-space: pre-wrap!important;
+}
\ No newline at end of file