diff options
| author | Frederic van der Essen <fva@openerp.com / fvdessen+o@gmail.com> | 2014-10-08 12:38:44 +0200 |
|---|---|---|
| committer | Frederic van der Essen <fva@openerp.com / fvdessen+o@gmail.com> | 2014-10-08 12:42:08 +0200 |
| commit | a644c4c3c10e79a5fb821d6bd5dc328b7f7d3b0d (patch) | |
| tree | 18cb42bd6dd92be499ee63c431124ddcad83f5e1 /addons | |
| parent | 6c779e736a092b0dd12d3c3d437f2b3f337ad38e (diff) | |
[FIX] pos_restaurant: Issue 614981: product renaming from name to display_name was not done in the pos_restaurant module, resulting in empty product names in various places
Diffstat (limited to 'addons')
| -rw-r--r-- | addons/pos_restaurant/static/src/js/multiprint.js | 8 | ||||
| -rw-r--r-- | addons/pos_restaurant/static/src/xml/splitbill.xml | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/addons/pos_restaurant/static/src/js/multiprint.js b/addons/pos_restaurant/static/src/js/multiprint.js index 14e412a5071..81b0e34053a 100644 --- a/addons/pos_restaurant/static/src/js/multiprint.js +++ b/addons/pos_restaurant/static/src/js/multiprint.js @@ -81,19 +81,19 @@ function openerp_restaurant_multiprint(instance,module){ if (typeof old[product] === 'undefined'){ add.push({ 'id': product, - 'name': this.pos.db.get_product_by_id(product).name, + 'name': this.pos.db.get_product_by_id(product).display_name, 'quantity': current[product], }); }else if( old[product] < current[product]){ add.push({ 'id': product, - 'name': this.pos.db.get_product_by_id(product).name, + 'name': this.pos.db.get_product_by_id(product).display_name, 'quantity': current[product] - old[product], }); }else if( old[product] > current[product]){ rem.push({ 'id': product, - 'name': this.pos.db.get_product_by_id(product).name, + 'name': this.pos.db.get_product_by_id(product).display_name, 'quantity': old[product] - current[product], }); } @@ -103,7 +103,7 @@ function openerp_restaurant_multiprint(instance,module){ if(typeof current[product] === 'undefined'){ rem.push({ 'id': product, - 'name': this.pos.db.get_product_by_id(product).name, + 'name': this.pos.db.get_product_by_id(product).display_name, 'quantity': old[product], }); } diff --git a/addons/pos_restaurant/static/src/xml/splitbill.xml b/addons/pos_restaurant/static/src/xml/splitbill.xml index d56f01aaa9b..e14f7ffef70 100644 --- a/addons/pos_restaurant/static/src/xml/splitbill.xml +++ b/addons/pos_restaurant/static/src/xml/splitbill.xml @@ -13,7 +13,7 @@ <li t-attf-class="orderline #{ selected ? 'selected' : ''} #{ quantity !== line.get_quantity() ? 'partially' : '' }" t-att-data-id="id"> <span class="product-name"> - <t t-esc="line.get_product().name"/> + <t t-esc="line.get_product().display_name"/> </span> <span class="price"> <t t-esc="widget.format_currency(line.get_display_price())"/> |