diff --git a/README.md b/README.md index 33ecbaec6b..ea3734c210 100644 --- a/README.md +++ b/README.md @@ -21,7 +21,7 @@ Available addons ---------------- addon | version | maintainers | summary --- | --- | --- | --- -[base_cancel_confirm](base_cancel_confirm/) | 19.0.1.0.0 | kittiu | Base Cancel Confirm +[base_cancel_confirm](base_cancel_confirm/) | 19.0.1.0.1 | kittiu | Base Cancel Confirm [base_search_custom_field_filter](base_search_custom_field_filter/) | 19.0.1.0.0 | pedrobaeza | Add custom filters for fields via UI [base_substate](base_substate/) | 19.0.1.0.1 | | Base Sub State [base_technical_features](base_technical_features/) | 19.0.1.0.0 | | Access to technical features without activating debug mode diff --git a/base_cancel_confirm/README.rst b/base_cancel_confirm/README.rst index 03026d7497..bd989a81c6 100644 --- a/base_cancel_confirm/README.rst +++ b/base_cancel_confirm/README.rst @@ -11,7 +11,7 @@ Base Cancel Confirm !! This file is generated by oca-gen-addon-readme !! !! changes will be overwritten. !! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! - !! source digest: sha256:af0051d9f6bbaafb8172ae1a377c85bb532207c89ebc6be97ba02f6697572bd7 + !! source digest: sha256:7fe4d781b8346a73ecf494e27b27fad01b51c94376e0d1825f3a777d5b37fe88 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! .. |badge1| image:: https://img.shields.io/badge/maturity-Beta-yellow.png diff --git a/base_cancel_confirm/__manifest__.py b/base_cancel_confirm/__manifest__.py index 46c6aad7b1..063ccc9516 100644 --- a/base_cancel_confirm/__manifest__.py +++ b/base_cancel_confirm/__manifest__.py @@ -3,7 +3,7 @@ { "name": "Base Cancel Confirm", - "version": "19.0.1.0.0", + "version": "19.0.1.0.1", "author": "Ecosoft,Odoo Community Association (OCA)", "category": "Usability", "license": "AGPL-3", diff --git a/base_cancel_confirm/model/base_cancel_confirm.py b/base_cancel_confirm/model/base_cancel_confirm.py index 81ec03d725..3b4e5eeea7 100644 --- a/base_cancel_confirm/model/base_cancel_confirm.py +++ b/base_cancel_confirm/model/base_cancel_confirm.py @@ -71,8 +71,12 @@ def get_view(self, view_id=None, view_type="form", **options): node.addnext(new_element) for model in new_models: if model in all_models: - continue - all_models[model] = new_models[model] + # Merge field names: existing fields (tuple) + new fields (set) + all_models[model] = tuple( + set(all_models[model]) | new_models[model] + ) + else: + all_models[model] = tuple(new_models[model]) res["arch"] = etree.tostring(doc) res["models"] = frozendict(all_models) return res diff --git a/base_cancel_confirm/static/description/index.html b/base_cancel_confirm/static/description/index.html index c77010fc91..4e42e88197 100644 --- a/base_cancel_confirm/static/description/index.html +++ b/base_cancel_confirm/static/description/index.html @@ -372,7 +372,7 @@

Base Cancel Confirm

!! This file is generated by oca-gen-addon-readme !! !! changes will be overwritten. !! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -!! source digest: sha256:af0051d9f6bbaafb8172ae1a377c85bb532207c89ebc6be97ba02f6697572bd7 +!! source digest: sha256:7fe4d781b8346a73ecf494e27b27fad01b51c94376e0d1825f3a777d5b37fe88 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->

Beta License: AGPL-3 OCA/server-ux Translate me on Weblate Try me on Runboat

Many document model that already has cancel action may also want a