[MERGE] forward port branch 9.0 up to 80f88ad63b

addons/crm/models/crm_activity.py

@@ -43,8 +43,9 @@ class CrmActivity(models.Model):
 
     @api.multi
     def unlink(self):
-        activities = self.search([('subtype_id', '=', self.subtype_id.id)])
-        # to ensure that the subtype is only linked the current activity
-        if len(activities) == 1:
-            self.subtype_id.unlink()
+        for activity in self:
+            activities = self.search([('subtype_id', '=', activity.subtype_id.id)])
+            # to ensure that the subtype is only linked the current activity
+            if len(activities) == 1:
+                activity.subtype_id.unlink()
         return super(CrmActivity, self).unlink()

addons/point_of_sale/static/src/js/screens.js

@@ -1985,6 +1985,7 @@ var PaymentScreenWidget = ScreenWidget.extend({
 
             invoiced.fail(function(error){
                 self.invoicing = false;
+                order.finalized = false;
                 if (error.message === 'Missing Customer') {
                     self.gui.show_popup('confirm',{
                         'title': _t('Please select the Customer'),