diff options
| author | Frédéric van der Essen <fvdessen@gmail.com> | 2015-06-30 12:37:00 +0200 |
|---|---|---|
| committer | Frédéric van der Essen <fvdessen@gmail.com> | 2015-06-30 17:03:23 +0200 |
| commit | caa330b11ca8cdac848b8ce4c98b6c96d4c748e6 (patch) | |
| tree | a701daf4ca12d7c798b6e491ce555afc548c4f5d | |
| parent | cf5bc4f98813294378841c55f750071f1e8439c7 (diff) | |
[IMP] point_of_sale: reactivating images on pos categories
| -rw-r--r-- | addons/point_of_sale/static/src/css/pos.css | 2 | ||||
| -rw-r--r-- | addons/point_of_sale/static/src/js/models.js | 2 | ||||
| -rw-r--r-- | addons/point_of_sale/static/src/js/screens.js | 3 |
3 files changed, 3 insertions, 4 deletions
diff --git a/addons/point_of_sale/static/src/css/pos.css b/addons/point_of_sale/static/src/css/pos.css index 4daab2ffad9..8f87ddb04dd 100644 --- a/addons/point_of_sale/static/src/css/pos.css +++ b/addons/point_of_sale/static/src/css/pos.css @@ -871,7 +871,7 @@ td { vertical-align: top; display: inline-block; font-size: 11px; - margin: 5px !important; + margin: 8px !important; width: 120px; height:120px; background:#fff; diff --git a/addons/point_of_sale/static/src/js/models.js b/addons/point_of_sale/static/src/js/models.js index 204021cf725..7ea68151cae 100644 --- a/addons/point_of_sale/static/src/js/models.js +++ b/addons/point_of_sale/static/src/js/models.js @@ -289,7 +289,7 @@ openerp.point_of_sale.load_models = function load_models(instance, module){ //mo }, },{ model: 'pos.category', - fields: ['id','name','parent_id','child_id'], + fields: ['id','name','parent_id','child_id','image'], domain: null, loaded: function(self, categories){ self.db.add_categories(categories); diff --git a/addons/point_of_sale/static/src/js/screens.js b/addons/point_of_sale/static/src/js/screens.js index 2a187eab282..ada7fac53d6 100644 --- a/addons/point_of_sale/static/src/js/screens.js +++ b/addons/point_of_sale/static/src/js/screens.js @@ -661,14 +661,13 @@ openerp.point_of_sale.load_screens = function load_screens(instance, module){ // this.el = el_node; var hasimages = false; //if none of the subcategories have images, we don't display buttons with icons - /* + for(var i = 0; i < this.subcategories.length; i++){ if(this.subcategories[i].image){ hasimages = true; break; } } - */ var list_container = el_node.querySelector('.category-list'); if (list_container) { |
