Merge lp:~openerp-dev/openobject-addons/trunk-opw-575341-port-sgo into lp:openobject-addons

[Sanjay Gohel (Open ERP)]

Hello,

    I have improved search in pos in such way that user can find product on based of internal reference.

Thank You.
Sanjay Gohel
(SGO)

[Naresh(OpenERP) (nch-openerp)]

please give credit to the author of the fix when forward porting from 6.1 by using --author flag while committing.

[Naresh(OpenERP) (nch-openerp)]

also copy the description and append to it "Forward port from 6.1" so that the reviewer can know about it

Unmerged revisions

8186. By Sanjay Gohel (Open ERP) on 2012-12-03

[IMP]can search on based of internal refernce also

=== modified file 'point_of_sale/static/src/js/db.js'
--- point_of_sale/static/src/js/db.js	2012-11-28 06:29:26 +0000
+++ point_of_sale/static/src/js/db.js	2012-12-03 13:02:30 +0000
@@ -118,6 +118,9 @@
             if(product.ean13){
                 str += '|' + product.ean13;
             }
+            if(product.default_code){
+                str += '|' + product.default_code;
+            }
             var packagings = this.packagings_by_product_id[product.id] || [];
             for(var i = 0; i < packagings.length; i++){
                 str += '|' + packagings[i].ean;

=== modified file 'point_of_sale/static/src/js/models.js'
--- point_of_sale/static/src/js/models.js	2012-11-26 09:36:11 +0000
+++ point_of_sale/static/src/js/models.js	2012-12-03 13:02:30 +0000
@@ -170,7 +170,7 @@
 
                     return self.fetch(
                         'product.product', 
-                        ['name', 'list_price','price','pos_categ_id', 'taxes_id', 'ean13', 
+                        ['name', 'list_price','price','pos_categ_id', 'taxes_id', 'ean13', 'default_code',
                          'to_weight', 'uom_id', 'uos_id', 'uos_coeff', 'mes_type', 'description_sale', 'description'],
                         [['sale_ok','=',true],['available_in_pos','=',true]],
                         {pricelist: self.get('shop').pricelist_id[0]} // context for price