From 97d48ebf512e1bc0c6a3667e4f98b6ab05f39389 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= Date: Mon, 30 Jul 2012 12:34:51 +0200 Subject: [PATCH] [REF] pos.category: propagated change of category_image. bzr revid: tde@openerp.com-20120730103451-bce6bqone6e9f690 --- addons/point_of_sale/point_of_sale_view.xml | 2 +- addons/point_of_sale/static/src/js/pos_models.js | 4 ++-- addons/point_of_sale/static/src/js/pos_screens.js | 2 +- addons/point_of_sale/static/src/xml/pos.xml | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/addons/point_of_sale/point_of_sale_view.xml b/addons/point_of_sale/point_of_sale_view.xml index 6b1b9132344..f088270f8bf 100644 --- a/addons/point_of_sale/point_of_sale_view.xml +++ b/addons/point_of_sale/point_of_sale_view.xml @@ -653,7 +653,7 @@
- +
diff --git a/addons/point_of_sale/static/src/js/pos_models.js b/addons/point_of_sale/static/src/js/pos_models.js index b9dd078f45b..8a1506769bd 100644 --- a/addons/point_of_sale/static/src/js/pos_models.js +++ b/addons/point_of_sale/static/src/js/pos_models.js @@ -139,7 +139,7 @@ function openerp_pos_models(instance, module){ //module is instance.point_of_sal self.set('currency',currencies[0]); }); - var cat_def = fetch('pos.category', ['id','name', 'parent_id', 'child_id', 'category_image_small']) + var cat_def = fetch('pos.category', ['id','name', 'parent_id', 'child_id', 'image_medium']) .pipe(function(result){ return self.set({'categories': result}); }); @@ -219,7 +219,7 @@ function openerp_pos_models(instance, module){ //module is instance.point_of_sal return fetch( 'product.product', //context {pricelist: shop.pricelist_id[0]} - ['name', 'list_price','price','pos_categ_id', 'taxes_id','image_small', 'ean13', 'to_weight', 'uom_id', 'uos_id', 'uos_coeff', 'mes_type'], + ['name', 'list_price','price','pos_categ_id', 'taxes_id','image_medium', 'ean13', 'to_weight', 'uom_id', 'uos_id', 'uos_coeff', 'mes_type'], [['pos_categ_id','!=', false]], {pricelist: shops[0].pricelist_id[0]} // context for price ); diff --git a/addons/point_of_sale/static/src/js/pos_screens.js b/addons/point_of_sale/static/src/js/pos_screens.js index 0ad37cb79c4..0515eb9807b 100644 --- a/addons/point_of_sale/static/src/js/pos_screens.js +++ b/addons/point_of_sale/static/src/js/pos_screens.js @@ -444,7 +444,7 @@ function openerp_pos_screens(instance, module){ //module is instance.point_of_sa }, get_product_image: function(){ var product = this.get_product(); - return product ? product.get('image_small') : undefined; + return product ? product.get('image_medium') : undefined; }, get_product_weight: function(){ return this.weight || 0; diff --git a/addons/point_of_sale/static/src/xml/pos.xml b/addons/point_of_sale/static/src/xml/pos.xml index 42af5d572ca..9bdac93d990 100644 --- a/addons/point_of_sale/static/src/xml/pos.xml +++ b/addons/point_of_sale/static/src/xml/pos.xml @@ -83,7 +83,7 @@
  • - +
    @@ -342,7 +342,7 @@
  • - +