update common

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"兆"]

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',

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:

app_common/rng/search_view.rng

@@ -12,6 +12,19 @@
             <rng:ref name="overload"/>
             <rng:optional><rng:attribute name="view_types"/></rng:optional>
             <rng:optional><rng:attribute name="class"/></rng:optional>
+            <rng:optional><rng:attribute name="options"/></rng:optional>
+            <rng:zeroOrMore>
+                <rng:ref name="field" />
+            </rng:zeroOrMore>
+        </rng:element>
+    </rng:define>
+
+    <rng:define name="superbar">
+        <rng:element name="superbar">
+            <rng:ref name="overload"/>
+            <rng:optional><rng:attribute name="view_types"/></rng:optional>
+            <rng:optional><rng:attribute name="class"/></rng:optional>
+            <rng:optional><rng:attribute name="options"/></rng:optional>
             <rng:zeroOrMore>
                 <rng:ref name="field" />
             </rng:zeroOrMore>
@@ -29,7 +42,9 @@
                     <rng:ref name="separator"/>
                     <rng:ref name="filter"/>
                     <rng:element name="newline"><rng:empty/></rng:element>
+                    <rng:optional><rng:attribute name="options"/></rng:optional>
                     <rng:ref name="searchpanel"/>
+                    <rng:ref name="superbar"/>
                 </rng:choice>
             </rng:zeroOrMore>
         </rng:element>

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;
+}