diff --git a/addons/stock/static/src/js/widgets.js b/addons/stock/static/src/js/widgets.js index 0cbe0f821c3..49487b8e6a6 100644 --- a/addons/stock/static/src/js/widgets.js +++ b/addons/stock/static/src/js/widgets.js @@ -123,9 +123,9 @@ function openerp_picking_widgets(instance){ console.log('Operations:',self.operations); //return new instance.web.Model('stock.quant.package').call('read',[self.picking.package_ids, []]); - var params = [ 'read_group',[ [['result_package_id','!=','False'],['picking_id','=',self.picking.id]],[],['result_package_id'] ]]; + var params = [ 'read_group',[ [['result_package_id','!=', false],['picking_id','=',self.picking.id]],[],['result_package_id'] ]]; console.log('QUERY:',params); - return new instance.web.Model('stock.pack.operation').call('read_group',[ [['result_package_id','!=','False'],['picking_id','=',self.picking.id]],[],['result_package_id'] ]); + return new instance.web.Model('stock.pack.operation').call('read_group',[ [['result_package_id','!=', false],['picking_id','=',self.picking.id]],['id', 'result_package_id'],['result_package_id'] ]); }).then(function(packages){ self.packages = packages; console.log('RESPONSE:',arguments); diff --git a/addons/stock/stock.py b/addons/stock/stock.py index 7b48c62ffa3..48ecd11b258 100644 --- a/addons/stock/stock.py +++ b/addons/stock/stock.py @@ -3715,7 +3715,7 @@ class stock_package(osv.osv): 'parent_id': fields.many2one('stock.quant.package', 'Parent Package', help="The package containing this item"), 'children_ids': fields.one2many('stock.quant.package', 'parent_id', 'Packaged Content'), 'location_id': fields.related('quant_ids', 'location_id', type='many2one', relation='stock.location', string='Location', readonly=True), - 'pack_operation_id': fields.many2one('stock.pack.operation', string="Package Operation", help="The pack operation that built this package"), + #'pack_operation_id': fields.many2one('stock.pack.operation', string="Package Operation", help="The pack operation that built this package"), # 'picking_id': fields.related('pack_operation_id', 'picking_id', type='many2one', relation="stock.picking", string='Related Picking'), }