diff options
| author | Christophe Simonis <chs@odoo.com> | 2019-04-15 13:57:32 +0200 |
|---|---|---|
| committer | Christophe Simonis <chs@odoo.com> | 2019-04-15 13:57:32 +0200 |
| commit | 0b2dbbb337bd11104aafada22cefb96aaa6b7d6f (patch) | |
| tree | 8676503128c6f066f442a33ea63e89e26a2950ea /addons | |
| parent | c2f071c6193ae7eecf86d243ef98a7e6272b9fb0 (diff) | |
| parent | b7a39c5722d1a5fc8b45dd1b4f939cee1163a23d (diff) | |
[MERGE] forward port branch saas-15 up to b7a39c5722d
Diffstat (limited to 'addons')
| -rw-r--r-- | addons/l10n_ca/data/account_tax_data.xml | 2 | ||||
| -rw-r--r-- | addons/point_of_sale/models/pos_order.py | 2 | ||||
| -rw-r--r-- | addons/point_of_sale/static/src/js/models.js | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/addons/l10n_ca/data/account_tax_data.xml b/addons/l10n_ca/data/account_tax_data.xml index 803e63c0435..174c30ef360 100644 --- a/addons/l10n_ca/data/account_tax_data.xml +++ b/addons/l10n_ca/data/account_tax_data.xml @@ -112,7 +112,7 @@ <field name="type_tax_use">sale</field> <field name="amount">100</field> <field name="amount_type">group</field> - <field name="children_tax_ids" eval="[(6,0,[ref('pst_bc_sale_en')])]"/> + <field name="children_tax_ids" eval="[(6,0,[ref('pst_bc_sale_en'), ref('gstpst_sale_bc_gst_en')])]"/> <field name="tag_ids" eval="[(6,0,[ref('tag_gstpst_bc_sale')])]"/> <field name="tax_group_id" ref="tax_group_fix"/> </record> diff --git a/addons/point_of_sale/models/pos_order.py b/addons/point_of_sale/models/pos_order.py index f7089230d69..156000df998 100644 --- a/addons/point_of_sale/models/pos_order.py +++ b/addons/point_of_sale/models/pos_order.py @@ -720,7 +720,7 @@ class PosOrder(models.Model): try: pos_order.action_pos_order_paid() - except psycopg2.OperationalError: + except psycopg2.DatabaseError: # do not hide transactional errors, the order(s) won't be saved! raise except Exception as e: diff --git a/addons/point_of_sale/static/src/js/models.js b/addons/point_of_sale/static/src/js/models.js index 60ba6ebc0c8..c6fcebd7a94 100644 --- a/addons/point_of_sale/static/src/js/models.js +++ b/addons/point_of_sale/static/src/js/models.js @@ -2658,7 +2658,7 @@ exports.NumpadState = Backbone.Model.extend({ this.set({ buffer: "-" + newChar }); - } else { + } else if (!(newChar === '.') || oldBuffer.indexOf('.') === -1) { this.set({ buffer: (this.get('buffer')) + newChar }); |