pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[MERGE] forward port branch saas-15 up to b7a39c5722

Browse Source
This commit is contained in:
Christophe Simonis
2019-04-15 13:57:32 +02:00
parent c2f071c619 b7a39c5722
commit 0b2dbbb337
3 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/l10n_ca/data/account_tax_data.xml
+1 -1
View File
@@ -112,7 +112,7 @@
<field name="type_tax_use">sale</field> <field name="type_tax_use">sale</field>
<field name="amount">100</field> <field name="amount">100</field>
<field name="amount_type">group</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="tag_ids" eval="[(6,0,[ref('tag_gstpst_bc_sale')])]"/>
<field name="tax_group_id" ref="tax_group_fix"/> <field name="tax_group_id" ref="tax_group_fix"/>
</record> </record>
addons/point_of_sale/models/pos_order.py
+1 -1
View File
@@ -720,7 +720,7 @@ class PosOrder(models.Model):
try: try:
pos_order.action_pos_order_paid() pos_order.action_pos_order_paid()
except psycopg2.OperationalError: except psycopg2.DatabaseError:
# do not hide transactional errors, the order(s) won't be saved! # do not hide transactional errors, the order(s) won't be saved!
raise raise
except Exception as e: except Exception as e:
addons/point_of_sale/static/src/js/models.js
+1 -1
View File
@@ -2658,7 +2658,7 @@ exports.NumpadState = Backbone.Model.extend({
this.set({ this.set({
buffer: "-" + newChar buffer: "-" + newChar
}); });
} else { } else if (!(newChar === '.') || oldBuffer.indexOf('.') === -1) {
this.set({ this.set({
buffer: (this.get('buffer')) + newChar buffer: (this.get('buffer')) + newChar
}); });