Skip to content

Syncing from upstream OCA/server-ux (19.0) #1163

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
bt-admin merged 3 commits into from
Apr 14, 2026
Merged

Syncing from upstream OCA/server-ux (19.0) #1163

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0901451
[FIX] base_cancel_confirm: Merge injected fields in get_view models dict
risto42 Nov 15, 2025
dbb769f
Merge PR #1283 into 19.0
OCA-git-bot Apr 13, 2026
b3d4329
[BOT] post-merge updates
OCA-git-bot Apr 13, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ Available addons
----------------
addon | version | maintainers | summary
--- | --- | --- | ---
[base_cancel_confirm](base_cancel_confirm/) | 19.0.1.0.0 | <a href='https://github.com/kittiu'><img src='https://github.com/kittiu.png' width='32' height='32' style='border-radius:50%;' alt='kittiu'/></a> | Base Cancel Confirm
[base_cancel_confirm](base_cancel_confirm/) | 19.0.1.0.1 | <a href='https://github.com/kittiu'><img src='https://github.com/kittiu.png' width='32' height='32' style='border-radius:50%;' alt='kittiu'/></a> | Base Cancel Confirm
[base_search_custom_field_filter](base_search_custom_field_filter/) | 19.0.1.0.0 | <a href='https://github.com/pedrobaeza'><img src='https://github.com/pedrobaeza.png' width='32' height='32' style='border-radius:50%;' alt='pedrobaeza'/></a> | 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
Expand Down
2 changes: 1 addition & 1 deletion base_cancel_confirm/README.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion base_cancel_confirm/__manifest__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
8 changes: 6 additions & 2 deletions base_cancel_confirm/model/base_cancel_confirm.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion base_cancel_confirm/static/description/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -372,7 +372,7 @@ <h1>Base Cancel Confirm</h1>
!! This file is generated by oca-gen-addon-readme !!
!! changes will be overwritten. !!
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
!! source digest: sha256:af0051d9f6bbaafb8172ae1a377c85bb532207c89ebc6be97ba02f6697572bd7
!! source digest: sha256:7fe4d781b8346a73ecf494e27b27fad01b51c94376e0d1825f3a777d5b37fe88
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
<p><a class="reference external image-reference" href="https://odoo-community.org/page/development-status"><img alt="Beta" src="https://img.shields.io/badge/maturity-Beta-yellow.png" /></a> <a class="reference external image-reference" href="http://www.gnu.org/licenses/agpl-3.0-standalone.html"><img alt="License: AGPL-3" src="https://img.shields.io/badge/license-AGPL--3-blue.png" /></a> <a class="reference external image-reference" href="https://github.com/OCA/server-ux/tree/19.0/base_cancel_confirm"><img alt="OCA/server-ux" src="https://img.shields.io/badge/github-OCA%2Fserver--ux-lightgray.png?logo=github" /></a> <a class="reference external image-reference" href="https://translation.odoo-community.org/projects/server-ux-19-0/server-ux-19-0-base_cancel_confirm"><img alt="Translate me on Weblate" src="https://img.shields.io/badge/weblate-Translate%20me-F47D42.png" /></a> <a class="reference external image-reference" href="https://runboat.odoo-community.org/builds?repo=OCA/server-ux&amp;target_branch=19.0"><img alt="Try me on Runboat" src="https://img.shields.io/badge/runboat-Try%20me-875A7B.png" /></a></p>
<p>Many document model that already has cancel action may also want a
Expand Down
Loading