diff options
| author | Christophe Simonis <chs@odoo.com> | 2017-10-25 11:28:25 +0200 |
|---|---|---|
| committer | Christophe Simonis <chs@odoo.com> | 2017-10-25 11:28:25 +0200 |
| commit | ea9b574ac6fbe26551bcb1881bf1e036dce82800 (patch) | |
| tree | 9a318358522cd36443bac3858c62a64c20323707 | |
| parent | afccad3578b49a6c097f8e42c848683138acf8a2 (diff) | |
| parent | 6366150484668ebfce98f9d7483db52103cca500 (diff) | |
[MERGE] forward port branch 9.0 up to 63661504846
| -rw-r--r-- | addons/point_of_sale/static/src/js/models.js | 1 | ||||
| -rw-r--r-- | odoo/sql_db.py | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/addons/point_of_sale/static/src/js/models.js b/addons/point_of_sale/static/src/js/models.js index ccbdf40edd8..fead382b695 100644 --- a/addons/point_of_sale/static/src/js/models.js +++ b/addons/point_of_sale/static/src/js/models.js @@ -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) { diff --git a/odoo/sql_db.py b/odoo/sql_db.py index 326ea44297f..873cbac3042 100644 --- a/odoo/sql_db.py +++ b/odoo/sql_db.py @@ -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): |