From cfc066c323afe8eda597bac8e4c1aa3d1b11ce7f Mon Sep 17 00:00:00 2001 From: "Loan (lse)" Date: Fri, 31 Jul 2020 09:54:35 +0000 Subject: [PATCH] [FIX] website_sale: Wrong terms and conditions in created SO To reproduce (V12) using a fresh database with demo data: 1. Install eCommerce and Sales 2. Change Mitchell Admin settings so that he can see the 3 companies 3. Go into Settings and set a distinct "Terms and Conditions" text for each companies 4. Go the Website > Configuration, set "My website" to "Company_1" and save 5. Go to the website shop and buy any items 6. Find its corresponding Sale order (should be on Company_1) => "Terms and Conditions" used in the SO is the one of "YourCompany" Analysis: The terms and conditions are not specified in the SO creation, so it runs the default value code to determine its value. However the default code just ask to use the OdooBot company "Terms and Conditions". https://github.com/odoo/odoo/blob/b6bf91d26b8fb45997b266c16be620d834a97cc7/addons/sale/models/sale.py#L121 OPW-2297114 closes odoo/odoo#55424 X-original-commit: 60565b5cd42da080e36fee5a94bcf8eafd15934d Signed-off-by: Nicolas Martinelli (nim) --- addons/website_sale/models/website.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/addons/website_sale/models/website.py b/addons/website_sale/models/website.py index 4abf925600d..5f4d7de2a6c 100644 --- a/addons/website_sale/models/website.py +++ b/addons/website_sale/models/website.py @@ -227,6 +227,8 @@ class Website(models.Model): 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 "" return values