[MERGE] forward port branch saas-11.1 up to 6cb9ed4c424

models/__init__.py

@@ -2,4 +2,3 @@
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 
 from . import sale_order
-from . import website

models/sale_order.py

@@ -17,3 +17,9 @@ class SaleOrder(models.Model):
         if error and delete:
             request.session.pop('error_promo_code')
         return error
+
+    @api.multi
+    def _cart_update(self, product_id=None, line_id=None, add_qty=0, set_qty=0, attributes=None, **kwargs):
+        res = super(SaleOrder, self)._cart_update(product_id=product_id, line_id=line_id, add_qty=add_qty, set_qty=set_qty, attributes=attributes, **kwargs)
+        self.recompute_coupon_lines()
+        return res

models/website.py

@@ -1,12 +0,0 @@
-# -*- coding: utf-8 -*-
-from odoo import models, fields, api
-
-
-class Website(models.Model):
-    _inherit = "website"
-
-    @api.multi
-    def sale_get_order(self, force_create=False, code=None, update_pricelist=False, force_pricelist=False):
-        order = super(Website, self).sale_get_order(force_create, code, update_pricelist, force_pricelist)
-        order.recompute_coupon_lines()
-        return order