summaryrefslogtreecommitdiff
path: root/addons/pos_restaurant/static/src/js/multiprint.js
diff options
context:
space:
mode:
authorChristophe Simonis <chs@odoo.com>2017-08-24 13:17:53 +0200
committerChristophe Simonis <chs@odoo.com>2017-08-24 13:17:53 +0200
commit017ee5eab376b4f09beb62812c1cbc682009ed86 (patch)
tree2af185b0604cd8ce9129c39137bbf39d21d7be89 /addons/pos_restaurant/static/src/js/multiprint.js
parent006c16198f7f68c9dc8b895defd013f33008840a (diff)
parent877e7098719195ed2934fc9c3b5c3bd8ad8bab07 (diff)
[MERGE] forward port branch saas-17 up to 877e7098719
Diffstat (limited to 'addons/pos_restaurant/static/src/js/multiprint.js')
-rw-r--r--addons/pos_restaurant/static/src/js/multiprint.js11
1 files changed, 10 insertions, 1 deletions
diff --git a/addons/pos_restaurant/static/src/js/multiprint.js b/addons/pos_restaurant/static/src/js/multiprint.js
index 3f2d482c1e9..dac0a906850 100644
--- a/addons/pos_restaurant/static/src/js/multiprint.js
+++ b/addons/pos_restaurant/static/src/js/multiprint.js
@@ -191,7 +191,12 @@ models.Order = models.Order.extend({
var product_id = line.get_product().id;
if (typeof resume[line_hash] === 'undefined') {
- resume[line_hash] = { qty: qty, note: note, product_id: product_id };
+ resume[line_hash] = {
+ qty: qty,
+ note: note,
+ product_id: product_id,
+ product_name_wrapped: line.generate_wrapped_product_name(),
+ };
} else {
resume[line_hash].qty += qty;
}
@@ -222,6 +227,7 @@ models.Order = models.Order.extend({
add.push({
'id': curr.product_id,
'name': this.pos.db.get_product_by_id(curr.product_id).display_name,
+ 'name_wrapped': curr.product_name_wrapped,
'note': curr.note,
'qty': curr.qty,
});
@@ -229,6 +235,7 @@ models.Order = models.Order.extend({
add.push({
'id': curr.product_id,
'name': this.pos.db.get_product_by_id(curr.product_id).display_name,
+ 'name_wrapped': curr.product_name_wrapped,
'note': curr.note,
'qty': curr.qty - old.qty,
});
@@ -236,6 +243,7 @@ models.Order = models.Order.extend({
rem.push({
'id': curr.product_id,
'name': this.pos.db.get_product_by_id(curr.product_id).display_name,
+ 'name_wrapped': curr.product_name_wrapped,
'note': curr.note,
'qty': old.qty - curr.qty,
});
@@ -248,6 +256,7 @@ models.Order = models.Order.extend({
rem.push({
'id': old.product_id,
'name': this.pos.db.get_product_by_id(old.product_id).display_name,
+ 'name_wrapped': old.product_name_wrapped,
'note': old.note,
'qty': old.qty,
});