[FIX] pos_loyalty: missing code from pos_loyalty MERGE
authorFrederic van der Essen <fva@openerp.com / fvdessen+o@gmail.com>
Wed, 1 Oct 2014 10:24:30 +0000 (12:24 +0200)
committerFrédéric van der Essen <fvdessen@gmail.com>
Tue, 25 Nov 2014 18:16:25 +0000 (19:16 +0100)
addons/point_of_sale/static/src/js/models.js

index a8d2394..095cf9f 100644 (file)
@@ -1029,6 +1029,12 @@ function openerp_pos_models(instance, module){ //module is instance.point_of_sal
                 line.set_discount(options.discount);
             }
 
+            if(options.extras !== undefined){
+                for (prop in options.extras) { 
+                    line[prop] = options.extras[prop];
+                }
+            }
+
             var last_orderline = this.getLastOrderline();
             if( last_orderline && last_orderline.can_be_merged_with(line) && options.merge !== false){
                 last_orderline.merge(line);