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

[MERGE] stock_picking_ui: Error dialog if the ui isn't open with the propers parameters

Browse Source 
bzr revid: fva@openerp.com-20130925131234-zo82dblbz2z0jcy9
This commit is contained in:
Frédéric van der Essen
2013-09-25 15:12:34 +02:00
parent 9760632523 b0a631ebe1
commit 5837bbcae0
1 changed files with 17 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/stock/static/src/js/widgets.js
+17 -3
View File
@@ -1,6 +1,7 @@
function openerp_picking_widgets(instance){
var module = instance.stock;
var _t = instance.web._t;
module.PickingEditorWidget = instance.web.Widget.extend({
template: 'PickingEditorWidget',
@@ -127,8 +128,21 @@ function openerp_picking_widgets(instance){
var picking = new instance.web.Model('stock.picking')
.call('get_picking_for_packing_ui')
.then(function(picking_id){
console.log('Provided Picking Id:',picking_id);
return new instance.web.Model('stock.picking').call('read',[[picking_id],[]]);
if(!picking_id){
(new instance.web.Dialog(self,{
title: _t('No Picking Available'),
buttons: [{
text:_t('Ok'),
click: function(){
self.quit();
}
}]
}, _t('<p>We could not find a picking to display.</p>'))).open();
return (new $.Deferred()).reject();
}else{
return new instance.web.Model('stock.picking').call('read',[[picking_id],[]]);
}
});
}
@@ -378,7 +392,7 @@ function openerp_picking_widgets(instance){
console.log('Quit');
this.disconnect_barcode_scanner_and_numpad();
instance.webclient.set_content_full_screen(false);
window.location = '/'; // FIXME THIS IS SHIT NIV WILL KILL YOU (BY MULTIPLE FACE-STABBING) IF YOU MERGE THIS IN TRUNK
window.location = '/'; // FIXME Ask niv how to do it correctly
},
});
}