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

[Foram Katharotiya (OpenERP)]

Hello,

 - I have fixed the issue of add several lines of product in pos frontend session when add same product after onther product.

Thanks,
FKA

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

8514. By Foram Katharotiya (OpenERP) on 2013-01-24

[IMP] improve code

8515. By Foram Katharotiya (OpenERP) on 2013-01-24

[MERGE] with trunk

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

[MERGE] with trunk

Unmerged revisions

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

[MERGE] with trunk

8515. By Foram Katharotiya (OpenERP) on 2013-01-24

[MERGE] with trunk

8514. By Foram Katharotiya (OpenERP) on 2013-01-24

[IMP] improve code

8513. By Foram Katharotiya (OpenERP) on 2013-01-22

[FIX]the problem of sevral lines of one products in pos order

=== 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 13:06:21 +0000
@@ -578,6 +578,7 @@
             var attr = product.toJSON();
             attr.pos = this.pos;
             attr.order = this;
+            var exiting =[]
             var line = new module.Orderline({}, {pos: this.pos, order: this, product: product});
 
             if(options.quantity !== undefined){
@@ -588,10 +589,22 @@
             }
 
             var last_orderline = this.getLastOrderline();
-            if( last_orderline && last_orderline.can_be_merged_with(line) && options.merge !== false){
-                last_orderline.merge(line);
-            }else{
+            if (this.get('orderLines').models.length == 0 ){
                 this.get('orderLines').add(line);
+            }else{
+                this.get('orderLines').each(function(orderlines){
+                    exiting.push(orderlines.product.id);
+                });
+                if (exiting.indexOf(line.product.id) != -1 && last_orderline.product.id != line.product.id)
+                {
+                    this.get('orderLines').models[exiting.indexOf(line.product.id)].merge(line);
+                }
+                else if (last_orderline && exiting.indexOf(line.product.id) != -1 && last_orderline.can_be_merged_with(line) && options.merge !== false){
+                    last_orderline.merge(line);
+                }
+                else{
+                    this.get('orderLines').add(line);
+                }
             }
             this.selectLine(this.getLastOrderline());
         },