[MERGE] Forward-port saas-7 up to 0221ac7745

addons/point_of_sale/point_of_sale.py

@@ -1129,6 +1129,7 @@ class pos_order(osv.osv):
             }
             invoice = inv_ref.new(cr, uid, inv)
             invoice._onchange_partner_id()
+            invoice.fiscal_position_id = order.fiscal_position_id
 
             inv = invoice._convert_to_write(invoice._cache)
             if not inv.get('account_id', None):

openerp/addons/base/ir/ir_qweb.py

@@ -264,6 +264,13 @@ class QWeb(orm.AbstractModel):
             else:
                 _logger.warning("@t-debug in template '%s' is only available in --dev mode" % qwebcontext['__template__'])
 
+        # remove branding attributes from inherit
+        if element.attrib.get('data-oe-id') and [key for key in element.attrib.keys() if key.startswith("t-")]:
+            element.attrib.pop("data-oe-id", False)
+            element.attrib.pop("data-oe-xpath", False)
+            element.attrib.pop("data-oe-model", False)
+            element.attrib.pop("data-oe-field", False)
+
         for (attribute_name, attribute_value) in element.attrib.iteritems():
             attribute_name = unicode(attribute_name)
             if attribute_name == "groups":