diff --git a/addons/point_of_sale/models/pos_order.py b/addons/point_of_sale/models/pos_order.py
index 2f27048c983..84efbebd3db 100644
--- a/addons/point_of_sale/models/pos_order.py
+++ b/addons/point_of_sale/models/pos_order.py
@@ -162,6 +162,7 @@ class PosOrder(models.Model):
             'origin': self.name,
             'account_id': self.partner_id.property_account_receivable_id.id,
             'journal_id': self.session_id.config_id.invoice_journal_id.id,
+            'company_id': self.company_id.id,
             'type': 'out_invoice',
             'reference': self.name,
             'partner_id': self.partner_id.id,
diff --git a/addons/web/static/src/js/apps.js b/addons/web/static/src/js/apps.js
index 520fb3210c4..d210a21187e 100644
--- a/addons/web/static/src/js/apps.js
+++ b/addons/web/static/src/js/apps.js
@@ -61,7 +61,7 @@ var Apps = Widget.extend({
     },
 
     destroy: function() {
-        $(window).off("message.apps");
+        $(window).off("message." + this.uniq);
         if (this.$ifr) {
             this.$ifr.remove();
             this.$ifr = null;
@@ -160,10 +160,11 @@ var Apps = Widget.extend({
                 qs.debug = session.debug;
             }
             var u = $.param.querystring(client.origin + "/apps/embed/client", qs);
-            var css = {width: '100%', height: '400px'};
+            var css = {width: '100%', height: '750px'};
             self.$ifr = $('<iframe>').attr('src', u);
 
-            $(window).on("message.apps", self.proxy('_on_message'));
+            self.uniq = _.uniqueId('apps');
+            $(window).on("message." + self.uniq, self.proxy('_on_message'));
 
             self.on('message:ready', self, function(m) {
                 var w = this.$ifr[0].contentWindow;
diff --git a/doc/reference/views.rst b/doc/reference/views.rst
index 9b68dc41ff8..3dd6d885ce4 100644
--- a/doc/reference/views.rst
+++ b/doc/reference/views.rst
@@ -241,6 +241,11 @@ Possible children elements of the list view are:
 
         Makes the button ``invisible`` if the record is *not* in one of the
         listed states
+
+        .. danger::
+
+            Using ``states`` in combination with ``attrs`` may lead to
+            unexpected results as domains are combined with a logical AND.
     ``context``
         merged into the view's context when performing the button's Odoo call
     ``confirm``