odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

[WIP] stock: packaging 

bzr revid: qdp-launchpad@openerp.com-20130627160555-hk5zmgqzgliplmv1
This commit is contained in:
Quentin (OpenERP) 2013-06-27 18:05:55 +02:00
parent df0d4cbff6
commit f281cec518
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
addons/stock/static/src/js/widgets.js
View File

@ -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);

2
addons/stock/stock.py
View File

@ -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'),
}