Merge lp:~openerp-dev/openobject-addons/7.0-pos-backport-from-trunk into lp:openobject-addons/7.0

[van der Essen Frédéric (OpenERP)]

This is a Backport from all the fixes and improvements made to the point of sale client in trunk since the last few month. The invoicing support has been left out as it would introduce database changes.

Changes:
--------

- Two New Proxy Methods :
test_connection <- used to test the presence of the proxy
log <- used to log posted orders via the proxy, so that they can be retrieved in the event of a browser localStorage destruction.

The other changes are in the JS/CSS/Templates and do not impact the public APIs:

- Fixed memory leaks
- Improved product list performance
- Improved weighting scale reactivity
- Skip the weighting invite screen in cashier mode for faster scaling
- Prevent parallel calls to the proxy, and prevent call reordering
- Improved parallel order workflow. (You can now Destroy them, and they are kept aside while you process new orders)
- Removed hover effects that would interact badly with the mouse cursor on resistive screens
- Lots of other small fixes

[lp:~openerp-dev/openobject-addons/7.0-pos-backport-from-trunk]

9463. By van der Essen Frédéric (OpenERP) on 2013-09-23

[MERGE] point_of_sale: fix for the closing confirmation dialog in self checkout mode

Unmerged revisions

9463. By van der Essen Frédéric (OpenERP) on 2013-09-23

[MERGE] point_of_sale: fix for the closing confirmation dialog in self checkout mode

9462. By van der Essen Frédéric (OpenERP) on 2013-09-20

[BACKPORT] point_of_sale: backporting the point of sale client from trunk. Invoicing support has not been included

=== modified file 'point_of_sale/__openerp__.py'
--- point_of_sale/__openerp__.py	2013-01-31 18:41:41 +0000
+++ point_of_sale/__openerp__.py	2013-09-23 15:13:26 +0000
@@ -98,6 +98,7 @@
         'static/src/js/widgets.js',
         'static/src/js/devices.js',
         'static/src/js/screens.js',
+        'static/src/js/tests.js',
         'static/src/js/main.js',
     ],
     'css': [

=== modified file 'point_of_sale/controllers/main.py'
--- point_of_sale/controllers/main.py	2012-11-29 22:26:45 +0000
+++ point_of_sale/controllers/main.py	2013-09-23 15:13:26 +0000
@@ -6,6 +6,8 @@
 
 from openerp.addons.web.controllers.main import manifest_list, module_boot, html_template
 
+_logger = logging.getLogger(__name__)
+
 class PointOfSaleController(openerp.addons.web.http.Controller):
     _cp_path = '/pos'
 
@@ -167,4 +169,14 @@
         print 'print_pdf_invoice' + str(pdfinvoice)
         return
 
+    @openerp.addons.web.http.jsonrequest
+    def test_connection(self, request):
+        print 'test_connection'
+
+    @openerp.addons.web.http.jsonrequest
+    def log(self, request, arguments):
+        _logger.info(' '.join(str(v) for v in arguments))
+
+    
+
 

=== modified file 'point_of_sale/static/src/css/pos.css'
--- point_of_sale/static/src/css/pos.css	2013-09-12 15:54:09 +0000
+++ point_of_sale/static/src/css/pos.css	2013-09-23 15:13:26 +0000
@@ -21,6 +21,10 @@
             user-select: none;
 }
 
+.point-of-sale .oe_hidden{
+    display: none !important;
+}
+
 .point-of-sale ul, .point-of-sale li  {
     margin: 0;
     padding: 0;
@@ -175,10 +179,9 @@
     background:      linear-gradient(#b2b3d7, #7f82ac);
 }
 
-.point-of-sale #rightheader button.neworder-button {
+.point-of-sale #rightheader button.square{
     width: 32px;
     margin-left:4px;
-    margin-right:4px;
 }
 
 .point-of-sale div#order-selector {
@@ -186,12 +189,20 @@
 }
 .point-of-sale ol#orders {
     display: inline;
+    margin-left: 8px;
 }
 .point-of-sale li.order-selector-button {
     display: inline;
 }
 .point-of-sale li.selected-order button {
     font-weight: 900;
+    background: #7174A8 !important;
+    color: rgb(236, 237, 255) !important;
+    text-shadow: 0px 1px rgba(0, 0, 0, 0.31);
+    -webkit-box-shadow: 0px 1px 2px rgb(63, 66, 139) inset;
+       -moz-box-shadow: 0px 1px 2px rgb(63, 66, 139) inset;
+        -ms-box-shadow: 0px 1px 2px rgb(63, 66, 139) inset;
+            box-shadow: 0px 1px 2px rgb(63, 66, 139) inset;
 }
 
 /*  c) The session buttons */
@@ -215,7 +226,7 @@
 .point-of-sale #rightheader .header-button:last-child{
     border-left:  1px solid #3a3a3a;
 }
-.point-of-sale #rightheader .header-button:hover{
+.point-of-sale #rightheader .header-button:active{
     background: rgba(0,0,0,0.2);
     text-shadow: #000 0px 0px 3px;
     color:#EEE;
@@ -291,10 +302,15 @@
     display: inline-block;
     text-align: center;
     vertical-align: top;
+    width: 205px;
+    max-height: 232px;
+    overflow-y: auto;
+    overflow-x: hidden;
 }
 .point-of-sale #paypad button {
     height: 50px;
-    width: 208px;
+    display: block;
+    width: 100%;
     margin: 0px -6px 4px -2px;
     font-weight: bold;
     vertical-align: middle;
@@ -302,7 +318,10 @@
     border-top: 1px solid #efefef;
     font-size: 14px;
 }
-.point-of-sale #paypad button:hover, .point-of-sale #numpad button:hover, .point-of-sale #numpad .selected-mode, .point-of-sale .popup button:hover {
+.point-of-sale #paypad button:active, 
+.point-of-sale #numpad button:active, 
+.point-of-sale #numpad .selected-mode, 
+.point-of-sale .popup  button:active{
     border: none;
     color: white;
     background: #7f82ac;
@@ -502,7 +521,7 @@
        -moz-box-shadow: 0px 2px 2px rgba(0,0,0, 0.1);
             box-shadow: 0px 2px 2px rgba(0,0,0, 0.1);
 }
-.point-of-sale .category-simple-button:hover {
+.point-of-sale .category-simple-button:active{
     color: white;
     background: #7f82ac;
     border: 1px solid #7f82ac;
@@ -1040,13 +1059,13 @@
        -moz-transition: background 250ms ease-in-out;
             transition: background 250ms ease-in-out;
 }
-.point-of-sale .order .orderline:hover{
+.point-of-sale .order .orderline:active{
     background: rgba(140,143,183,0.05);
     -webkit-transition: background 50ms ease-in-out;
        -moz-transition: background 50ms ease-in-out;
             transition: background 50ms ease-in-out;
 }
-.point-of-sale .order .orderline.empty:hover{
+.point-of-sale .order .orderline.empty:active{
     background: transparent;
     cursor: default;
 }
@@ -1148,7 +1167,7 @@
 .point-of-sale .pos-actionbar .button .icon{
     margin-top: 10px;
 }
-.point-of-sale .pos-actionbar .button:hover {
+.point-of-sale .pos-actionbar .button:active{
     color: white;
     background: #7f82ac;
     border: 1px solid #7f82ac;
@@ -1165,7 +1184,7 @@
 .point-of-sale .pos-actionbar .button.disabled *{
     opacity: 0.5;
 }
-.point-of-sale .pos-actionbar .button.disabled:hover{
+.point-of-sale .pos-actionbar .button.disabled:active{
     border: 1px solid #cacaca;
     border-radius: 4px;
     color: #555;
@@ -1234,7 +1253,7 @@
     display: block;
     cursor:pointer;
 }
-.point-of-sale .debug-widget .button:hover{
+.point-of-sale .debug-widget .button:active{
     background: rgba(96,21,177,0.45);
 }
 .point-of-sale .debug-widget input{
@@ -1322,7 +1341,7 @@
        -moz-box-shadow: 0px 2px 2px rgba(0,0,0, 0.3);
             box-shadow: 0px 2px 2px rgba(0,0,0, 0.3);
 }
-.point-of-sale .popup .button:hover {
+.point-of-sale .popup .button:active{
     color: white;
     background: #7f82ac;
     border: 1px solid #7f82ac;
@@ -1390,7 +1409,7 @@
        -moz-transition: all 250ms ease-in-out;
             transition: all 250ms ease-in-out;
 }
-.point-of-sale .scrollbar .button:hover{
+.point-of-sale .scrollbar .button:active{
     text-shadow: rgba(255,255,255,0.8) 0px 0px 15px;
 }
 .point-of-sale .scrollbar .button.disabled{

=== added file 'point_of_sale/static/src/img/minus.png'
Binary files point_of_sale/static/src/img/minus.png	1970-01-01 00:00:00 +0000 and point_of_sale/static/src/img/minus.png	2013-09-23 15:13:26 +0000 differ
=== added file 'point_of_sale/static/src/img/plus.png'
Binary files point_of_sale/static/src/img/plus.png	1970-01-01 00:00:00 +0000 and point_of_sale/static/src/img/plus.png	2013-09-23 15:13:26 +0000 differ
=== modified file 'point_of_sale/static/src/js/db.js'
--- point_of_sale/static/src/js/db.js	2013-09-12 14:12:08 +0000
+++ point_of_sale/static/src/js/db.js	2013-09-23 15:13:26 +0000
@@ -270,11 +270,21 @@
             return results;
         },
         add_order: function(order){
-            var last_id = this.load('last_order_id',0);
+            var order_id = order.uid;
             var orders  = this.load('orders',[]);
-            orders.push({id: last_id + 1, data: order});
-            this.save('last_order_id',last_id+1);
+
+            // if the order was already stored, we overwrite its data
+            for(var i = 0, len = orders.length; i < len; i++){
+                if(orders[i].id === order_id){
+                    orders[i].data = order;
+                    this.save('orders',orders);
+                    return order_id;
+                }
+            }
+
+            orders.push({id: order_id, data: order});
             this.save('orders',orders);
+            return order_id;
         },
         remove_order: function(order_id){
             var orders = this.load('orders',[]);
@@ -286,5 +296,14 @@
         get_orders: function(){
             return this.load('orders',[]);
         },
+        get_order: function(order_id){
+            var orders = this.get_orders();
+            for(var i = 0, len = orders.length; i < len; i++){
+                if(orders[i].id === order_id){
+                    return orders[i];
+                }
+            }
+            return undefined;
+        },
     });
 }

=== modified file 'point_of_sale/static/src/js/devices.js'
--- point_of_sale/static/src/js/devices.js	2013-09-18 15:33:47 +0000
+++ point_of_sale/static/src/js/devices.js	2013-09-23 15:13:26 +0000
@@ -1,16 +1,92 @@
 
 function openerp_pos_devices(instance,module){ //module is instance.point_of_sale
 
+    // the JobQueue schedules a sequence of 'jobs'. each job is
+    // a function returning a deferred. the queue waits for each job to finish 
+    // before launching the next. Each job can also be scheduled with a delay. 
+    // the  is used to prevent parallel requests to the proxy.
+
+    module.JobQueue = function(){
+        var queue = [];
+        var running = false;
+        var scheduled_end_time = 0;
+        var end_of_queue = (new $.Deferred()).resolve();
+        var stoprepeat = false;
+
+        var run = function(){
+            if(end_of_queue.state() === 'resolved'){
+                end_of_queue =  new $.Deferred();
+            }
+            if(queue.length > 0){
+                running = true;
+                var job = queue[0];
+                if(!job.opts.repeat || stoprepeat){
+                    queue.shift();
+                    stoprepeat = false;
+                }
+
+                // the time scheduled for this job
+                scheduled_end_time = (new Date()).getTime() + (job.opts.duration || 0);
+
+                // we run the job and put in def when it finishes
+                var def = job.fun() || (new $.Deferred()).resolve();
+                
+                // we don't care if a job fails ... 
+                def.always(function(){
+                    // we run the next job after the scheduled_end_time, even if it finishes before
+                    setTimeout(function(){
+                        run();
+                    }, Math.max(0, scheduled_end_time - (new Date()).getTime()) ); 
+                });
+            }else{
+                running = false;
+                scheduled_end_time = 0;
+                end_of_queue.resolve();
+            }
+        };
+        
+        // adds a job to the schedule.
+        // opts : {
+        //    duration    : the job is guaranteed to finish no quicker than this (milisec)
+        //    repeat      : if true, the job will be endlessly repeated
+        //    important   : if true, the scheduled job cannot be canceled by a queue.clear()
+        // }
+        this.schedule  = function(fun, opts){
+            queue.push({fun:fun, opts:opts || {}});
+            if(!running){
+                run();
+            }
+        }
+
+        // remove all jobs from the schedule (except the ones marked as important)
+        this.clear = function(){
+            queue = _.filter(queue,function(job){job.opts.important === true}); 
+        };
+
+        // end the repetition of the current job
+        this.stoprepeat = function(){
+            stoprepeat = true;
+        };
+        
+        // returns a deferred that resolves when all scheduled 
+        // jobs have been run.
+        // ( jobs added after the call to this method are considered as well )
+        this.finished = function(){
+            return end_of_queue;
+        }
+
+    };
+
     // this object interfaces with the local proxy to communicate to the various hardware devices
     // connected to the Point of Sale. As the communication only goes from the POS to the proxy,
     // methods are used both to signal an event, and to fetch information. 
 
     module.ProxyDevice  = instance.web.Class.extend({
         init: function(options){
+            var self = this;
             options = options || {};
             url = options.url || 'http://localhost:8069';
             
-            this.weight = 0;
             this.weighting = false;
             this.debug_weight = 0;
             this.use_debug_weight = false;
@@ -25,26 +101,37 @@
             };    
             this.custom_payment_status = this.default_payment_status;
 
+            this.notifications = {};
+            this.bypass_proxy = false;
+
             this.connection = new instance.web.JsonRPC();
             this.connection.setup(url);
             this.connection.session_id = _.uniqueId('posproxy');
-            this.bypass_proxy = false;
-            this.notifications = {};
+            this.test_connection();
+            window.proxy = this;
             
         },
+        close: function(){
+            this.connection.destroy();
+        },
         message : function(name,params){
-            var ret = new $.Deferred();
             var callbacks = this.notifications[name] || [];
             for(var i = 0; i < callbacks.length; i++){
                 callbacks[i](params);
             }
-
-            this.connection.rpc('/pos/' + name, params || {}).done(function(result) {
-                ret.resolve(result);
-            }).fail(function(error) {
-                ret.reject(error);
-            });
-            return ret;
+            if(this.connected){
+                return this.connection.rpc('/pos/' + name, params || {});       
+            }else{
+                return (new $.Deferred()).reject();
+            }
+        },
+        test_connection: function(){
+            var self = this;
+            this.connected = true;
+            return this.message('test_connection').fail(function(){
+                    self.connected = false;
+                    console.error('Could not connect to the Proxy');
+                });
         },
 
         // this allows the client to be notified when a proxy call is made. The notification 
@@ -55,6 +142,8 @@
             }
             this.notifications[name].push(callback);
         },
+
+        
         
         //a product has been scanned and recognized with success
         // ean is a parsed ean object
@@ -80,13 +169,32 @@
 
         //the client is starting to weight
         weighting_start: function(){
+            var ret = new $.Deferred();
             if(!this.weighting){
                 this.weighting = true;
-                if(!this.bypass_proxy){
-                    this.weight = 0;
-                    return this.message('weighting_start');
-                }
-            }
+                this.message('weighting_start').always(function(){
+                    ret.resolve();
+                });
+            }else{
+                console.error('Weighting already started!!!');
+                ret.resolve();
+            }
+            return ret;
+        },
+
+        // the client has finished weighting products
+        weighting_end: function(){
+            var ret = new $.Deferred();
+            if(this.weighting){
+                this.weighting = false;
+                this.message('weighting_end').always(function(){
+                    ret.resolve();
+                });
+            }else{
+                console.error('Weighting already ended !!!');
+                ret.resolve();
+            }
+            return ret;
         },
 
         //returns the weight on the scale. 
@@ -94,17 +202,14 @@
         // and a weighting_end()
         weighting_read_kg: function(){
             var self = this;
+            var ret = new $.Deferred();
             this.message('weighting_read_kg',{})
-                .done(function(weight){
-                    if(self.weighting){
-                        if(self.use_debug_weight){
-                            self.weight = self.debug_weight;
-                        }else{
-                            self.weight = weight;
-                        }
-                    }
+                .then(function(weight){
+                    ret.resolve(self.use_debug_weight ? self.debug_weight : weight);
+                }, function(){ //failed to read weight
+                    ret.resolve(self.use_debug_weight ? self.debug_weight : 0.0);
                 });
-            return this.weight;
+            return ret;
         },
 
         // sets a custom weight, ignoring the proxy returned value. 
@@ -119,12 +224,6 @@
             this.debug_weight = 0;
         },
 
-        // the client has finished weighting products
-        weighting_end: function(){
-            this.weight = 0;
-            this.weighting = false;
-            this.message('weighting_end');
-        },
 
         // the pos asks the client to pay 'price' units
         payment_request: function(price){
@@ -237,6 +336,11 @@
             return this.message('print_receipt',{receipt: receipt});
         },
 
+        // asks the proxy to log some information, as with the debug.log you can provide several arguments.
+        log: function(){
+            return this.message('log',{'arguments': _.toArray(arguments)});
+        },
+
         // asks the proxy to print an invoice in pdf form ( used to print invoices generated by the server ) 
         print_pdf_invoice: function(pdfinvoice){
             return this.message('print_pdf_invoice',{pdfinvoice: pdfinvoice});

=== modified file 'point_of_sale/static/src/js/main.js'
--- point_of_sale/static/src/js/main.js	2012-11-29 22:26:45 +0000
+++ point_of_sale/static/src/js/main.js	2013-09-23 15:13:26 +0000
@@ -16,10 +16,12 @@
     openerp_pos_scrollbar(instance,module);  // import pos_scrollbar_widget.js
 
     openerp_pos_screens(instance,module);    // import pos_screens.js
+
+    openerp_pos_devices(instance,module);    // import pos_devices.js
     
     openerp_pos_widgets(instance,module);    // import pos_widgets.js
 
-    openerp_pos_devices(instance,module);    // import pos_devices.js
+    openerp_pos_tests(instance,module);      // import pos_tests.js
 
     instance.web.client_actions.add('pos.ui', 'instance.point_of_sale.PosWidget');
 };

=== modified file 'point_of_sale/static/src/js/models.js'
--- point_of_sale/static/src/js/models.js	2013-09-18 12:28:36 +0000
+++ point_of_sale/static/src/js/models.js	2013-09-23 15:13:26 +0000
@@ -24,6 +24,7 @@
 
             this.barcode_reader = new module.BarcodeReader({'pos': this});  // used to read barcodes
             this.proxy = new module.ProxyDevice();              // used to communicate to the hardware devices via a local proxy
+            this.proxy_queue = new module.JobQueue();         // used to prevent parallels communications to the proxy
             this.db = new module.PosLS();                       // a database used to store the products and categories
             this.db.clear('products','categories');
             this.debug = jQuery.deparam(jQuery.param.querystring()).debug !== undefined;    //debug mode 
@@ -56,7 +57,9 @@
                 'selectedOrder':    null,
             });
 
-            this.get('orders').bind('remove', function(){ self.on_removed_order(); });
+            this.get('orders').bind('remove', function(order,_unused_,options){ 
+                self.on_removed_order(order,options.index,options.reason); 
+            });
             
             // We fetch the backend data on the server asynchronously. this is done only when the pos user interface is launched,
             // Any change on this data made on the server is thus not reflected on the point of sale until it is relaunched. 
@@ -72,6 +75,14 @@
                 });
         },
 
+        // releases ressources holds by the model at the end of life of the posmodel
+        destroy: function(){
+            // FIXME, should wait for flushing, return a deferred to indicate successfull destruction
+            // this.flush();
+            this.proxy.close();
+            this.barcode_reader.disconnect();
+        },
+
         // helper function to load data from the server
         fetch: function(model, fields, domain, ctx){
             return new instance.web.Model(model).query(fields).filter(domain).context(ctx).all()
@@ -138,10 +149,10 @@
 
                     return self.fetch(
                         'pos.config',
-                        ['name','journal_ids','shop_id','journal_id',
+                        ['name','journal_ids','shop_id','journal_id','pricelist_id',
                          'iface_self_checkout', 'iface_led', 'iface_cashdrawer',
                          'iface_payment_terminal', 'iface_electronic_scale', 'iface_barscan', 'iface_vkeyboard',
-                         'iface_print_via_proxy','iface_cashdrawer','state','sequence_id','session_ids'],
+                         'iface_print_via_proxy','iface_cashdrawer','iface_invoicing','state','sequence_id','session_ids'],
                         [['id','=', self.get('pos_session').config_id[0]]]
                     );
                 }).then(function(configs){
@@ -178,7 +189,7 @@
                         ['name', 'list_price','price','pos_categ_id', 'taxes_id', 'ean13', 'default_code',
                          'to_weight', 'uom_id', 'uos_id', 'uos_coeff', 'mes_type', 'description_sale', 'description'],
                         [['sale_ok','=',true],['available_in_pos','=',true]],
-                        {pricelist: self.get('shop').pricelist_id[0]} // context for price
+                        {pricelist: self.get('pricelist').id} // context for price
                     );
                 }).then(function(products){
                     self.db.add_products(products);
@@ -235,20 +246,17 @@
         
         // this is called when an order is removed from the order collection. It ensures that there is always an existing
         // order and a valid selected order
-        on_removed_order: function(removed_order){
-            if( this.get('orders').isEmpty()){
+        on_removed_order: function(removed_order,index,reason){
+            if(reason === 'abandon' && this.get('orders').size() > 0){
+                // when we intentionally remove an unfinished order, and there is another existing one
+                this.set({'selectedOrder' : this.get('orders').at(index) || this.get('orders').last()});
+            }else{
+                // when the order was automatically removed after completion, 
+                // or when we intentionally delete the only concurrent order
                 this.add_new_order();
-            }else{
-                this.set({ selectedOrder: this.get('orders').last() });
             }
         },
 
-        // saves the order locally and try to send it to the backend. 'record' is a bizzarely defined JSON version of the Order
-        push_order: function(record) {
-            this.db.add_order(record);
-            this.flush();
-        },
-
         //creates a new empty order and sets it as the current order
         add_new_order: function(){
             var order = new module.Order({pos:this});
@@ -256,45 +264,112 @@
             this.set('selectedOrder', order);
         },
 
+        //removes the current order
+        delete_current_order: function(){
+            this.get('selectedOrder').destroy({'reason':'abandon'});
+        },
+
+        // saves the order locally and try to send it to the backend. 
+        // it returns a deferred that succeeds after having tried to send the order and all the other pending orders.
+        push_order: function(order) {
+            var self = this;
+            this.proxy.log('push_order',order.export_as_JSON());
+            var order_id = this.db.add_order(order.export_as_JSON());
+            var pushed = new $.Deferred();
+
+            this.set('nbr_pending_operations',self.db.get_orders().length);
+
+            this.flush_mutex.exec(function(){
+                var flushed = self._flush_all_orders();
+
+                flushed.always(function(){
+                    pushed.resolve();
+                });
+
+                return flushed;
+            });
+            return pushed;
+        },
+
         // attemps to send all pending orders ( stored in the pos_db ) to the server,
         // and remove the successfully sent ones from the db once
         // it has been confirmed that they have been sent correctly.
         flush: function() {
-            //TODO make the mutex work 
-            //this makes sure only one _int_flush is called at the same time
-            /*
-            return this.flush_mutex.exec(_.bind(function() {
-                return this._flush(0);
-            }, this));
-            */
-            this._flush(0);
-        },
-        // attempts to send an order of index 'index' in the list of order to send. The index
-        // is used to skip orders that failed. do not call this method outside the mutex provided
-        // by flush() 
-        _flush: function(index){
+            var self = this;
+            var flushed = new $.Deferred();
+
+            this.flush_mutex.exec(function(){
+                var done = new $.Deferred();
+
+                self._flush_all_orders()
+                    .done(  function(){ flushed.resolve();})
+                    .fail(  function(){ flushed.reject(); })
+                    .always(function(){ done.resolve();   });
+
+                return done;
+            });
+
+            return flushed;
+        },
+
+        // attempts to send the locally stored order of id 'order_id'
+        // the sending is asynchronous and can take some time to decide if it is successful or not
+        // it is therefore important to only call this method from inside a mutex
+        // this method returns a deferred indicating wether the sending was successful or not
+        // there is a timeout parameter which is set to 2 seconds by default. 
+        _flush_order: function(order_id, options){
+            var self   = this;
+            options = options || {};
+            timeout = typeof options.timeout === 'number' ? options.timeout : 5000;
+
+            var order  = this.db.get_order(order_id);
+            order.to_invoice = options.to_invoice || false;
+
+            if(!order){
+                // flushing a non existing order always fails
+                return (new $.Deferred()).reject();
+            }
+
+            // we try to send the order. shadow prevents a spinner if it takes too long. (unless we are sending an invoice,
+            // then we want to notify the user that we are waiting on something )
+            var rpc = (new instance.web.Model('pos.order')).call('create_from_ui',[[order]],undefined,{shadow: !options.to_invoice, timeout:timeout});
+
+            rpc.fail(function(unused,event){
+                // prevent an error popup creation by the rpc failure
+                // we want the failure to be silent as we send the orders in the background
+                event.preventDefault();
+                console.error('Failed to send order:',order);
+            });
+
+            rpc.done(function(){
+                self.db.remove_order(order_id);
+                self.set('nbr_pending_operations',self.db.get_orders().length);
+            });
+
+            return rpc;
+        },
+        
+        // attempts to send all the locally stored orders. As with _flush_order, it should only be
+        // called from within a mutex. 
+        // this method returns a deferred that always succeeds when all orders have been tried to be sent,
+        // even if none of them could actually be sent. 
+        _flush_all_orders: function(){
             var self = this;
             var orders = this.db.get_orders();
-            self.set('nbr_pending_operations',orders.length);
+            var tried_all = new $.Deferred();
 
-            var order  = orders[index];
-            if(!order){
-                return;
+            function rec_flush(index){
+                if(index < orders.length){
+                    self._flush_order(orders[index].id).always(function(){ 
+                        rec_flush(index+1); 
+                    })
+                }else{
+                    tried_all.resolve();
+                }
             }
-            //try to push an order to the server
-            // shadow : true is to prevent a spinner to appear in case of timeout
-            (new instance.web.Model('pos.order')).call('create_from_ui',[[order]],undefined,{ shadow:true })
-                .fail(function(unused, event){
-                    //don't show error popup if it fails 
-                    event.preventDefault();
-                    console.error('Failed to send order:',order);
-                    self._flush(index+1);
-                })
-                .done(function(){
-                    //remove from db if success
-                    self.db.remove_order(order.id);
-                    self._flush(index);
-                });
+            rec_flush(0);
+
+            return tried_all;
         },
 
         scan_product: function(parsed_ean){
@@ -326,7 +401,7 @@
 
     module.Product = Backbone.Model.extend({
         get_image_url: function(){
-            return instance.session.url('/web/binary/image', {model: 'product.product', field: 'image', id: this.get('id')});
+            return instance.session.url('/web/binary/image', {model: 'product.product', field: 'image_medium', id: this.get('id')});
         },
     });
 
@@ -593,11 +668,12 @@
     module.Order = Backbone.Model.extend({
         initialize: function(attributes){
             Backbone.Model.prototype.initialize.apply(this, arguments);
+            this.uid =     this.generateUniqueId();
             this.set({
                 creationDate:   new Date(),
                 orderLines:     new module.OrderlineCollection(),
                 paymentLines:   new module.PaymentlineCollection(),
-                name:           "Order " + this.generateUniqueId(),
+                name:           "Order " + this.uid,
                 client:         null,
             });
             this.pos =     attributes.pos; 
@@ -773,7 +849,7 @@
                 currency: this.pos.get('currency'),
             };
         },
-        exportAsJSON: function() {
+        export_as_JSON: function() {
             var orderLines, paymentLines;
             orderLines = [];
             (this.get('orderLines')).each(_.bind( function(item) {
@@ -792,8 +868,9 @@
                 lines: orderLines,
                 statement_ids: paymentLines,
                 pos_session_id: this.pos.get('pos_session').id,
-                partner_id: this.get('client') ? this.get('client').id : undefined,
+                partner_id: this.get_client() ? this.get_client().id : false,
                 user_id: this.pos.get('cashier') ? this.pos.get('cashier').id : this.pos.get('user').id,
+                uid: this.uid,
             };
         },
         getSelectedLine: function(){

=== modified file 'point_of_sale/static/src/js/screens.js'
--- point_of_sale/static/src/js/screens.js	2013-09-12 15:13:34 +0000
+++ point_of_sale/static/src/js/screens.js	2013-09-23 15:13:26 +0000
@@ -253,7 +253,7 @@
 
             this.hidden = false;
             if(this.$el){
-                this.$el.show();
+                this.$el.removeClass('oe_hidden');
             }
 
             if(this.pos_widget.action_bar.get_button_count() > 0){
@@ -271,19 +271,19 @@
                 });
 
             var self = this;
-            var cashier_mode = this.pos_widget.screen_selector.get_user_mode() === 'cashier';
+            this.cashier_mode = this.pos_widget.screen_selector.get_user_mode() === 'cashier';
 
-            this.pos_widget.set_numpad_visible(this.show_numpad && cashier_mode);
+            this.pos_widget.set_numpad_visible(this.show_numpad && this.cashier_mode);
             this.pos_widget.set_leftpane_visible(this.show_leftpane);
-            this.pos_widget.set_left_action_bar_visible(this.show_leftpane && !cashier_mode);
-            this.pos_widget.set_cashier_controls_visible(cashier_mode);
+            this.pos_widget.set_left_action_bar_visible(this.show_leftpane && !this.cashier_mode);
+            this.pos_widget.set_cashier_controls_visible(this.cashier_mode);
 
-            if(cashier_mode && this.pos.iface_self_checkout){
+            if(this.cashier_mode && this.pos.iface_self_checkout){
                 this.pos_widget.client_button.show();
             }else{
                 this.pos_widget.client_button.hide();
             }
-            if(cashier_mode){
+            if(this.cashier_mode){
                 this.pos_widget.close_button.show();
             }else{
                 this.pos_widget.close_button.hide();
@@ -314,7 +314,7 @@
         hide: function(){
             this.hidden = true;
             if(this.$el){
-                this.$el.hide();
+                this.$el.addClass('oe_hidden');
             }
         },
 
@@ -326,7 +326,7 @@
             this._super();
             if(this.hidden){
                 if(this.$el){
-                    this.$el.hide();
+                    this.$el.addClass('oe_hidden');
                 }
             }
         },
@@ -335,7 +335,7 @@
     module.PopUpWidget = module.PosBaseWidget.extend({
         show: function(){
             if(this.$el){
-                this.$el.show();
+                this.$el.removeClass('oe_hidden');
             }
         },
         /* called before hide, when a popup is closed */
@@ -345,7 +345,7 @@
          * pos instantiation, so you don't want to do anything fancy in here */
         hide: function(){
             if(this.$el){
-                this.$el.hide();
+                this.$el.addClass('oe_hidden');
             }
         },
     });
@@ -434,6 +434,14 @@
         template:'ErrorNegativePricePopupWidget',
     });
 
+    module.ErrorNoClientPopupWidget = module.ErrorPopupWidget.extend({
+        template: 'ErrorNoClientPopupWidget',
+    });
+
+    module.ErrorInvoiceTransferPopupWidget = module.ErrorPopupWidget.extend({
+        template: 'ErrorInvoiceTransferPopupWidget',
+    });
+                
     module.ScaleInviteScreenWidget = module.ScreenWidget.extend({
         template:'ScaleInviteScreenWidget',
 
@@ -443,30 +451,35 @@
         show: function(){
             this._super();
             var self = this;
-
-            self.pos.proxy.weighting_start();
-
-            this.intervalID = setInterval(function(){
-                var weight = self.pos.proxy.weighting_read_kg();
-                if(weight > 0.001){
-                    clearInterval(this.intervalID);
-                    self.pos_widget.screen_selector.set_current_screen(self.next_screen);
-                }
-            },500);
+            var queue = this.pos.proxy_queue;
+
+            queue.schedule(function(){
+                return self.pos.proxy.weighting_start();
+            },{ important: true });
+            
+            queue.schedule(function(){
+                return self.pos.proxy.weighting_read_kg().then(function(weight){
+                    if(weight > 0.001){
+                        self.pos_widget.screen_selector.set_current_screen(self.next_screen);
+                    }
+                });
+            },{duration: 100, repeat: true});
 
             this.add_action_button({
                     label: _t('Back'),
                     icon: '/point_of_sale/static/src/img/icons/png48/go-previous.png',
                     click: function(){  
-                        clearInterval(this.intervalID);
                         self.pos_widget.screen_selector.set_current_screen(self.previous_screen);
                     }
                 });
         },
         close: function(){
             this._super();
-            clearInterval(this.intervalID);
-            this.pos.proxy.weighting_end();
+            var self = this;
+            this.pos.proxy_queue.clear();
+            this.pos.proxy_queue.schedule(function(){
+                return self.pos.proxy.weighting_end();
+            },{ important: true });
         },
     });
 
@@ -478,9 +491,11 @@
 
         show: function(){
             this._super();
+            var self = this;
+            var queue = this.pos.proxy_queue;
+
+            this.set_weight(0);
             this.renderElement();
-            var self = this;
-
 
             this.add_action_button({
                     label: _t('Back'),
@@ -499,14 +514,16 @@
                     },
                 });
             
-            this.pos.proxy.weighting_start();
-            this.intervalID = setInterval(function(){
-                var weight = self.pos.proxy.weighting_read_kg();
-                if(weight != self.weight){
-                    self.weight = weight;
-                    self.renderElement();
-                }
-            },200);
+            queue.schedule(function(){
+                return self.pos.proxy.weighting_start()
+            },{ important: true });
+            
+            queue.schedule(function(){
+                return self.pos.proxy.weighting_read_kg().then(function(weight){
+                    self.set_weight(weight);
+                });
+            },{duration:50, repeat: true});
+
         },
         renderElement: function(){
             var self = this;
@@ -525,8 +542,7 @@
             }
         },
         order_product: function(){
-            var weight = this.pos.proxy.weighting_read_kg();
-            this.pos.get('selectedOrder').addProduct(this.get_product(),{ quantity:weight });
+            this.pos.get('selectedOrder').addProduct(this.get_product(),{ quantity: this.weight });
         },
         get_product_name: function(){
             var product = this.get_product();
@@ -536,54 +552,24 @@
             var product = this.get_product();
             return (product ? product.get('price') : 0) || 0;
         },
-        get_product_weight: function(){
-            return this.weight || 0;
+        set_weight: function(weight){
+            this.weight = weight;
+            this.$('.js-weight').text(this.get_product_weight_string());
+        },
+        get_product_weight_string: function(){
+            return (this.weight || 0).toFixed(3) + ' Kg';
         },
         close: function(){
+            var self = this;
             this._super();
-            clearInterval(this.intervalID);
-            this.pos.proxy.weighting_end();
+
+            this.pos.proxy_queue.clear();
+            this.pos.proxy_queue.schedule(function(){
+                self.pos.proxy.weighting_end();
+            },{ important: true });
         },
     });
 
-    // the JobQueue schedules a sequence of 'jobs'. each job is
-    // a function returning a deferred. the queue waits for each job to finish 
-    // before launching the next. Each job can also be scheduled with a delay. 
-    // the queue jobqueue is used to prevent parallel requests to the payment terminal.
-
-    module.JobQueue = function(){
-        var queue = [];
-        var running = false;
-        var run = function(){
-            if(queue.length > 0){
-                running = true;
-                var job = queue.shift();
-                setTimeout(function(){
-                    var def = job.fun();
-                    if(def){
-                        def.done(run);
-                    }else{
-                        run();
-                    }
-                },job.delay || 0);
-            }else{
-                running = false;
-            }
-        };
-        
-        // adds a job to the schedule.
-        this.schedule  = function(fun, delay){
-            queue.push({fun:fun, delay:delay});
-            if(!running){
-                run();
-            }
-        }
-
-        // remove all jobs from the schedule
-        this.clear = function(){
-            queue = [];
-        };
-    };
 
     module.ClientPaymentScreenWidget =  module.ScreenWidget.extend({
         template:'ClientPaymentScreenWidget',
@@ -639,7 +625,7 @@
 
                             var cashregister = selfCheckoutRegisters[0] || self.pos.get('cashRegisters').models[0];
                             currentOrder.addPaymentLine(cashregister);
-                            self.pos.push_order(currentOrder.exportAsJSON())
+                            self.pos.push_order(currentOrder)
                             currentOrder.destroy();
                             self.pos.proxy.transaction_end();
                             self.pos_widget.screen_selector.set_current_screen(self.next_screen);
@@ -705,7 +691,7 @@
         barcode_client_action: function(ean){
             this.pos.proxy.transaction_start();
             this._super(ean);
-            $('.goodbye-message').hide();
+            $('.goodbye-message').addClass('oe_hidden');
             this.pos_widget.screen_selector.show_popup('choose-receipt');
         },
         
@@ -717,14 +703,14 @@
                     label: _t('Help'),
                     icon: '/point_of_sale/static/src/img/icons/png48/help.png',
                     click: function(){ 
-                        $('.goodbye-message').css({opacity:1}).hide();
+                        $('.goodbye-message').css({opacity:1}).addClass('oe_hidden');
                         self.help_button_action();
                     },
                 });
 
-            $('.goodbye-message').css({opacity:1}).show();
+            $('.goodbye-message').css({opacity:1}).removeClass('oe_hidden');
             setTimeout(function(){
-                $('.goodbye-message').animate({opacity:0},500,'swing',function(){$('.goodbye-message').hide();});
+                $('.goodbye-message').animate({opacity:0},500,'swing',function(){$('.goodbye-message').addClass('oe_hidden');});
             },5000);
         },
     });
@@ -732,7 +718,8 @@
     module.ProductScreenWidget = module.ScreenWidget.extend({
         template:'ProductScreenWidget',
 
-        scale_screen: 'scale_invite',
+        scale_screen: 'scale',
+        client_scale_screen : 'scale_invite',
         client_next_screen:  'client_payment',
 
         show_numpad:     true,
@@ -746,7 +733,7 @@
             this.product_list_widget = new module.ProductListWidget(this,{
                 click_product_action: function(product){
                     if(product.get('to_weight') && self.pos.iface_electronic_scale){
-                        self.pos_widget.screen_selector.set_current_screen(self.scale_screen, {product: product});
+                        self.pos_widget.screen_selector.set_current_screen( self.cashier_mode ? self.scale_screen : self.client_scale_screen, {product: product});
                     }else{
                         self.pos.get('selectedOrder').addProduct(product);
                     }
@@ -807,19 +794,42 @@
             this._super();
             var self = this;
 
-            this.add_action_button({
+            var print_button = this.add_action_button({
                     label: _t('Print'),
                     icon: '/point_of_sale/static/src/img/icons/png48/printer.png',
                     click: function(){ self.print(); },
                 });
 
-            this.add_action_button({
+            var finish_button = this.add_action_button({
                     label: _t('Next Order'),
                     icon: '/point_of_sale/static/src/img/icons/png48/go-next.png',
                     click: function() { self.finishOrder(); },
                 });
 
             this.print();
+
+            // THIS IS THE HACK OF THE CENTURY
+            //
+            // The problem is that in chrome the print() is asynchronous and doesn't
+            // execute until all rpc are finished. So it conflicts with the rpc used
+            // to send the orders to the backend, and the user is able to go to the next 
+            // screen before the printing dialog is opened. The problem is that what's 
+            // printed is whatever is in the page when the dialog is opened and not when it's called,
+            // and so you end up printing the product list instead of the receipt... 
+            //
+            // Fixing this would need a re-architecturing
+            // of the code to postpone sending of orders after printing.
+            //
+            // But since the print dialog also blocks the other asynchronous calls, the
+            // button enabling in the setTimeout() is blocked until the printing dialog is 
+            // closed. But the timeout has to be big enough or else it doesn't work
+            // 2 seconds is the same as the default timeout for sending orders and so the dialog
+            // should have appeared before the timeout... so yeah that's not ultra reliable. 
+
+            finish_button.set_disabled(true);   
+            setTimeout(function(){
+                finish_button.set_disabled(false);
+            }, 2000);
         },
         print: function() {
             window.print();
@@ -869,15 +879,20 @@
 
             this.set_numpad_state(this.pos_widget.numpad.state);
             
-            this.back_button = this.add_action_button({
+            this.add_action_button({
                     label: _t('Back'),
                     icon: '/point_of_sale/static/src/img/icons/png48/go-previous.png',
                     click: function(){  
+                        _.each(self.paymentlinewidgets, function(widget){
+                            if( widget.payment_line.get_amount() === 0 ){
+                                widget.payment_line.destroy();
+                            }
+                        });
                         self.pos_widget.screen_selector.set_current_screen(self.back_screen);
                     },
                 });
-            
-            this.validate_button = this.add_action_button({
+
+            this.add_action_button({
                     label: _t('Validate'),
                     name: 'validation',
                     icon: '/point_of_sale/static/src/img/icons/png48/validate.png',
@@ -885,7 +900,7 @@
                         self.validateCurrentOrder();
                     },
                 });
-
+           
             this.updatePaymentSummary();
             this.line_refocus();
         },
@@ -898,9 +913,11 @@
             this.pos_widget.screen_selector.set_current_screen(self.back_screen);
         },
         validateCurrentOrder: function() {
+            var self = this;
+
             var currentOrder = this.pos.get('selectedOrder');
 
-            this.pos.push_order(currentOrder.exportAsJSON()) 
+            this.pos.push_order(currentOrder) 
             if(this.pos.iface_print_via_proxy){
                 this.pos.proxy.print_receipt(currentOrder.export_for_printing());
                 this.pos.get('selectedOrder').destroy();    //finish order and go back to scan screen

=== added file 'point_of_sale/static/src/js/tests.js'
--- point_of_sale/static/src/js/tests.js	1970-01-01 00:00:00 +0000
+++ point_of_sale/static/src/js/tests.js	2013-09-23 15:13:26 +0000
@@ -0,0 +1,92 @@
+function openerp_pos_tests(instance, module){ //module is instance.point_of_sale
+
+    // Various UI Tests to measure performance and memory leaks.
+    module.UiTester = function(){
+        var running = false;
+        var queue = new module.JobQueue();
+
+        // stop the currently running test
+        this.stop = function(){
+            queue.clear();
+        };
+
+        // randomly switch product categories
+        this.category_switch = function(interval){
+            queue.schedule(function(){
+                var breadcrumbs = $('.breadcrumb a');
+                var categories  = $('li.category-button');
+                if(categories.length > 0){
+                    var rnd = Math.floor(Math.random()*categories.length);
+                    categories.eq(rnd).click();
+                }else{
+                    var rnd = Math.floor(Math.random()*breadcrumbs.length);
+                    breadcrumbs.eq(rnd).click();
+                }
+            },{repeat:true, duration:interval});
+        };
+
+        // randomly order products then resets the order
+        this.order_products = function(interval){
+
+            queue.schedule(function(){
+                var def = new $.Deferred();
+                var order_queue = new module.JobQueue();
+                var order_size = 1 + Math.floor(Math.random()*10);
+
+                while(order_size--){
+                    order_queue.schedule(function(){
+                        var products = $('.product a');
+                        if(products.length > 0){
+                            var rnd = Math.floor(Math.random()*products.length);
+                            products.eq(rnd).click();
+                        }
+                    },{duration:250});
+                }
+                order_queue.finished().then(function(){
+                        $('.deleteorder-button').click();
+                        def.resolve();
+                });
+                return def;
+            },{repeat:true, duration: interval});
+
+        };
+
+        // makes a complete product order cycle ( print via proxy must be activated, and scale deactivated ) 
+        this.full_order_cycle = function(interval){
+            queue.schedule(function(){
+                var def = new $.Deferred();
+                var order_queue = new module.JobQueue();
+                var order_size = 1 + Math.floor(Math.random()*50);
+
+                while(order_size--){
+                    order_queue.schedule(function(){
+                        var products = $('.product a');
+                        if(products.length > 0){
+                            var rnd = Math.floor(Math.random()*products.length);
+                            products.eq(rnd).click();
+                        }
+                    },{duration:250});
+                }
+                order_queue.schedule(function(){
+                    $('.paypad-button:first').click();
+                },{duration:250});
+                order_queue.schedule(function(){
+                    $('.paymentline-amount input:first').val(10000);
+                    $('.paymentline-amount input:first').keyup();
+                },{duration:250});
+                order_queue.schedule(function(){
+                    $('.pos-actionbar-button-list .button:eq(2)').click();
+                },{duration:250});
+                order_queue.schedule(function(){
+                    def.resolve();
+                });
+                return def;
+            },{repeat: true, duration: interval});
+        };
+    };
+    
+    if(jQuery.deparam(jQuery.param.querystring()).debug !== undefined){
+        window.pos_test_ui = new module.UiTester();
+    }
+
+}

=== modified file 'point_of_sale/static/src/js/widget_base.js'
--- point_of_sale/static/src/js/widget_base.js	2013-01-28 17:18:00 +0000
+++ point_of_sale/static/src/js/widget_base.js	2013-09-23 15:13:26 +0000
@@ -41,10 +41,10 @@
 
         },
         show: function(){
-            this.$el.show();
+            this.$el.removeClass('oe_hidden');
         },
         hide: function(){
-            this.$el.hide();
+            this.$el.addClass('oe_hidden');
         },
     });
 

=== modified file 'point_of_sale/static/src/js/widget_scrollbar.js'
--- point_of_sale/static/src/js/widget_scrollbar.js	2012-11-29 22:26:45 +0000
+++ point_of_sale/static/src/js/widget_scrollbar.js	2013-09-23 15:13:26 +0000
@@ -81,7 +81,7 @@
             $(window).unbind('resize',this.resize_handler);
             $(window).bind('resize',this.resize_handler);
 
-            this.target().unbind('mousewheel',this.target_mousweheel_handler);
+            this.target().unbind('mousewheel',this.target_mousewheel_handler);
             this.target().bind('mousewheel',this.target_mousewheel_handler);
             
             // because the rendering is asynchronous we must wait for the next javascript update
@@ -93,22 +93,18 @@
             },0);
         },
 
-        // binds the window resize and the target scrolling events.
-        // it is good advice not to bind these multiple_times
-        bind_events:function(){
-            $(window).resize(function(){     
-            });
-            this.target().bind('mousewheel',function(event,delta){
-                self.scroll(delta*self.wheel_step);
-            });
+        destroy: function(){
+            $(window).unbind('resize',this.resize_handler);
+            this.target().unbind('mousewheel',this.target_mousewheel_handler);
+            this._super();
         },
 
         // shows the scrollbar. if animated is true, it will do it in an animated fashion
         show: function(animated){   //FIXME: animated show and hide don't work ... ? 
             if(animated){
-                this.$el.show().animate({'width':'48px'}, 500, 'swing');
+                this.$el.removeClass('oe_hidden').animate({'width':'48px'}, 500, 'swing');
             }else{
-                this.$el.show().css('width','48px');
+                this.$el.removeClass('oe_hidden').css('width','48px');
             }
             this.on_show(this);
         },
@@ -117,9 +113,9 @@
         hide: function(animated){
             var self = this;
             if(animated){
-                this.$el.animate({'width':'0px'}, 500, 'swing', function(){ self.$el.hide();});
+                this.$el.animate({'width':'0px'}, 500, 'swing', function(){ self.$el.addClass('oe_hidden');});
             }else{
-                this.$el.hide().css('width','0px');
+                this.$el.addClass('oe_hidden').css('width','0px');
             }
             this.on_hide(this);
         },

=== modified file 'point_of_sale/static/src/js/widgets.js'
--- point_of_sale/static/src/js/widgets.js	2013-09-18 13:42:08 +0000
+++ point_of_sale/static/src/js/widgets.js	2013-09-23 15:13:26 +0000
@@ -62,10 +62,10 @@
         start: function() {
             this.state.bind('change:mode', this.changedMode, this);
             this.changedMode();
-            this.$el.find('button#numpad-backspace').click(_.bind(this.clickDeleteLastChar, this));
-            this.$el.find('button#numpad-minus').click(_.bind(this.clickSwitchSign, this));
-            this.$el.find('button.number-char').click(_.bind(this.clickAppendNewChar, this));
-            this.$el.find('button.mode-button').click(_.bind(this.clickChangeMode, this));
+            this.$el.find('.numpad-backspace').click(_.bind(this.clickDeleteLastChar, this));
+            this.$el.find('.numpad-minus').click(_.bind(this.clickSwitchSign, this));
+            this.$el.find('.number-char').click(_.bind(this.clickAppendNewChar, this));
+            this.$el.find('.mode-button').click(_.bind(this.clickChangeMode, this));
         },
         clickDeleteLastChar: function() {
             return this.state.deleteLastChar();
@@ -137,17 +137,15 @@
             this.model = options.model;
             this.order = options.order;
 
-            this.model.bind('change', _.bind( function() {
-                this.refresh();
-            }, this));
-        },
-        click_handler: function() {
-            this.order.selectLine(this.model);
-            this.trigger('order_line_selected');
+            this.model.bind('change', this.refresh, this);
         },
         renderElement: function() {
+            var self = this;
             this._super();
-            this.$el.click(_.bind(this.click_handler, this));
+            this.$el.click(function(){
+                self.order.selectLine(this.model);
+                self.trigger('order_line_selected');
+            });
             if(this.model.is_selected()){
                 this.$el.addClass('selected');
             }
@@ -156,6 +154,10 @@
             this.renderElement();
             this.trigger('order_line_refreshed');
         },
+        destroy: function(){
+            this.model.unbind('change',this.refresh,this);
+            this._super();
+        },
     });
     
     module.OrderWidget = module.PosBaseWidget.extend({
@@ -189,8 +191,6 @@
                 }else if( mode === 'price'){
                     order.getSelectedLine().set_unit_price(val);
                 }
-        	} else {
-        	    this.pos.get('selectedOrder').destroy();
         	}
         },
         change_selected_order: function() {
@@ -283,27 +283,6 @@
         },
     });
 
-    module.ProductWidget = module.PosBaseWidget.extend({
-        template: 'ProductWidget',
-        init: function(parent, options) {
-            this._super(parent,options);
-            this.model = options.model;
-            this.model.attributes.weight = options.weight;
-            this.next_screen = options.next_screen; //when a product is clicked, this screen is set
-            this.click_product_action = options.click_product_action; 
-        },
-        // returns the url of the product thumbnail
-        renderElement: function() {
-            this._super();
-            this.$('img').replaceWith(this.pos_widget.image_cache.get_image(this.model.get_image_url()));
-            var self = this;
-            $("a", this.$el).click(function(e){
-                if(self.click_product_action){
-                    self.click_product_action(self.model);
-                }
-            });
-        },
-    });
 
     module.PaymentlineWidget = module.PosBaseWidget.extend({
         template: 'PaymentlineWidget',
@@ -320,6 +299,14 @@
                 this.payment_line.set_amount(amount);
             }
         },
+        checkAmount: function(e){
+            if (e.which !== 0 && e.charCode !== 0) {
+                if(isNaN(String.fromCharCode(e.charCode))){
+                    return (String.fromCharCode(e.charCode) === "." && e.currentTarget.value.toString().split(".").length < 2)?true:false;
+                }
+            }
+            return true
+        },
         changedAmount: function() {
         	if (this.amount !== this.payment_line.get_amount()){
         		this.renderElement();
@@ -329,7 +316,8 @@
             var self = this;
             this.name =   this.payment_line.get_cashregister().get('journal_id')[1];
             this._super();
-            this.$('input').keyup(function(event){
+            this.$('input').keypress(_.bind(this.checkAmount, this))
+			.keyup(function(event){
                 self.changeAmount(event);
             });
             this.$('.delete-payment-line').click(function() {
@@ -351,32 +339,30 @@
             var self = this;
 
             this.order = options.order;
-            this.order.bind('destroy',function(){ self.destroy(); });
-            this.order.bind('change', function(){ self.renderElement(); });
-            this.pos.bind('change:selectedOrder', _.bind( function(pos) {
-                var selectedOrder;
-                selectedOrder = pos.get('selectedOrder');
-                if (this.order === selectedOrder) {
-                    this.setButtonSelected();
-                }
-            }, this));
+            this.order.bind('destroy',this.destroy, this );
+            this.order.bind('change', this.renderElement, this );
+            this.pos.bind('change:selectedOrder', this.renderElement,this );
         },
         renderElement:function(){
             this._super();
-            this.$('button.select-order').off('click').click(_.bind(this.selectOrder, this));
-            this.$('button.close-order').off('click').click(_.bind(this.closeOrder, this));
+            var self = this;
+            this.$el.click(function(){ 
+                self.selectOrder();
+            });
+            if( this.order === this.pos.get('selectedOrder') ){
+                this.$el.addClass('selected-order');
+            }
         },
         selectOrder: function(event) {
             this.pos.set({
                 selectedOrder: this.order
             });
         },
-        setButtonSelected: function() {
-            $('.selected-order').removeClass('selected-order');
-            this.$el.addClass('selected-order');
-        },
-        closeOrder: function(event) {
-            this.order.destroy();
+        destroy: function(){
+            this.order.unbind('destroy', this.destroy, this);
+            this.order.unbind('change',  this.renderElement, this);
+            this.pos.unbind('change:selectedOrder', this.renderElement, this);
+            this._super();
         },
     });
 
@@ -420,9 +406,9 @@
             if(visible != this.visibility[element]){
                 this.visibility[element] = !!visible;
                 if(visible){
-                    this.$('.'+element).show();
+                    this.$('.'+element).removeClass('oe_hidden');
                 }else{
-                    this.$('.'+element).hide();
+                    this.$('.'+element).addClass('oe_hidden');
                 }
             }
             if(visible && action){
@@ -457,10 +443,10 @@
             return button;
         },
         show:function(){
-            this.$el.show();
+            this.$el.removeClass('oe_hidden');
         },
         hide:function(){
-            this.$el.hide();
+            this.$el.addClass('oe_hidden');
         },
     });
 
@@ -499,7 +485,7 @@
         },
 
         get_image_url: function(category){
-            return instance.session.url('/web/binary/image', {model: 'pos.category', field: 'image', id: category.id});
+            return instance.session.url('/web/binary/image', {model: 'pos.category', field: 'image_medium', id: category.id});
         },
 
         renderElement: function(){
@@ -622,25 +608,19 @@
         renderElement: function() {
             var self = this;
             this._super();
-
-            // free subwidgets  memory from previous renders
             
-            for(var i = 0, len = this.productwidgets.length; i < len; i++){
-                this.productwidgets[i].destroy();
-            }
-            this.productwidgets = []; 
             if(this.scrollbar){
                 this.scrollbar.destroy();
             }
             var products = this.pos.get('products').models || [];
-            for(var i = 0, len = products.length; i < len; i++){
-                var product = new module.ProductWidget(self, {
-                    model: products[i],
-                    click_product_action: this.click_product_action,
-                });
-                this.productwidgets.push(product);
-                product.appendTo(this.$('.product-list'));
-            }
+            
+            _.each(products,function(product,i){
+                var $product = $(QWeb.render('Product',{ widget:self, product: products[i] }));
+                $product.find('img').replaceWith(self.pos_widget.image_cache.get_image(products[i].get_image_url()));
+                $product.find('a').click(function(){ self.click_product_action(product); });
+                $product.appendTo(self.$('.product-list'));
+            });
+
             this.scrollbar = new module.ScrollbarWidget(this,{
                 target_widget:   this,
                 target_selector: '.product-list-scroller',
@@ -698,11 +678,13 @@
             var self = this;
             this._super();
             if(this.action){
-                this.$el.click(function(){ self.action(); });
+                this.$el.click(function(){
+                    self.action();
+                });
             }
         },
-        show: function(){ this.$el.show(); },
-        hide: function(){ this.$el.hide(); },
+        show: function(){ this.$el.removeClass('oe_hidden'); },
+        hide: function(){ this.$el.addClass('oe_hidden'); },
     });
 
     // The debug widget lets the user control and monitor the hardware and software status
@@ -843,6 +825,7 @@
             instance.web.blockUI(); 
 
             this.pos = new module.PosModel(this.session);
+            this.pos.pos_widget = this;
             this.pos_widget = this; //So that pos_widget's childs have pos_widget set automatically
 
             this.numpad_visible = true;
@@ -851,17 +834,24 @@
             this.leftpane_width   = '440px';
             this.cashier_controls_visible = true;
             this.image_cache = new module.ImageCache(); // for faster products image display
+
         },
       
         start: function() {
             var self = this;
             return self.pos.ready.done(function() {
+                $('.oe_tooltip').remove();  // remove tooltip from the start session button
+
                 self.build_currency_template();
                 self.renderElement();
                 
                 self.$('.neworder-button').click(function(){
                     self.pos.add_new_order();
                 });
+
+                self.$('.deleteorder-button').click(function(){
+                    self.pos.delete_current_order();
+                });
                 
                 //when a new order is created, add an order button widget
                 self.pos.get('orders').bind('add', function(new_order){
@@ -873,13 +863,12 @@
                     new_order_button.selectOrder();
                 }, self);
 
-                self.pos.get('orders').add(new module.Order({ pos: self.pos }));
+                self.pos.add_new_order();
 
                 self.build_widgets();
 
                 self.screen_selector.set_default_screen();
 
-                window.screen_selector = self.screen_selector;
 
                 self.pos.barcode_reader.connect();
 
@@ -892,7 +881,7 @@
                 }
             
                 instance.web.unblockUI();
-                self.$('.loader').animate({opacity:0},1500,'swing',function(){self.$('.loader').hide();});
+                self.$('.loader').animate({opacity:0},1500,'swing',function(){self.$('.loader').addClass('oe_hidden');});
 
                 self.pos.flush();
 
@@ -957,6 +946,12 @@
             this.error_negative_price_popup = new module.ErrorNegativePricePopupWidget(this, {});
             this.error_negative_price_popup.appendTo($('.point-of-sale'));
 
+            this.error_no_client_popup = new module.ErrorNoClientPopupWidget(this, {});
+            this.error_no_client_popup.appendTo($('.point-of-sale'));
+
+            this.error_invoice_transfer_popup = new module.ErrorInvoiceTransferPopupWidget(this, {});
+            this.error_invoice_transfer_popup.appendTo($('.point-of-sale'));
+
             // --------  Misc ---------
 
             this.notification = new module.SynchNotificationWidget(this,{});
@@ -987,7 +982,7 @@
 
             this.close_button = new module.HeaderButtonWidget(this,{
                 label: _t('Close'),
-                action: function(){ self.try_close(); },
+                action: function(){ self.close(); },
             });
             this.close_button.appendTo(this.$('#rightheader'));
 
@@ -1018,6 +1013,8 @@
                     'error-session': this.error_session_popup,
                     'error-negative-price': this.error_negative_price_popup,
                     'choose-receipt': this.choose_receipt_popup,
+                    'error-no-client': this.error_no_client_popup,
+                    'error-invoice-transfer': this.error_invoice_transfer_popup,
                 },
                 default_client_screen: 'welcome',
                 default_cashier_screen: 'products',
@@ -1073,11 +1070,11 @@
             if(visible !== this.leftpane_visible){
                 this.leftpane_visible = visible;
                 if(visible){
-                    $('#leftpane').show().animate({'width':this.leftpane_width},500,'swing');
+                    $('#leftpane').removeClass('oe_hidden').animate({'width':this.leftpane_width},500,'swing');
                     $('#rightpane').animate({'left':this.leftpane_width},500,'swing');
                 }else{
                     var leftpane = $('#leftpane');
-                    $('#leftpane').animate({'width':'0px'},500,'swing', function(){ leftpane.hide(); });
+                    $('#leftpane').animate({'width':'0px'},500,'swing', function(){ leftpane.addClass('oe_hidden'); });
                     $('#rightpane').animate({'left':'0px'},500,'swing');
                 }
             }
@@ -1087,36 +1084,43 @@
             if(visible !== this.cashier_controls_visible){
                 this.cashier_controls_visible = visible;
                 if(visible){
-                    $('#loggedas').show();
-                    $('#rightheader').show();
+                    $('#loggedas').removeClass('oe_hidden');
+                    $('#rightheader').removeClass('oe_hidden');
                 }else{
-                    $('#loggedas').hide();
-                    $('#rightheader').hide();
+                    $('#loggedas').addClass('oe_hidden');
+                    $('#rightheader').addClass('oe_hidden');
                 }
             }
         },
-        try_close: function() {
-            var self = this;
-            //TODO : do the close after the flush...
-            self.pos.flush()
-            self.close();
-        },
         close: function() {
             var self = this;
-            this.pos.barcode_reader.disconnect();
-            return new instance.web.Model("ir.model.data").get_func("search_read")([['name', '=', 'action_client_pos_menu']], ['res_id']).pipe(
-                    _.bind(function(res) {
-                return this.rpc('/web/action/load', {'action_id': res[0]['res_id']}).pipe(_.bind(function(result) {
-                    var action = result;
-                    action.context = _.extend(action.context || {}, {'cancel_action': {type: 'ir.actions.client', tag: 'reload'}});
-                    //self.destroy();
-                    this.do_action(action);
-                }, this));
-            }, this));
+
+            function close(){
+                return new instance.web.Model("ir.model.data").get_func("search_read")([['name', '=', 'action_client_pos_menu']], ['res_id']).pipe(
+                        _.bind(function(res) {
+                    return this.rpc('/web/action/load', {'action_id': res[0]['res_id']}).pipe(_.bind(function(result) {
+                        var action = result;
+                        action.context = _.extend(action.context || {}, {'cancel_action': {type: 'ir.actions.client', tag: 'reload'}});
+                        //self.destroy();
+                        this.do_action(action);
+                    }, this));
+                }, self));
+            }
+
+            var draft_order = _.find( self.pos.get('orders').models, function(order){
+                return order.get('orderLines').length !== 0 && order.get('paymentLines').length === 0;
+            });
+            if(draft_order){
+                if (confirm(_t("Pending orders will be lost.\nAre you sure you want to leave this session?"))) {
+                    return close();
+                }
+            }else{
+                return close();
+            }
         },
         destroy: function() {
+            this.pos.destroy();
             instance.webclient.set_content_full_screen(false);
-            self.pos = undefined;
             this._super();
         }
     });

=== modified file 'point_of_sale/static/src/xml/pos.xml'
--- point_of_sale/static/src/xml/pos.xml	2013-09-12 15:54:09 +0000
+++ point_of_sale/static/src/xml/pos.xml	2013-09-23 15:13:26 +0000
@@ -12,7 +12,8 @@
                 </div>
                 <div id="rightheader">
                     <div id="order-selector">
-                        <button class="neworder-button">+</button>
+                        <button class="neworder-button square"><img src='/point_of_sale/static/src/img/plus.png' /></button>
+                        <button class="deleteorder-button square"><img src='/point_of_sale/static/src/img/minus.png' /></button>
                         <ol id="orders"></ol>
                     </div>
                     <!-- here goes header buttons -->
@@ -93,10 +94,10 @@
             <button class="input-button number-char">9</button>
             <button class="mode-button" data-mode='price'>Price</button>
             <br />
-            <button class="input-button" id="numpad-minus" >+/-</button>
+            <button class="input-button numpad-minus" >+/-</button>
             <button class="input-button number-char">0</button>
             <button class="input-button number-char">.</button>
-            <button class="input-button" id="numpad-backspace">
+            <button class="input-button numpad-backspace">
                 <img src="/point_of_sale/static/src/img/backspace.png" width="24" height="21" />
             </button>
             <br />
@@ -191,8 +192,9 @@
             <div class="display">
                 <span class="weight">
                     <p>
-                        <t t-esc="widget.get_product_weight().toFixed(3)" />
-                        Kg
+                        <span class='js-weight'>
+                            <t t-esc="widget.get_product_weight_string()" />
+                        </span>
                     </p>
                 </span>
                 <span class="product-name">
@@ -336,11 +338,11 @@
         <div class="modal-dialog">
             <div class="popup popup-help">
                 <p class="message">The scanned product was not recognized<br /> Please wait, a cashier is on the way</p>
-            </div>
-        </div>
-        <div class="footer">
-            <div class="button">
-                Ok
+                <div class="footer">
+                    <div class="button">
+                        Ok
+                    </div>
+                </div>
             </div>
         </div>
     </t>
@@ -361,6 +363,33 @@
         </div>
     </t>
 
+    <t t-name="ErrorNoClientPopupWidget">
+        <div class="modal-dialog">
+            <div class="popup popup-help">
+                <p class="message">An anonymous order cannot be invoiced</p>
+                <div class="footer">
+                    <div class="button">
+                        Ok
+                    </div>
+                </div>
+            </div>
+        </div>
+    </t>
+
+    <t t-name="ErrorInvoiceTransferPopupWidget">
+        <div class="modal-dialog">
+            <div class="popup popup-help">
+                <p class="message">The Order could not be sent to the server for invoicing. Invoices cannot be generated
+                    in offline mode. Please check your internet connection and try again.</p>
+                <div class="footer">
+                    <div class="button">
+                        Ok
+                    </div>
+                </div>
+            </div>
+        </div>
+    </t>
+
     <t t-name="ErrorPopupWidget">
         <div class="modal-dialog">
             <div class="popup popup-help">
@@ -370,24 +399,24 @@
         </div>
     </t>
 
-    <t t-name="ProductWidget">
+    <t t-name="Product">
         <li class='product'>
             <a href="#">
                 <div class="product-img">
                     <img src='' /> <!-- the product thumbnail -->
-                    <t t-if="!widget.model.get('to_weight')">
+                    <t t-if="!product.get('to_weight')">
                         <span class="price-tag">
-                            <t t-esc="widget.format_currency(widget.model.get('price'))"/>
+                            <t t-esc="widget.format_currency(product.get('price'))"/>
                         </span>
                     </t>
-                    <t t-if="widget.model.get('to_weight')">
+                    <t t-if="product.get('to_weight')">
                         <span class="price-tag">
-                            <t t-esc="widget.format_currency(widget.model.get('price'))+'/Kg'"/>
+                            <t t-esc="widget.format_currency(product.get('price'))+'/Kg'"/>
                         </span>
                     </t>
                 </div>
                 <div class="product-name">
-                    <t t-esc="widget.model.get('name')"/>
+                    <t t-esc="product.get('name')"/>
                 </div>
             </a>
         </li>
@@ -538,7 +567,6 @@
         <button class="paypad-button" t-att-cash-register-id="widget.cashRegister.get('id')">
             <t t-esc="widget.cashRegister.get('journal').name"/>
         </button>
-        <br />
     </t>
 
     <t t-name="OrderButtonWidget">