From fba65795ac86240c0e3e5d33949866f377c19566 Mon Sep 17 00:00:00 2001 From: ivan deng Date: Sun, 5 Mar 2023 09:54:01 +0800 Subject: [PATCH] update superbar for date type --- app_common/__manifest__.py | 2 +- app_common/models/ir_ui_view.py | 5 +++-- app_common/rng/search_view.rng | 1 + app_common/rng/tree_view.rng | 5 +++++ app_sale_superbar/views/sale_order_views.xml | 2 -- 5 files changed, 10 insertions(+), 5 deletions(-) diff --git a/app_common/__manifest__.py b/app_common/__manifest__.py index 5e0e97b4..51d69f59 100644 --- a/app_common/__manifest__.py +++ b/app_common/__manifest__.py @@ -33,7 +33,7 @@ { 'name': "Sunpop Odooapp Common Func", - 'version': '16.23.02.02', + 'version': '16.23.03.04', '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 a1e5e1c0..1ba89d75 100644 --- a/app_common/models/ir_ui_view.py +++ b/app_common/models/ir_ui_view.py @@ -32,8 +32,9 @@ view_validation.relaxng = app_relaxng class View(models.Model): _inherit = 'ir.ui.view' - def __init__(self, *args, **kwargs): - super(View, self).__init__(*args, **kwargs) + def __init__(self, env, ids, prefetch_ids): + # 这里应该是无必要,但为了更安全 + super(View, self).__init__(env, ids, prefetch_ids) view_validation.relaxng = app_relaxng # todo: 有可能需要处理增加的 header等标签 diff --git a/app_common/rng/search_view.rng b/app_common/rng/search_view.rng index d1025251..3f3c711f 100644 --- a/app_common/rng/search_view.rng +++ b/app_common/rng/search_view.rng @@ -13,6 +13,7 @@ + diff --git a/app_common/rng/tree_view.rng b/app_common/rng/tree_view.rng index 48d31e94..25d48922 100644 --- a/app_common/rng/tree_view.rng +++ b/app_common/rng/tree_view.rng @@ -65,6 +65,11 @@ + + + + + diff --git a/app_sale_superbar/views/sale_order_views.xml b/app_sale_superbar/views/sale_order_views.xml index efe1cc27..9daf20e5 100644 --- a/app_sale_superbar/views/sale_order_views.xml +++ b/app_sale_superbar/views/sale_order_views.xml @@ -8,8 +8,6 @@ - -