Merge pull request #1213 from OCA/12.0

Syncing from upstream OCA/web (12.0)
brain-tec · Feb 6, 2024 · 6a74b76 · 6a74b76
2 parents ef96899 + 0eb845c
commit 6a74b76
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 6 deletions.
diff --git a/README.md b/README.md
@@ -27,7 +27,7 @@ Available addons
 addon | version | maintainers | summary
 --- | --- | --- | ---
 [web_action_conditionable](web_action_conditionable/) | 12.0.1.0.1 |  | web_action_conditionable
-[web_advanced_filter](web_advanced_filter/) | 12.0.1.0.1 |  | Set operations on filter results
+[web_advanced_filter](web_advanced_filter/) | 12.0.1.1.0 |  | Set operations on filter results
 [web_advanced_search](web_advanced_search/) | 12.0.1.1.3 |  | Easier and more powerful searching tools
 [web_advanced_search_wildcard](web_advanced_search_wildcard/) | 12.0.1.0.0 |  | Webmodule to add wildcard operators in advanced search field
 [web_button_no_save](web_button_no_save/) | 12.0.1.0.0 |  | define buttons that do not require saving the form

diff --git a/web_advanced_filter/README.rst b/web_advanced_filter/README.rst
@@ -7,7 +7,7 @@ Advanced filters
    !! This file is generated by oca-gen-addon-readme !!
    !! changes will be overwritten.                   !!
    !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-   !! source digest: sha256:4c9d984dcab5405abd381463f26aa81966a58ec00b98cf4f201e973c3e32d965
+   !! source digest: sha256:a1bbf209325e3e5922759e072867e9d910994f0401fee28ceddf54a7ce75d57d
    !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
 .. |badge1| image:: https://img.shields.io/badge/maturity-Beta-yellow.png

diff --git a/web_advanced_filter/__manifest__.py b/web_advanced_filter/__manifest__.py
@@ -2,7 +2,7 @@
 # License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
 {
     "name": "Advanced filters",
-    "version": "12.0.1.0.1",
+    "version": "12.0.1.1.0",
     "author": "Therp BV,Odoo Community Association (OCA)",
     "website": "https://github.com/OCA/web",
     "license": "AGPL-3",

diff --git a/web_advanced_filter/static/description/index.html b/web_advanced_filter/static/description/index.html
@@ -1,4 +1,3 @@
-<?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
@@ -367,7 +366,7 @@ <h1 class="title">Advanced filters</h1>
 !! This file is generated by oca-gen-addon-readme !!
 !! changes will be overwritten.                   !!
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-!! source digest: sha256:4c9d984dcab5405abd381463f26aa81966a58ec00b98cf4f201e973c3e32d965
+!! source digest: sha256:a1bbf209325e3e5922759e072867e9d910994f0401fee28ceddf54a7ce75d57d
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
 <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/licence-AGPL--3-blue.png" /></a> <a class="reference external image-reference" href="https://github.com/OCA/web/tree/12.0/web_advanced_filter"><img alt="OCA/web" src="https://img.shields.io/badge/github-OCA%2Fweb-lightgray.png?logo=github" /></a> <a class="reference external image-reference" href="https://translation.odoo-community.org/projects/web-12-0/web-12-0-web_advanced_filter"><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/web&amp;target_branch=12.0"><img alt="Try me on Runboat" src="https://img.shields.io/badge/runboat-Try%20me-875A7B.png" /></a></p>
 <p>This addon allows users to apply set operations on filters: Remove or add

diff --git a/web_advanced_filter/wizards/ir_filters_combine_with_existing.py b/web_advanced_filter/wizards/ir_filters_combine_with_existing.py
@@ -18,7 +18,13 @@ class IrFiltersCombineWithExisting(models.TransientModel):
     domain = fields.Char('Domain', required=True)
     context = fields.Char('Context', required=True, default='{}')
     model = fields.Char('Model', required=True)
-    filter_id = fields.Many2one('ir.filters', 'Filter', required=True)
+    filter_id = fields.Many2one(
+        comodel_name='ir.filters',
+        string='Filter',
+        ondelete='cascade',
+        index=True,
+        required=True
+    )
 
     @api.multi
     def button_save(self):