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

[MERGE] stock_picking_ui: some fixes to load the stock picking ui

Browse Source 
bzr revid: fva@openerp.com-20130925095318-vipjvzd9prn7psv1
This commit is contained in:
Frédéric van der Essen
2013-09-25 11:53:18 +02:00
parent cfbde07672 42b6fdce41
commit 0895c2fa38
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/stock/static/src/js/widgets.js
+4 -4
View File
@@ -122,13 +122,13 @@ function openerp_picking_widgets(instance){
console.log('LOADING DATA FROM SERVER');
if(picking_id){
var picking = new instance.web.Model('stock.picking.in').call('read',[[picking_id], []]);
var picking = new instance.web.Model('stock.picking').call('read',[[picking_id], []]);
}else{
var picking = new instance.web.Model('stock.picking.in')
.call('_get_picking_for_packing_ui')
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.in').call('read',[[picking_id],[]]);
return new instance.web.Model('stock.picking').call('read',[[picking_id],[]]);
});
}
addons/stock/stock.py
+2 -2
View File
@@ -1000,14 +1000,14 @@ class stock_picking(osv.osv):
# Methods for the barcode UI
def _get_picking_for_packing_ui(self, cr, uid, context=None):
def get_picking_for_packing_ui(self, cr, uid, context=None):
res = self.search(cr, uid, [('state', '=', 'assigned')], limit=1, context=context)
return res and res[0] or False # TODO: what to do if nothing is left to do?
def action_done_from_packing_ui(self, cr, uid, picking_id, only_split_lines=False, context=None):
self.do_partial(cr, uid, picking_id, only_split_lines, context=context)
#return id of next picking to work on
return self._get_picking_for_packing_ui(cr, uid, context=context)
return self.get_picking_for_packing_ui(cr, uid, context=context)
def action_pack(self, cr, uid, picking_ids, context=None):
stock_operation_obj = self.pool.get('stock.pack.operation')