odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

[REF] pos.category: propagated change of category_image. 

bzr revid: tde@openerp.com-20120730103451-bce6bqone6e9f690
This commit is contained in:
Thibault Delavallée 2012-07-30 12:34:51 +02:00
parent 82f4612f53
commit 97d48ebf51
4 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
addons/point_of_sale/point_of_sale_view.xml
View File

@ -653,7 +653,7 @@
<field name="arch" type="xml">
<form string="Product PoS Categories" version="7.0">
<sheet>
<field name="category_image" widget='image' class="oe_avatar oe_right"/>
<field name="image_medium" widget='image' class="oe_avatar oe_right"/>
<div class="oe_left">
<group>
<field name="name"/>

4
addons/point_of_sale/static/src/js/pos_models.js
View File

@ -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
);

2
addons/point_of_sale/static/src/js/pos_screens.js
View File

@ -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;

4
addons/point_of_sale/static/src/xml/pos.xml
View File

@ -83,7 +83,7 @@
<t t-name="CategoryButton">
<li class='category-button'>
<div class="category-img">
<img t-att-src="'data:image/gif;base64,'+ category.category_image_small" />
<img t-att-src="'data:image/gif;base64,'+ category.image_medium" />
</div>
<div class="category-name">
<t t-esc="category.name"/>
@ -342,7 +342,7 @@
<li class='product'>
<a href="#">
<div class="product-img">
<img t-att-src="'data:image/gif;base64,'+ widget.model.get('image_small')" />
<img t-att-src="'data:image/gif;base64,'+ widget.model.get('image_medium')" />
<t t-if="!widget.model.get('to_weight')">
<span class="price-tag">
<t t-esc="widget.format_currency(widget.model.get('list_price'))"/>