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

[MERGE] stock.ui: load correct picking, rename copy and delete buttons

Browse Source 
bzr revid: fva@openerp.com-20130628163736-u3m0jvxpjl26rna5
This commit is contained in:
Frédéric van der Essen
2013-06-28 18:37:36 +02:00
parent 3bef5925a4 34171507bb
commit f4826a756c
3 changed files with 12 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/stock/static/src/css/picking.css
+4 -6
View File
@@ -125,13 +125,11 @@
}
.oe_pick_widget .oe_row_button{
display: inline-block;
background: rgb(255, 255, 255);
width: 16px;
height: 16px;
background: rgb(238, 237, 248);
padding: 2px 4px;
line-height: 14px;
color: rgb(102, 98, 133);
font-weight: bold;
border-radius: 9px;
color: rgb(137, 127, 173);
border-radius: 3px;
border: solid 1px rgba(0, 0, 0, 0.09);
cursor: pointer;
}
addons/stock/static/src/js/widgets.js
+6 -1
View File
@@ -123,7 +123,12 @@ function openerp_picking_widgets(instance){
if(picking_id){
var picking = new instance.web.Model('stock.picking.in').call('read',[[picking_id], []]);
}else{
var picking = new instance.web.Model('stock.picking.in').query().first();
var picking = new instance.web.Model('stock.picking.in')
.call('_get_picking_for_packing_ui')
.then(function(picking_id){
console.log('Provided Picking Id:',picking_id);
return new instance.web.Model('stock.picking.in').call('read',[[picking_id],[]]);
});
}
var loaded = picking.then(function(picking){
addons/stock/static/src/xml/picking.xml
+2 -2
View File
@@ -142,8 +142,8 @@
<t t-foreach="widget.get_rows()" t-as="row">
<tr t-att-class="'js_pack_row' + row.classes" t-att-pack-id="row.id">
<td class='js_pack_select'> <t t-esc="row.cols.pack" /> </td>
<td class='oe_centeralign'> <span class='oe_row_button js_pack_plus'>+</span> </td>
<td class='oe_centeralign'> <span class='oe_row_button js_pack_minus'>-</span> </td>
<td class='oe_centeralign'> <span class='oe_row_button js_pack_plus'>copy</span> </td>
<td class='oe_centeralign'> <span class='oe_row_button js_pack_minus'>delete</span> </td>
</tr>
</t>
</tbody>