From cd523374b1442484df6bb6dd7d07a8f3a8f8c012 Mon Sep 17 00:00:00 2001 From: "Chirag Dodiya (OpenERP Trainee)" Date: Fri, 2 Aug 2013 18:54:48 +0530 Subject: [PATCH 1/5] [IMP] improved css and added tooltip bzr revid: chiragdd7@gmail.com-20130802132448-mndod07w860nuoyf --- addons/stock/static/src/css/stock.css | 3 ++- addons/stock/stock_view.xml | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/addons/stock/static/src/css/stock.css b/addons/stock/static/src/css/stock.css index 4a380de6ed0..39bc0b4a2df 100644 --- a/addons/stock/static/src/css/stock.css +++ b/addons/stock/static/src/css/stock.css @@ -68,7 +68,8 @@ } .oe_stock_scan_image { - opacity: 0.2 + opacity: 0.2; + margin: 0 5px 0; } .oe_stock_scan_image:hover { opacity: 1 diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml index 310977ebe68..7690a14de82 100644 --- a/addons/stock/stock_view.xml +++ b/addons/stock/stock_view.xml @@ -1250,7 +1250,7 @@ Click to launch the barcode interface + class="oe_stock_scan_image" title="Click to launch the barcode interface"/>
From 570bbff55447b5abd2ddbcde8c25f8b5502e19b7 Mon Sep 17 00:00:00 2001 From: "Turkesh Patel (Open ERP)" Date: Fri, 2 Aug 2013 18:59:33 +0530 Subject: [PATCH 2/5] [IMP] improved css, improved code to show help 5 sec late bzr revid: tpa@tinyerp.com-20130802132933-srov3i87j2cmrwbq --- addons/stock/static/src/css/stock.css | 19 +++++++++++++++++++ .../stock/static/src/js/stock_picking_type.js | 4 ++-- addons/stock/stock_view.xml | 5 ++--- 3 files changed, 23 insertions(+), 5 deletions(-) diff --git a/addons/stock/static/src/css/stock.css b/addons/stock/static/src/css/stock.css index 4a380de6ed0..d8721ce3cb1 100644 --- a/addons/stock/static/src/css/stock.css +++ b/addons/stock/static/src/css/stock.css @@ -73,3 +73,22 @@ .oe_stock_scan_image:hover { opacity: 1 } +.openerp .oe_kanban_view .oe_kanban_stock_picking_type { + width: 345px; + cursor: default; +} +.openerp .oe_kanban_view .oe_sparkline_bar_link { + height: 20px; + width: 36px !important; +} +.openerp .oe_kanban_view .oe_sparkline_bar { + height: 20px; + width: 36px !important; +} +.oe_center_name { + text-align: center; +} +.openerp .oe_kanban_view .oe_stock_justgage { + color: black; + display: inline-block; +} \ No newline at end of file diff --git a/addons/stock/static/src/js/stock_picking_type.js b/addons/stock/static/src/js/stock_picking_type.js index 4c548eaad2c..7cfb3e1b77e 100644 --- a/addons/stock/static/src/js/stock_picking_type.js +++ b/addons/stock/static/src/js/stock_picking_type.js @@ -12,12 +12,12 @@ openerp.stock = function(openerp) { self.$el.sparkline(value, { type: type, barWidth: 5, - tooltipFormat: '{{offset:offset}} {{value}}', + tooltipFormat: '{{offset:offset}}: {{value}} Move(s)', tooltipValueLookups: { 'offset': tooltips }, }); - self.$el.tipsy({'delayIn': 0, 'html': true, 'title': function(){return title}, 'gravity': 'n'}); + self.$el.tipsy({'delayIn': 3000, 'html': true, 'title': function(){return title}, 'gravity': 'n'}); }, 0); }, }); diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml index 310977ebe68..9c3857ef4fd 100644 --- a/addons/stock/stock_view.xml +++ b/addons/stock/stock_view.xml @@ -1244,8 +1244,7 @@
-

- +

-
+
Late Backorders
From 0674acb71530d095a0d071af9498525cb8d44a9b Mon Sep 17 00:00:00 2001 From: "Turkesh Patel (Open ERP)" Date: Mon, 5 Aug 2013 12:57:54 +0530 Subject: [PATCH 3/5] [IMP] improved view by css bzr revid: tpa@tinyerp.com-20130805072754-2ogjt3urowomn2m2 --- addons/stock/static/src/css/stock.css | 53 +++++++++++++++++++-------- addons/stock/stock_view.xml | 16 +++----- 2 files changed, 42 insertions(+), 27 deletions(-) diff --git a/addons/stock/static/src/css/stock.css b/addons/stock/static/src/css/stock.css index 28a9504364e..78828f0c45c 100644 --- a/addons/stock/static/src/css/stock.css +++ b/addons/stock/static/src/css/stock.css @@ -67,29 +67,50 @@ margin: 2px 0; } -.oe_stock_scan_image { - opacity: 0.2; - margin: 0 5px 0; -} -.oe_stock_scan_image:hover { - opacity: 1 -} .openerp .oe_kanban_view .oe_kanban_stock_picking_type { width: 345px; cursor: default; + min-height: 100px !important; } -.openerp .oe_kanban_view .oe_sparkline_bar_link { +.openerp .oe_kanban_view .oe_kanban_stock_picking_type .oe_items_list { + position: relative; + margin: 10px; + height: 95px; +} +.openerp .oe_kanban_view .oe_kanban_stock_picking_type .oe_items_list div { + width: 160px; + height: 22px; + margin: 0 !important; + position: relative; + display: inline-block; + float: left; +} +.openerp .oe_kanban_view .oe_kanban_stock_picking_type .oe_items_list a:hover { + text-decoration: underline !important; +} +.openerp .oe_kanban_view .oe_kanban_stock_picking_type .oe_items_list div a:nth-child(2n) { + position: absolute; + left: 150px; + top: 0; +} +.openerp .oe_kanban_view .oe_kanban_stock_picking_type .oe_items_list div:nth-child(2n) a:nth-child(2n) { + left: 110px; +} +.openerp .oe_kanban_view .oe_kanban_stock_picking_type .oe_sparkline_bar { height: 20px; - width: 36px !important; + width: 66px !important; } -.openerp .oe_kanban_view .oe_sparkline_bar { - height: 20px; - width: 36px !important; -} -.oe_center_name { - text-align: center; +.openerp .oe_kanban_view .oe_kanban_stock_picking_type .oe_center { + text-align: center; } .openerp .oe_kanban_view .oe_stock_justgage { color: black; display: inline-block; -} \ No newline at end of file +} +.openerp .oe_stock_scan_image { + opacity: 0.2; + margin: 0 5px 0; +} +.openerp .oe_stock_scan_image:hover { + opacity: 1 +} diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml index 8c2957fc2ba..d0fee5b567b 100644 --- a/addons/stock/stock_view.xml +++ b/addons/stock/stock_view.xml @@ -1244,7 +1244,7 @@
-

+

-
+
-
- -
Late Backorders From d4d4d40aa01bc7b31c2b221b621a1325c3dfea08 Mon Sep 17 00:00:00 2001 From: "Turkesh Patel (Open ERP)" Date: Mon, 5 Aug 2013 16:01:59 +0530 Subject: [PATCH 4/5] [IMP] improved view and css bzr revid: tpa@tinyerp.com-20130805103159-bhjw46uaxru77t35 --- addons/stock/static/src/css/stock.css | 7 ++++--- addons/stock/stock_view.xml | 4 ++-- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/addons/stock/static/src/css/stock.css b/addons/stock/static/src/css/stock.css index 78828f0c45c..ddce4d479ef 100644 --- a/addons/stock/static/src/css/stock.css +++ b/addons/stock/static/src/css/stock.css @@ -70,12 +70,11 @@ .openerp .oe_kanban_view .oe_kanban_stock_picking_type { width: 345px; cursor: default; - min-height: 100px !important; + min-height: 250px !important; } .openerp .oe_kanban_view .oe_kanban_stock_picking_type .oe_items_list { position: relative; margin: 10px; - height: 95px; } .openerp .oe_kanban_view .oe_kanban_stock_picking_type .oe_items_list div { width: 160px; @@ -94,7 +93,7 @@ top: 0; } .openerp .oe_kanban_view .oe_kanban_stock_picking_type .oe_items_list div:nth-child(2n) a:nth-child(2n) { - left: 110px; + left: 150px; } .openerp .oe_kanban_view .oe_kanban_stock_picking_type .oe_sparkline_bar { height: 20px; @@ -106,6 +105,8 @@ .openerp .oe_kanban_view .oe_stock_justgage { color: black; display: inline-block; + bottom: 0px; + position: absolute; } .openerp .oe_stock_scan_image { opacity: 0.2; diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml index d0fee5b567b..da392d5ddc0 100644 --- a/addons/stock/stock_view.xml +++ b/addons/stock/stock_view.xml @@ -1285,8 +1285,8 @@
- Late - Backorders + Late (%%) + Backorders (%%)
From f35cfac3fa7840c08787e4d282794c9e6033c584 Mon Sep 17 00:00:00 2001 From: "Chirag Dodiya (OpenERP Trainee)" Date: Tue, 6 Aug 2013 11:53:14 +0530 Subject: [PATCH 5/5] [IMP] Improved Inventory Moves kanban view bzr revid: chiragdd7@gmail.com-20130806062314-mgzfhpbjrjdqng5g --- addons/stock/stock.py | 6 +++++- addons/stock/stock_view.xml | 13 ++++++++++--- 2 files changed, 15 insertions(+), 4 deletions(-) diff --git a/addons/stock/stock.py b/addons/stock/stock.py index 4e6de6310cc..f1d34b95c33 100644 --- a/addons/stock/stock.py +++ b/addons/stock/stock.py @@ -2146,13 +2146,15 @@ class stock_picking_type(osv.osv): for id in ids: result[id] = { 'latest_picking_late': [], - 'latest_picking_backorders': [] + 'latest_picking_backorders': [], + 'latest_picking_waiting': [] } for type_id in ids: pick_ids = obj.search(cr, uid, [('state', '=','done'), ('picking_type_id','=',type_id)], limit=12, order="date desc", context=context) for pick in obj.browse(cr, uid, pick_ids, context=context): result[type_id]['latest_picking_late'] = cmp(pick.date[:10], time.strftime('%Y-%m-%d')) result[type_id]['latest_picking_backorders'] = bool(pick.backorder_id) + result[type_id]['latest_picking_waiting'] = cmp(pick.date[:10], time.strftime('%Y-%m-%d')) return result _columns = { @@ -2188,6 +2190,8 @@ class stock_picking_type(osv.osv): type='string', multi='_get_picking_history'), 'latest_picking_backorders': fields.function(_get_picking_history, type='string', multi='_get_picking_history'), + 'latest_picking_waiting': fields.function(_get_picking_history, + type='string', multi='_get_picking_history'), } diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml index da392d5ddc0..879de8c1165 100644 --- a/addons/stock/stock_view.xml +++ b/addons/stock/stock_view.xml @@ -1253,19 +1253,26 @@
-
+
- - + Ready Weekly Moves
+
+ + Weekly Moves + +
Waiting + + +