diff --git a/addons/stock/stock.py b/addons/stock/stock.py index b0c19c1a25b..8719c5ff856 100644 --- a/addons/stock/stock.py +++ b/addons/stock/stock.py @@ -3313,6 +3313,7 @@ class stock_package(osv.osv): 'parent_left': fields.integer('Left Parent', select=1), 'parent_right': fields.integer('Right Parent', select=1), 'packaging_id': fields.many2one('product.packaging', 'Type of Packaging'), + 'ul_id': fields.many2one('product.ul', 'Type of Package'), 'location_id': fields.function(_get_package_info, type='many2one', relation='stock.location', string='Location', multi="package", store={ 'stock.quant': (_get_packages, ['location_id'], 10), diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml index ede38e6058a..c81fdce2e14 100644 --- a/addons/stock/stock_view.xml +++ b/addons/stock/stock_view.xml @@ -1970,7 +1970,8 @@ - + + @@ -1978,7 +1979,6 @@ - @@ -1999,6 +1999,7 @@ + @@ -2006,7 +2007,6 @@ - @@ -2019,6 +2019,7 @@ + @@ -2028,11 +2029,12 @@ stock.quant.package.search stock.quant.package - + +