From 7f82caa1a4f257b1f864902c8cf14e88d7e7ee1e Mon Sep 17 00:00:00 2001
From: Frederic van der Essen <fva@openerp.com / fvdessen+o@gmail.com>
Date: Fri, 8 Aug 2014 13:48:33 +0200
Subject: [PATCH] [FIX] point_of_sale: show_popup('name','comment') should
 display the comment in the popup

---
 addons/point_of_sale/static/src/js/screens.js | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/addons/point_of_sale/static/src/js/screens.js b/addons/point_of_sale/static/src/js/screens.js
index 169940e5061..97e822bf675 100644
--- a/addons/point_of_sale/static/src/js/screens.js
+++ b/addons/point_of_sale/static/src/js/screens.js
@@ -351,9 +351,14 @@ function openerp_pos_screens(instance, module){ //module is instance.point_of_sa
 
             $('body').append('<audio src="/point_of_sale/static/src/sounds/error.wav" autoplay="true"></audio>');
 
-            if( text && (text.message || text.comment) ){
-                this.$('.message').text(text.message);
-                this.$('.comment').text(text.comment);
+            if( text ) {
+                if ( text.message || text.comment ) {
+                    this.$('.message').text(text.message);
+                    this.$('.comment').text(text.comment);
+                } else {
+                    this.$('.message').text(_t('Error'));
+                    this.$('.comment').html(text);
+                }
             }
 
             this.pos.barcode_reader.save_callbacks();