[MERGE] forward port branch 10.0 up to 78ba90d548

addons/l10n_ca/data/account_tax_data.xml

@@ -110,7 +110,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')])]"/>
     </record>
 

addons/point_of_sale/models/pos_order.py

@@ -612,7 +612,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:

addons/point_of_sale/static/src/js/models.js

@@ -2350,7 +2350,7 @@ exports.NumpadState = Backbone.Model.extend({
             this.set({
                 buffer: "-" + newChar
             });
-        } else {
+        } else if (!(newChar === '.') || oldBuffer.indexOf('.') === -1) {
             this.set({
                 buffer: (this.get('buffer')) + newChar
             });

requirements.txt

@@ -6,7 +6,7 @@ feedparser==5.2.1
 gevent==1.1.2
 greenlet==0.4.10
 jcconv==0.2.3
-Jinja2==2.8.1
+Jinja2==2.10.1
 lxml==3.5.0
 Mako==1.0.4
 MarkupSafe==0.23