From ea9828ba72bd5f404accf9467e15883698c64b21 Mon Sep 17 00:00:00 2001
From: KolushovAlexandr <kolushov@it-projects.info>
Date: Wed, 19 Dec 2018 13:31:44 +0500
Subject: [PATCH 1/2] :shield: integer is incomparable with bool

---
 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 2d6624f949..aef058120b 100644
--- a/web_website/models/ir_property.py
+++ b/web_website/models/ir_property.py
@@ -111,7 +111,7 @@ def get_multi(self, name, model, ids):
         website_id = self._context.get('website_id', 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
+        company_id = self._context.get('force_company') or self.env['res.company']._company_default_get(model, field_id).id or None
 
         if field.type == 'many2one':
             comodel = self.env[field.comodel_name]

From d616e1cac999dbf33e80a3dc134f191d13f32273 Mon Sep 17 00:00:00 2001
From: Ivan Yelizariev <yelizariev@it-projects.info>
Date: Wed, 19 Dec 2018 14:30:25 +0500
Subject: [PATCH 2/2] :shield: random error in CI test

---
 web_debranding/tests/test_developer_mode_menu_elements.py | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/web_debranding/tests/test_developer_mode_menu_elements.py b/web_debranding/tests/test_developer_mode_menu_elements.py
index c0fccd8566..03a50440a2 100644
--- a/web_debranding/tests/test_developer_mode_menu_elements.py
+++ b/web_debranding/tests/test_developer_mode_menu_elements.py
@@ -26,11 +26,15 @@ def test_01_remove_developer_mode_menu_elements(self):
                                 console.log('page is loading');
                                 return;
                             }
+                            setTimeout(function(){
+                            // request ..../res.users/is_admin may take some time
+                            // TODO: add a way to check that it's a time to check result (variable on loading in web_debranding/static/src/js/user_menu.js ?)
                             if ($('li a[data-menu="debug"]').length > 0 || $('li a[data-menu="debugassets"]').length > 0) {
-                                console.log('error', 'Developer mode menu elements are displayed for not admin user');
+                                console.log('error', 'Developer mode menu elements are displayed for non-admin user');
                             } else {
                                 console.log('ok');
                             }
+                            }, 1000);
                         }, 1000);
                     })
         """