From 53ea7007f2ca0c40ed0f02cb57dfc53be219dfec Mon Sep 17 00:00:00 2001
From: Josse Colpaert <jco@openerp.com>
Date: Mon, 22 Jul 2013 18:27:12 +0200
Subject: [PATCH] [WIP] Need ondelete cascade for partent_id and uncomment
 filter

bzr revid: jco@openerp.com-20130722162712-1oaevtg1dacr26ux
---
 addons/stock/stock.py       | 2 +-
 addons/stock/stock_view.xml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/stock/stock.py b/addons/stock/stock.py
index 6afbe95d337..c35abb33490 100644
--- a/addons/stock/stock.py
+++ b/addons/stock/stock.py
@@ -2309,7 +2309,7 @@ class stock_package(osv.osv):
         'location_id': fields.related('quant_ids', 'location_id', type='many2one', relation='stock.location', string='Location', 
                                       store = {'stock.quant': (_get_packages, ['location_id'], 10)}, readonly=True),
         'quant_ids': fields.one2many('stock.quant', 'package_id', 'Bulk Content'),
-        'parent_id': fields.many2one('stock.quant.package', 'Container Package', help="The package containing this item"),
+        'parent_id': fields.many2one('stock.quant.package', 'Container Package', help="The package containing this item", ondelete = "cascade"),
         'children_ids': fields.one2many('stock.quant.package', 'parent_id', 'Contained Packages'),
 
     }
diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index 24d63af7351..b612a4bca79 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -1604,7 +1604,7 @@
                        <filter name="locationgroup" string='Location' icon="terp-stock_symbol-selection" domain="[]" context="{'group_by' : 'location_id'}"/>
                        <filter string='Packaging' icon="terp-stock_symbol-selection" domain="[]" context="{'group_by' : 'package_id'}"/>
                        <filter name="partnergroup" string='Partner' domain="[]" context="{'group_by': 'partner_id'}"/>
-                       <!--<filter string='Company' icon="terp-go-home" domain="[]" context="{'group_by' : 'company_id'}" groups="base.group_multi_company"/>-->
+                       <filter string='Company' icon="terp-go-home" domain="[]" context="{'group_by' : 'company_id'}" groups="base.group_multi_company"/>
                    </group>
                 </search>
             </field>