pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[MEREG] merge with main branch

Browse Source 
bzr revid: chiragdd7@gmail.com-20130805110722-8aku1kxnm90kvq35
This commit is contained in:
Chirag Dodiya (OpenERP Trainee)
2013-08-05 16:37:22 +05:30
parent cd523374b1 d4d4d40aa0
commit ac5315ddbd
3 changed files with 52 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/stock/static/src/css/stock.css
+43 -2
View File
@@ -67,10 +67,51 @@
margin: 2px 0;
}
.oe_stock_scan_image {
.openerp .oe_kanban_view .oe_kanban_stock_picking_type {
width: 345px;
cursor: default;
min-height: 250px !important;
}
.openerp .oe_kanban_view .oe_kanban_stock_picking_type .oe_items_list {
position: relative;
margin: 10px;
}
.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: 150px;
}
.openerp .oe_kanban_view .oe_kanban_stock_picking_type .oe_sparkline_bar {
height: 20px;
width: 66px !important;
}
.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;
bottom: 0px;
position: absolute;
}
.openerp .oe_stock_scan_image {
opacity: 0.2;
margin: 0 5px 0;
}
.oe_stock_scan_image:hover {
.openerp .oe_stock_scan_image:hover {
opacity: 1
}
addons/stock/static/src/js/stock_picking_type.js
+2 -2
View File
@@ -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);
},
});
addons/stock/stock_view.xml
+7 -14
View File
@@ -1245,7 +1245,6 @@
</div>
<div class="oe_kanban_content">
<h4 class="oe_center"><field name="name"/></h4>
<div class="oe_right">
<a name="%(action_stock_stock_ui)d" type="action">
<img src="/stock/static/src/img/scan.png"
@@ -1253,7 +1252,7 @@
class="oe_stock_scan_image" title="Click to launch the barcode interface"/>
</a>
</div>
<div class="oe_items_list">
<div class="oe_items_list oe_kanban_ellipsis">
<div>
<a name="%(action_picking_tree)d" type="action">
<field name="count_picking"/>
@@ -1265,14 +1264,12 @@
</div>
<div t-if="record.count_picking_waiting.raw_value &gt; 0">
<a name="%(action_picking_tree_waiting)d" type="action">
<field name="count_picking_waiting"/>
Waiting
<field name="count_picking_waiting"/> Waiting
</a>
</div>
<div t-if="record.count_picking_late.raw_value &gt; 0">
<a name="%(action_picking_tree_late)d" type="action">
<field name="count_picking_late"/>
Late
<field name="count_picking_late"/> Late
</a>
<a name="%(action_picking_tree_late)d" type="action" class="oe_sparkline_bar_link">
<field name="latest_picking_late" widget="stock_sparkline" options="{'type': 'tristate'}"/>
@@ -1280,20 +1277,16 @@
</div>
<div t-if="record.count_picking_backorders.raw_value &gt; 0">
<a name="%(action_picking_tree_backorder)d" type="action">
<field name="count_picking_backorders"/>
Backorders
<field name="count_picking_backorders"/> Backorders
</a>
<a name="%(action_picking_tree_backorder)d" type="action" class="oe_sparkline_bar_link">
<field name="latest_picking_backorders" widget="stock_sparkline" options="{'type': 'tristate'}"/>
</a>
</div>
</div>
<div class="oe_clear"> </div>
<div class="oe_center">
<field name="rate_picking_late" widget="stock_gage" style="width:160px; height: 120px;">Late</field>
<field name="rate_picking_backorders" widget="stock_gage" style="width:160px; height: 120px;">Backorders</field>
<div class="oe_center oe_stock_justgage">
<field name="rate_picking_late" widget="stock_gage" style="width:160px; height: 120px;">Late (%%)</field>
<field name="rate_picking_backorders" widget="stock_gage" style="width:160px; height: 120px;">Backorders (%%)</field>
</div>
</div>