diff --git a/openerp/addons/base/ir/ir_actions.xml b/openerp/addons/base/ir/ir_actions.xml
index 82514692c06..145627058ef 100644
--- a/openerp/addons/base/ir/ir_actions.xml
+++ b/openerp/addons/base/ir/ir_actions.xml
@@ -297,7 +297,7 @@
Property multi-company
-
+
['|',('company_id','child_of',[user.company_id.id]),('company_id','=',False)]
diff --git a/openerp/addons/base/ir/ir_filters.xml b/openerp/addons/base/ir/ir_filters.xml
index 72c5dad8885..88cc4b9838a 100644
--- a/openerp/addons/base/ir/ir_filters.xml
+++ b/openerp/addons/base/ir/ir_filters.xml
@@ -4,7 +4,7 @@
ir.filters.owner
-
+
[('user_id','in',[False,user.id])]
diff --git a/openerp/addons/base/res/res_security.xml b/openerp/addons/base/res/res_security.xml
index 783243411ef..0c8c0202d60 100644
--- a/openerp/addons/base/res/res_security.xml
+++ b/openerp/addons/base/res/res_security.xml
@@ -16,7 +16,7 @@
company rule
-
+
[('id','child_of',[user.company_id.id])]
@@ -25,7 +25,7 @@
user rule
-
+
[('company_ids','child_of',[user.company_id.id])]
diff --git a/openerp/import_xml.rng b/openerp/import_xml.rng
index 5f4c40b65d3..c055009a35d 100644
--- a/openerp/import_xml.rng
+++ b/openerp/import_xml.rng
@@ -1,17 +1,18 @@
-
+
-
-
-
-
-
+
-
-
-
-
-
+
+
+
+
+
+
+
+
+
@@ -125,19 +126,66 @@
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+ char
+ file
+
+
-
-
+
+
+ int
+
+
+ None
+
+
+
+ float
+
+
+
+
+
+ list
+ tuple
+
+
+
+
+
+
+
+ html
+ xml
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+