Skip to content
Permalink
Browse files

[MERGE] forward port branch saas-14 up to 6b87c85

  • Loading branch information...
KangOl committed Apr 15, 2019
2 parents cd28e53 + 6b87c85 commit b7a39c5722d1a5fc8b45dd1b4f939cee1163a23d
@@ -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>

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

0 comments on commit b7a39c5

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