Skip to content
Permalink
Browse files

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

  • Loading branch information...
KangOl committed Apr 15, 2019
2 parents c2f071c + b7a39c5 commit 0b2dbbb337bd11104aafada22cefb96aaa6b7d6f
@@ -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>
@@ -720,7 +720,7 @@ def create_from_ui(self, orders):

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:
@@ -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
});

0 comments on commit 0b2dbbb

Please sign in to comment.
You can’t perform that action at this time.