From 7dbd7e89dc8369e5447a130de36746ad2bb0824e Mon Sep 17 00:00:00 2001 From: KolushovAlexandr Date: Fri, 21 Dec 2018 14:33:02 +0500 Subject: [PATCH 1/2] :ambulance: web_website incomparable values int and bool --- web_website/__manifest__.py | 2 +- web_website/doc/changelog.rst | 4 ++++ web_website/models/ir_property.py | 3 ++- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/web_website/__manifest__.py b/web_website/__manifest__.py index 72626db075..3b20fcbccb 100644 --- a/web_website/__manifest__.py +++ b/web_website/__manifest__.py @@ -6,7 +6,7 @@ "category": "Hidden", # "live_test_url": "", "images": [], - "version": "11.0.3.0.1", + "version": "11.0.3.0.2", "application": False, "author": "IT-Projects LLC, Ivan Yelizariev", diff --git a/web_website/doc/changelog.rst b/web_website/doc/changelog.rst index f5587bf0c3..12138368e5 100644 --- a/web_website/doc/changelog.rst +++ b/web_website/doc/changelog.rst @@ -1,3 +1,7 @@ +`3.0.2` +------- +- **Fix:** Error related to incorrect SQL request + `3.0.1` ------- - **Fix:** Incorrect website priority after odoo updates https://github.com/odoo/odoo/commit/b6d32de31e0e18a506ae06dc27561d1d078f3ab1 diff --git a/web_website/models/ir_property.py b/web_website/models/ir_property.py index aef058120b..47564e2f36 100644 --- a/web_website/models/ir_property.py +++ b/web_website/models/ir_property.py @@ -108,7 +108,8 @@ def get_multi(self, name, model, ids): # It has the same idea and structure, but sql request and set record value method are changed if not ids: return {} - website_id = self._context.get('website_id', None) + # if get returns False it caused an error on SQL request + website_id = self._context.get('website_id') or None field = self.env[model]._fields[name] field_id = self.env['ir.model.fields']._get(model, name).id company_id = self._context.get('force_company') or self.env['res.company']._company_default_get(model, field_id).id or None From cae3aaa2d6f89704365baa8d7e604a955ef9a0b8 Mon Sep 17 00:00:00 2001 From: Ivan Yelizariev Date: Fri, 21 Dec 2018 15:14:32 +0500 Subject: [PATCH 2/2] :rose: spelling Co-Authored-By: KolushovAlexandr --- web_website/models/ir_property.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web_website/models/ir_property.py b/web_website/models/ir_property.py index 47564e2f36..276ee81e88 100644 --- a/web_website/models/ir_property.py +++ b/web_website/models/ir_property.py @@ -108,7 +108,7 @@ def get_multi(self, name, model, ids): # It has the same idea and structure, but sql request and set record value method are changed if not ids: return {} - # if get returns False it caused an error on SQL request + # it's important, that website_id cannot be False -- otherwise, an error is raised on SQL request website_id = self._context.get('website_id') or None field = self.env[model]._fields[name] field_id = self.env['ir.model.fields']._get(model, name).id