From 1b8de3f1ff25cf22323dc0835f9cf3d0ece257ce Mon Sep 17 00:00:00 2001 From: "Quentin (OpenERP)" Date: Fri, 28 Jun 2013 14:39:20 +0200 Subject: [PATCH 1/2] [FIX] stock: stock.ui bzr revid: qdp-launchpad@openerp.com-20130628123920-68f7i2jedikrzuh8 --- addons/stock/static/src/js/widgets.js | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/addons/stock/static/src/js/widgets.js b/addons/stock/static/src/js/widgets.js index 470087bdbad..0e992378e44 100644 --- a/addons/stock/static/src/js/widgets.js +++ b/addons/stock/static/src/js/widgets.js @@ -43,9 +43,8 @@ function openerp_picking_widgets(instance){ var model = this.getParent(); var rows = []; var current_package_id = instance.session.user_context.current_package_id; - _.each( model.operations, function(op){ - if((typeof current_package_id !== 'undefined') && op.result_package_id !== current_package_id){ + if((typeof current_package_id !== 'undefined') && op.result_package_id[0] !== current_package_id){ return; } rows.push({ @@ -230,7 +229,7 @@ function openerp_picking_widgets(instance){ delete_package: function(package_id){ console.log('Delete Package:',package_id); new instance.web.Model('stock.quant.package') - .call('action_copy',[[package_id]]) + .call('unlink',[[package_id]]) .then(function(){ return self.refresh_ui(self.picking.id); }); From 35cf403b10646a988fbc16c515c496b456c6cd02 Mon Sep 17 00:00:00 2001 From: "Quentin (OpenERP)" Date: Fri, 28 Jun 2013 14:52:12 +0200 Subject: [PATCH 2/2] [WIP] stock: packaging bzr revid: qdp-launchpad@openerp.com-20130628125212-pvpzfpnzy3wqxsc3 --- addons/stock/stock.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/addons/stock/stock.py b/addons/stock/stock.py index 06ddd00b8c8..48ef01a0634 100644 --- a/addons/stock/stock.py +++ b/addons/stock/stock.py @@ -3806,7 +3806,9 @@ class stock_package(osv.osv): operation_ids = stock_operation_obj.search(cr, uid, [('result_package_id', 'in', ids)], context=context) #create a new empty stock.quant.package package_id = self.create(cr, uid, {}, context=context) - new_ops = stock_operation_obj.copy(cr, uid, operation_ids, {'result_package_id': package_id}, context=context) + new_ops = [] + for op in operation_ids: + new_ops += [stock_operation_obj.copy(cr, uid, op, {'result_package_id': package_id}, context=context)] for operation in stock_operation_obj.browse(cr, uid, new_ops, context=context): if operation.product_id: todo_on_moves, todo_on_operations = stock_operation_obj._search_and_increment(cr, uid, operation.picking_id.id, ('product_id', '=', operation.product_id.id), context=context)