From 7a00f107aa2b77992f62fa51ffaf25fdd8b5b3aa Mon Sep 17 00:00:00 2001
From: Romain Derie <rde@odoo.com>
Date: Tue, 28 Sep 2021 17:17:59 +0000
Subject: [PATCH] [FIX] website_sale(_stock): remove dead code
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

When the `or` was introduced [1], the company_id was not required [2].
The required was added later somewhere between 11.0 and 12.0 [3].

Reaching the `or` condition was therefore not possible anymore.
Extracted from https://github.com/odoo/odoo/pull/77308

[1]: https://github.com/odoo/odoo/blame/10.0/addons/website_sale/models/sale_order.py#L350
[2]: https://github.com/odoo/odoo/blame/10.0/addons/website/models/website.py#L165
[3]: https://github.com/odoo/odoo/commit/2a9a514551ca951db656e139cb4d177657eb95e7

closes odoo/odoo#77882

X-original-commit: c33ba174d0bd534794e3daa7dc99f84140ba6d22
Signed-off-by: Jérémy Kersten (jke) <jke@openerp.com>
Signed-off-by: Romain Derie (rde) <rde@odoo.com>
---
 addons/website_sale/models/website.py       |  8 +++-----
 addons/website_sale_stock/models/website.py | 17 ++++++++---------
 2 files changed, 11 insertions(+), 14 deletions(-)

diff --git a/addons/website_sale/models/website.py b/addons/website_sale/models/website.py
index 1c99fa5a1f5..4067e9db146 100644
--- a/addons/website_sale/models/website.py
+++ b/addons/website_sale/models/website.py
@@ -241,12 +241,10 @@ class Website(models.Model):
             'partner_shipping_id': addr['delivery'],
             'user_id': salesperson_id or self.salesperson_id.id or default_user_id,
             'website_id': self._context.get('website_id'),
+            'company_id': self.company_id.id,
         }
-        company = self.company_id or pricelist.company_id
-        if company:
-            values['company_id'] = company.id
-            if self.env['ir.config_parameter'].sudo().get_param('sale.use_sale_note'):
-                values['note'] = company.sale_note or ""
+        if self.env['ir.config_parameter'].sudo().get_param('sale.use_sale_note'):
+            values['note'] = self.company_id.sale_note or ""
 
         return values
 
diff --git a/addons/website_sale_stock/models/website.py b/addons/website_sale_stock/models/website.py
index 78d2301c338..4f838ee0bda 100644
--- a/addons/website_sale_stock/models/website.py
+++ b/addons/website_sale_stock/models/website.py
@@ -10,13 +10,12 @@ class Website(models.Model):
     def _prepare_sale_order_values(self, partner, pricelist):
         self.ensure_one()
         values = super(Website, self)._prepare_sale_order_values(partner, pricelist)
-        if values['company_id']:
-            warehouse_id = (
-                self.warehouse_id and self.warehouse_id.id or
-                self.env['ir.default'].get('sale.order', 'warehouse_id', company_id=values.get('company_id')) or
-                self.env['ir.default'].get('sale.order', 'warehouse_id') or
-                self.env['stock.warehouse'].sudo().search([('company_id', '=', values['company_id'])], limit=1).id
-            )
-            if warehouse_id:
-                values['warehouse_id'] = warehouse_id
+        warehouse_id = (
+            self.warehouse_id and self.warehouse_id.id or
+            self.env['ir.default'].get('sale.order', 'warehouse_id', company_id=self.company_id.id) or
+            self.env['ir.default'].get('sale.order', 'warehouse_id') or
+            self.env['stock.warehouse'].sudo().search([('company_id', '=', self.company_id.id)], limit=1).id
+        )
+        if warehouse_id:
+            values['warehouse_id'] = warehouse_id
         return values