Merge lp:~openerp-dev/openobject-addons/7.0-opw-596189-msh into lp:openobject-addons/7.0

[Mohammed Shekha(Open ERP)]

Hello,

Fixed the issue of current focused line in pos front end, also fixed numpadState buffer, changing focus adds character of last changed payment line to current line.

Demo:- Create an order from POS frontend and then seelct Journal enter some amount and then add another journal and enter value in it then again goes to first line and modify value, the value get modified in last line(i.e. second one).

For detail check the bug https://bugs.launchpad.net/openobject-addons/+bug/1207373.

Thanks.

[Naresh(OpenERP) (nch-openerp)]

LGTM

review: Approve

Unmerged revisions

9349. By Mohammed Shekha<email address hidden> on 2013-08-07

[FIX]Refixed the issue of numpadState buffer, changing focus adds character of last changed payment line to current line.

=== modified file 'point_of_sale/static/src/js/screens.js'
--- point_of_sale/static/src/js/screens.js	2013-07-08 14:55:22 +0000
+++ point_of_sale/static/src/js/screens.js	2013-08-07 19:10:35 +0000
@@ -933,6 +933,10 @@
             }
             if(this.focusedLine){
                 this.focusedLine.focus();
+                var val = this.focusedLine.$('input')[0].value.slice(0, -3);
+                if(this.numpadState){
+                    this.numpadState.set({"buffer": val.toString()});
+                }
             }
         },
         addPaymentLine: function(newPaymentLine) {
@@ -1003,7 +1007,11 @@
     		this.numpadState.set({mode: 'payment'});
     	},
         set_value: function(val) {
-        	this.currentPaymentLines.last().set_amount(val);
+            if(this.focusedLine) {
+                this.focusedLine.payment_line.set_amount(val);
+            } else {
+                this.currentPaymentLines.last().set_amount(val);
+            }
         },
     });
 }

=== modified file 'point_of_sale/static/src/js/widgets.js'
--- point_of_sale/static/src/js/widgets.js	2013-07-08 14:55:22 +0000
+++ point_of_sale/static/src/js/widgets.js	2013-08-07 19:10:35 +0000
@@ -332,12 +332,19 @@
             this.$('input').keyup(function(event){
                 self.changeAmount(event);
             });
+            this.$('input').focus(function() {
+                self.pos_widget.payment_screen.line_refocus(self);
+            });
             this.$('.delete-payment-line').click(function() {
                 self.trigger('delete_payment_line', self);
             });
         },
         focus: function(){
             var val = this.$('input')[0].value;
+            //Check whether input has focus(this.$('input').is(":focus")), 
+            //if in future focus is set using jQuery focus method
+            //Currently it does not goes to recursion because here we used basic DOM focus method
+            //otherwise focus is binded on input and calls line_refocus which again calls this method 
             this.$('input')[0].focus();
             this.$('input')[0].value = val;
             this.$('input')[0].select();