[MERGE] forward port branch 9.0 up to 6366150484

This commit is contained in:
Christophe Simonis
2017-10-25 11:28:25 +02:00
2 changed files with 2 additions and 1 deletions
@@ -1550,6 +1550,7 @@ exports.Orderline = Backbone.Model.extend({
return t.id === el;
}));
});
product_taxes = _.map(product_taxes, this._map_tax_fiscal_position.bind(this));
var all_taxes = this.compute_all(product_taxes, price_unit, this.get_quantity(), this.pos.currency.rounding);
_(all_taxes.taxes).each(function(tax) {
+1 -1
View File
@@ -606,7 +606,7 @@ class ConnectionPool(object):
cnx.close()
break
else:
raise PoolError('This connection does not below to the pool')
raise PoolError('This connection does not belong to the pool')
@locked
def close_all(self, dsn=None):