From 2ea749f67a45f6785ebb003184846f078b44a313 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20van=20der=20Essen?= Date: Wed, 25 Sep 2013 11:51:00 +0200 Subject: [PATCH] [FIX] stock_picking_ui: removed underscore to public api, as it would prevent remote execution + model rename stock.picking.in to stock.picking bzr revid: fva@openerp.com-20130925095100-bfu1r28t8kfpm5wg --- addons/stock/static/src/js/widgets.js | 8 ++++---- addons/stock/stock.py | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/addons/stock/static/src/js/widgets.js b/addons/stock/static/src/js/widgets.js index 2394d5d5624..8bbaea8c092 100644 --- a/addons/stock/static/src/js/widgets.js +++ b/addons/stock/static/src/js/widgets.js @@ -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],[]]); }); } diff --git a/addons/stock/stock.py b/addons/stock/stock.py index 72b49c06b99..898cda78680 100644 --- a/addons/stock/stock.py +++ b/addons/stock/stock.py @@ -1019,14 +1019,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')