[FIX] pos_loyalty: missing code from pos_loyalty MERGE

This commit is contained in:
Frederic van der Essen
2014-11-25 19:16:25 +01:00
committed by Frédéric van der Essen
parent ee28165972
commit f48f4c68dc
@@ -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);