Merge lp:~openerp-dev/openobject-addons/trunk-bug-1099411-fka into lp:openobject-addons

[Foram Katharotiya (OpenERP)]

Hello,

 - fix the issue of clicking on +/- after entering a payment amount manually with keyboard resets amount to 0 in pos.

Thanks,
FKA

[lp:~openerp-dev/openobject-addons/trunk-bug-1099411-fka]

8528. By Foram Katharotiya (OpenERP) on 2013-02-01

[MERGE] with trunk

Unmerged revisions

8528. By Foram Katharotiya (OpenERP) on 2013-02-01

[MERGE] with trunk

8527. By Foram Katharotiya (OpenERP) on 2013-01-31

[IMP] improve code

8526. By Foram Katharotiya (OpenERP) on 2013-01-31

[IMP] add amount in buffer state

=== 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-02-01 12:52:20 +0000
@@ -515,6 +515,7 @@
         },
         //sets the amount of money on this payment line
         set_amount: function(value){
+            self.screen_selector.current_screen.numpadState.set({buffer: value.toString()});
             this.amount = value;
             this.trigger('change');
         },

=== modified file 'point_of_sale/static/src/js/widgets.js'
--- point_of_sale/static/src/js/widgets.js	2013-01-14 15:25:33 +0000
+++ point_of_sale/static/src/js/widgets.js	2013-02-01 12:52:20 +0000
@@ -122,8 +122,8 @@
                     console.warn('TODO should not get there...?');
                     return;
                 }
+                self.pos_widget.screen_selector.set_current_screen('payment');
                 self.pos.get('selectedOrder').addPaymentLine(self.cashRegister);
-                self.pos_widget.screen_selector.set_current_screen('payment');
             });
         },
     });
@@ -319,6 +319,7 @@
         changedAmount: function() {
         	if (this.amount !== this.payment_line.get_amount())
         		this.renderElement();
+        		this.amount = this.payment_line.get_amount()
         },
         renderElement: function() {
             var self = this;