point_of_sale restore pristine files

bzr revid: al@openerp.com-20140120140333-sxg3gh4lgh20teal

diff --git a/addons/point_of_sale/static/src/js/db.js b/addons/point_of_sale/static/src/js/db.js
index 077a239..e4dc633 100644 (file)
--- a/addons/point_of_sale/static/src/js/db.js
+++ b/addons/point_of_sale/static/src/js/db.js
@@ -145,7 +145,7 @@ function openerp_pos_db(instance, module){
             for(var i = 0, len = products.length; i < len; i++){
                 var product = products[i];
                 var search_string = this._product_search_string(product);
-                var categ_id = product.public_categ_id ? product.public_categ_id[0] : this.root_category_id;
+                var categ_id = product.pos_categ_id ? product.pos_categ_id[0] : this.root_category_id;
                 if(!stored_categories[categ_id]){
                     stored_categories[categ_id] = [];
                 }

diff --git a/addons/point_of_sale/static/src/js/models.js b/addons/point_of_sale/static/src/js/models.js
index 87d90a5..a626b20 100644 (file)
--- a/addons/point_of_sale/static/src/js/models.js
+++ b/addons/point_of_sale/static/src/js/models.js
@@ -197,25 +197,19 @@ function openerp_pos_models(instance, module){ //module is instance.point_of_sal
                 }).then(function(packagings){
                     self.db.add_packagings(packagings);
 
+                    return self.fetch('pos.category', ['id','name','parent_id','child_id','image'])
+                }).then(function(categories){
+                    self.db.add_categories(categories);
+
                     return self.fetch(
                         'product.product', 
-                        ['name', 'list_price','price', 'public_categ_id', 'taxes_id', 'ean13', 'default_code',
+                        ['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.pricelist.id} // context for price
                     );
                 }).then(function(products){
-                    self.tmp_products = products;
-
-                    var category_ids = _.without(_.uniq(_.map(products, function (product) {return product.public_categ_id[0] || 0;})), 0);
-                    return self.fetch(
-                        'product.public.category',
-                        ['id','name','parent_id','child_id','image'],
-                        ['|', ['id','=',category_ids], ['child_id','=',category_ids]]
-                    );
-                }).then(function(categories){
-                    self.db.add_categories(categories);
-                    self.db.add_products(self.tmp_products);
+                    self.db.add_products(products);
 
                     return self.fetch(
                         'account.bank.statement',

diff --git a/addons/point_of_sale/static/src/js/widgets.js b/addons/point_of_sale/static/src/js/widgets.js
index 0a5ac13..9118ba1 100644 (file)
--- a/addons/point_of_sale/static/src/js/widgets.js
+++ b/addons/point_of_sale/static/src/js/widgets.js
@@ -436,7 +436,8 @@ function openerp_pos_widgets(instance, module){ //module is instance.point_of_sa
         },
 
         get_image_url: function(category){
-            return instance.session.url('/web/binary/image', {model: 'product.public.category', field: 'image_medium', id: category.id});
+            return window.location.origin + '/web/binary/image?model=pos.category&field=image_medium&id='+category.id;
+        },
 
         render_category: function( category, with_image ){
             var cached = this.category_cache.get_node(category.id);