Merge lp:~openerp-dev/openobject-addons/trunk-bug-1099410-vba into lp:openobject-addons

[Vijaykumar Baladaniya (OpenERP)]

Hello Sir,

    I have improve the code of points of sale for NaN appears when entering a discount in a session.

Thanks,
 vba

[lp:~openerp-dev/openobject-addons/trunk-bug-1099410-vba]

8505. By Vijaykumar Baladaniya (OpenERP) on 2013-01-18

[MERGE] Merge with latest.

Unmerged revisions

8505. By Vijaykumar Baladaniya (OpenERP) on 2013-01-18

[MERGE] Merge with latest.

8504. By Vijaykumar Baladaniya (OpenERP) on 2013-01-16

[FIX]Check and set buffer value and quantity when entering a discount in a session.

=== modified file 'point_of_sale/static/src/js/models.js'
--- point_of_sale/static/src/js/models.js	2013-01-11 14:42:19 +0000
+++ point_of_sale/static/src/js/models.js	2013-01-18 06:37:23 +0000
@@ -359,7 +359,7 @@
         // product's unity of measure properties. Quantities greater than zero will not get 
         // rounded to zero
         set_quantity: function(quantity){
-            if(_.isNaN(quantity)){
+            if((_.isNaN(quantity)) || quantity == 0){
                 this.order.removeOrderline(this);
             }else if(quantity !== undefined){
                 this.quantity = Math.max(0,quantity);
@@ -803,7 +803,7 @@
             this.updateTarget();
         },
         deleteLastChar: function() {
-            var tempNewBuffer = this.get('buffer').slice(0, -1);
+            var tempNewBuffer = this.get('buffer').slice(0, -1) || "0";
 
             if(!tempNewBuffer){
                 this.set({ buffer: "0" });