diff --git a/addons/account/security/account_security.xml b/addons/account/security/account_security.xml
index 641164df389..f22dc39f7dd 100644
--- a/addons/account/security/account_security.xml
+++ b/addons/account/security/account_security.xml
@@ -103,105 +103,90 @@
Account Entry
-
['|',('company_id','=',False),('company_id', 'in', company_ids)]
Entry lines
-
['|',('company_id','=',False),('company_id', 'in', company_ids)]
Journal Group multi-company
-
['|',('company_id','=',False),('company_id', 'in', company_ids)]
Journal multi-company
-
['|',('company_id','=',False),('company_id', 'in', company_ids)]
Account multi-company
-
['|',('company_id','=',False),('company_id', 'in', company_ids)]
Account Group multi-company
-
[('company_id', 'in', company_ids)]
Account Root multi-company
-
['|',('company_id','=',False),('company_id', 'in', company_ids)]
Tax multi-company
-
['|',('company_id','=',False),('company_id', 'in', company_ids)]
Invoice Analysis multi-company
-
['|',('company_id','=',False),('company_id', 'in', company_ids)]
Account fiscal Mapping company rule
-
['|',('company_id','=',False),('company_id', 'in', company_ids)]
Account bank statement company rule
-
['|',('company_id','=',False),('company_id', 'in', company_ids)]
Account bank statement line company rule
-
['|',('company_id','=',False),('company_id', 'in', company_ids)]
Account reconcile model template company rule
-
['|',('company_id','=',False),('company_id', 'in', company_ids)]
Account reconcile model_line template company rule
-
['|',('company_id','=',False),('company_id', 'in', company_ids)]
Account payment company rule
-
['|',('company_id','=',False),('company_id', 'in', company_ids)]
diff --git a/addons/crm/security/crm_security.xml b/addons/crm/security/crm_security.xml
index e96c6f1809a..892ecc7e7dc 100644
--- a/addons/crm/security/crm_security.xml
+++ b/addons/crm/security/crm_security.xml
@@ -69,7 +69,6 @@
CRM Lead Multi-Company
-
['|',('company_id','=',False),('company_id', 'in', company_ids)]
diff --git a/addons/delivery/security/delivery_carrier_security.xml b/addons/delivery/security/delivery_carrier_security.xml
index 4f60ee6d286..84b71329eca 100644
--- a/addons/delivery/security/delivery_carrier_security.xml
+++ b/addons/delivery/security/delivery_carrier_security.xml
@@ -4,7 +4,6 @@
Delivery Carrier multi-company
-
['|', ('company_id', 'in', company_ids), ('company_id', '=', False)]
diff --git a/addons/event/security/event_security.xml b/addons/event/security/event_security.xml
index 08dd739cf52..613625f2c78 100644
--- a/addons/event/security/event_security.xml
+++ b/addons/event/security/event_security.xml
@@ -29,7 +29,6 @@
Event: multi-company
-
['|',
('company_id', '=', False),
('company_id', 'in', company_ids),
@@ -39,7 +38,6 @@
Event/Registration: multi-company
-
['|',
('company_id', '=', False),
('company_id', 'in', company_ids),
diff --git a/addons/fleet/security/fleet_security.xml b/addons/fleet/security/fleet_security.xml
index 3d1dc4b65d2..786a030d1c8 100644
--- a/addons/fleet/security/fleet_security.xml
+++ b/addons/fleet/security/fleet_security.xml
@@ -83,7 +83,6 @@
Fleet vehicle: Multi Company
-
['|', ('company_id', '=', False), ('company_id', 'in', company_ids)]
diff --git a/addons/gamification/security/gamification_security.xml b/addons/gamification/security/gamification_security.xml
index 4629c8776b2..0733209d3f6 100644
--- a/addons/gamification/security/gamification_security.xml
+++ b/addons/gamification/security/gamification_security.xml
@@ -32,7 +32,6 @@
Multicompany rule on challenges
[('user_id.company_id', 'in', company_ids)]
-
diff --git a/addons/hr/security/hr_security.xml b/addons/hr/security/hr_security.xml
index bbafaf7fb38..5a8d4f01aac 100644
--- a/addons/hr/security/hr_security.xml
+++ b/addons/hr/security/hr_security.xml
@@ -29,28 +29,24 @@
Employee multi company rule
-
['|',('company_id','=',False),('company_id', 'in', company_ids)]
Department multi company rule
-
['|',('company_id','=',False),('company_id', 'in', company_ids)]
Employee multi company rule
-
['|',('company_id','=',False),('company_id', 'in', company_ids)]
Job multi company rule
-
['|',('company_id','=',False),('company_id', 'in', company_ids)]
diff --git a/addons/hr_contract/security/security.xml b/addons/hr_contract/security/security.xml
index 2ffba623cf7..e65a83d488f 100644
--- a/addons/hr_contract/security/security.xml
+++ b/addons/hr_contract/security/security.xml
@@ -20,7 +20,6 @@
HR Contract: Multi Company
-
['|', ('company_id', '=', False), ('company_id', 'in', company_ids)]
diff --git a/addons/hr_holidays/security/hr_holidays_security.xml b/addons/hr_holidays/security/hr_holidays_security.xml
index f416e939808..f0a15d56563 100644
--- a/addons/hr_holidays/security/hr_holidays_security.xml
+++ b/addons/hr_holidays/security/hr_holidays_security.xml
@@ -88,7 +88,6 @@
Time Off: multi company global rule
-
['|', ('holiday_status_id.company_id', '=', False), ('holiday_status_id.company_id', 'in', company_ids)]
@@ -189,7 +188,6 @@
Time Off multi company rule
-
['|', ('company_id', '=', False), ('company_id', 'in', company_ids)]
diff --git a/addons/lunch/security/lunch_security.xml b/addons/lunch/security/lunch_security.xml
index 01a59c0057a..8b8c17e80e6 100644
--- a/addons/lunch/security/lunch_security.xml
+++ b/addons/lunch/security/lunch_security.xml
@@ -68,28 +68,24 @@
Lunch supplier: Multi Company
-
['|', ('company_id', '=', False), ('company_id', 'in', company_ids)]
Lunch product: Multi Company
-
['|', ('company_id', '=', False), ('company_id', 'in', company_ids)]
Lunch location: Multi Company
-
['|', ('company_id', '=', False), ('company_id', 'in', company_ids)]
Lunch product report: Multi Company
-
['|', ('company_id', '=', False), ('company_id', 'in', company_ids)]
diff --git a/addons/mail/security/mail_security.xml b/addons/mail/security/mail_security.xml
index 036f9a275c2..c65ed7f641b 100644
--- a/addons/mail/security/mail_security.xml
+++ b/addons/mail/security/mail_security.xml
@@ -52,7 +52,6 @@
Mail Compose Message Rule
[('create_uid', '=', user.id)]
-
diff --git a/addons/maintenance/security/maintenance.xml b/addons/maintenance/security/maintenance.xml
index 8a15e48e01f..5b4912fd03c 100644
--- a/addons/maintenance/security/maintenance.xml
+++ b/addons/maintenance/security/maintenance.xml
@@ -40,28 +40,24 @@
Maintenance Request Multi-company rule
-
['|',('company_id','=',False),('company_id', 'in', company_ids)]
Maintenance Equipment Multi-company rule
-
['|',('company_id','=',False),('company_id', 'in', company_ids)]
Maintenance Team Multi-company rule
-
['|',('company_id','=',False),('company_id', 'in', company_ids)]
Maintenance Equipment Category Multi-company rule
-
['|',('company_id','=',False),('company_id', 'in', company_ids)]
diff --git a/addons/mrp/security/mrp_security.xml b/addons/mrp/security/mrp_security.xml
index fc4854b214c..c1c350dffd1 100644
--- a/addons/mrp/security/mrp_security.xml
+++ b/addons/mrp/security/mrp_security.xml
@@ -39,70 +39,60 @@
mrp_production multi-company
-
[('company_id', 'in', company_ids)]
mrp_unbuild multi-company
-
[('company_id', 'in', company_ids)]
mrp_workcenter multi-company
-
['|',('company_id', 'in', company_ids),('company_id','=',False)]
mrp_workorder multi-company
-
[('company_id', 'in', company_ids)]
mrp_bom multi-company
-
['|',('company_id', 'in', company_ids),('company_id','=',False)]
mrp_bom_line multi-company
-
['|',('company_id', 'in', company_ids),('company_id','=',False)]
mrp_bom_byproduct multi-company
-
['|',('company_id', 'in', company_ids),('company_id','=',False)]
mrp_routing multi-company
-
['|',('company_id', 'in', company_ids),('company_id','=',False)]
mrp_routing_workcenter multi-company
-
['|',('company_id', 'in', company_ids),('company_id','=',False)]
mrp_workcenter_productivity multi-company
-
[('company_id', 'in', company_ids)]
diff --git a/addons/note/security/note_security.xml b/addons/note/security/note_security.xml
index 6463bbfab1b..6dac46ef040 100644
--- a/addons/note/security/note_security.xml
+++ b/addons/note/security/note_security.xml
@@ -4,7 +4,6 @@
Only followers can access a sticky notes
['|', ('user_id', '=', user.id), ('message_partner_ids', '=', user.partner_id.id)]
-
@@ -13,7 +12,6 @@
note: create / unlink: responsible
[('user_id', '=', user.id)]
-
@@ -22,7 +20,6 @@
Each user have his stage name
['|',('user_id','=',False),('user_id','=',user.id)]
-
diff --git a/addons/point_of_sale/security/point_of_sale_security.xml b/addons/point_of_sale/security/point_of_sale_security.xml
index ca1b8264c3f..095c61fa999 100644
--- a/addons/point_of_sale/security/point_of_sale_security.xml
+++ b/addons/point_of_sale/security/point_of_sale_security.xml
@@ -50,37 +50,31 @@
Point Of Sale Order
-
[('company_id', 'in', company_ids)]
Point Of Sale Session
-
[('config_id.company_id', 'in', company_ids)]
Point Of Sale Config
-
[('company_id', 'in', company_ids)]
Point Of Sale Order Analysis multi-company
-
['|',('company_id','=',False),('company_id', 'in', company_ids)]
PoS Payment Method
-
[('company_id', 'in', company_ids)]
PoS Payment
-
[('company_id', 'in', company_ids)]
diff --git a/addons/product/security/product_security.xml b/addons/product/security/product_security.xml
index 6da657fca1a..4cbff24b335 100644
--- a/addons/product/security/product_security.xml
+++ b/addons/product/security/product_security.xml
@@ -34,35 +34,30 @@
Product multi-company
-
['|', ('company_id', 'in', company_ids), ('company_id', '=', False)]
product pricelist company rule
-
['|', ('company_id', 'in', company_ids), ('company_id', '=', False)]
product pricelist item company rule
-
['|', ('company_id', 'in', company_ids), ('company_id', '=', False)]
product supplierinfo company rule
-
['|', ('company_id', '=', False), ('company_id', 'in', company_ids)]
product packaging company rule
-
['|', ('company_id', '=', False), ('company_id', 'in', company_ids)]
diff --git a/addons/project/security/project_security.xml b/addons/project/security/project_security.xml
index 58d51e0fc94..ead2c9c52d5 100644
--- a/addons/project/security/project_security.xml
+++ b/addons/project/security/project_security.xml
@@ -37,7 +37,6 @@
Project: multi-company
-
[('company_id', 'in', company_ids)]
@@ -62,7 +61,6 @@
Project/Task: multi-company
-
[('company_id', 'in', company_ids)]
@@ -87,7 +85,6 @@
Task Analysis multi-company
-
[('company_id', 'in', company_ids)]
diff --git a/addons/purchase/security/purchase_security.xml b/addons/purchase/security/purchase_security.xml
index 715793f8216..883c11e3c82 100644
--- a/addons/purchase/security/purchase_security.xml
+++ b/addons/purchase/security/purchase_security.xml
@@ -34,14 +34,12 @@
Purchase Order multi-company
-
['|',('company_id','=',False),('company_id', 'in', company_ids)]
Purchase Order Line multi-company
-
['|',('company_id','=',False),('company_id', 'in', company_ids)]
@@ -65,14 +63,12 @@
Purchases & Bills Union multi-company
-
['|',('company_id','=',False),('company_id', 'in', company_ids)]
Purchase Order Report multi-company
-
['|',('company_id','=',False),('company_id', 'in', company_ids)]
diff --git a/addons/purchase_requisition/security/purchase_requisition_security.xml b/addons/purchase_requisition/security/purchase_requisition_security.xml
index 161937c6e92..d18f4792121 100644
--- a/addons/purchase_requisition/security/purchase_requisition_security.xml
+++ b/addons/purchase_requisition/security/purchase_requisition_security.xml
@@ -5,14 +5,12 @@
Purchase Requisition multi-company
-
['|',('company_id','=',False),('company_id', 'in', company_ids)]
Purchase requisition Line multi-company
-
['|',('company_id','=',False),('company_id', 'in', company_ids)]
diff --git a/addons/repair/security/repair_security.xml b/addons/repair/security/repair_security.xml
index a3a5f7188c6..4f17fb2210c 100644
--- a/addons/repair/security/repair_security.xml
+++ b/addons/repair/security/repair_security.xml
@@ -6,19 +6,16 @@
repair order multi-company
-
[('company_id', 'in', company_ids)]
repair line multi-company
-
[('company_id', 'in', company_ids)]
repair fee multi-company
-
[('company_id', 'in', company_ids)]
diff --git a/addons/sale/security/sale_security.xml b/addons/sale/security/sale_security.xml
index fb041d3768f..a4f9ce82f11 100644
--- a/addons/sale/security/sale_security.xml
+++ b/addons/sale/security/sale_security.xml
@@ -35,21 +35,18 @@
Sales Order multi-company
-
[('company_id', 'in', company_ids)]
Sales Order Line multi-company
-
['|', ('company_id', '=', False), ('company_id', 'in', company_ids)]
Sales Order Analysis multi-company
-
['|',('company_id','=',False),('company_id', 'in', company_ids)]
@@ -187,26 +184,23 @@
[('move_id.move_type', 'in', ('out_invoice', 'out_refund', 'in_invoice', 'in_refund'))]
-
+
Payment Acquier Onboarding Wizard Rule
-
[('create_uid', '=', user.id)]
Sales Advance Payment Invoice Rule
-
[('create_uid', '=', user.id)]
Sales Order Cancel Rule
-
[('create_uid', '=', user.id)]
diff --git a/addons/sale_coupon/security/sale_coupon_security.xml b/addons/sale_coupon/security/sale_coupon_security.xml
index fa5b89ef5ef..e099e76273b 100644
--- a/addons/sale_coupon/security/sale_coupon_security.xml
+++ b/addons/sale_coupon/security/sale_coupon_security.xml
@@ -5,13 +5,11 @@
Sale Coupon Apply Code Rule
-
[('create_uid', '=', user.id)]
Generate Sales Coupon Rule
-
[('create_uid', '=', user.id)]
diff --git a/addons/stock/security/stock_security.xml b/addons/stock/security/stock_security.xml
index 84b7d8fad45..6a739de883a 100644
--- a/addons/stock/security/stock_security.xml
+++ b/addons/stock/security/stock_security.xml
@@ -73,119 +73,102 @@
stock_picking multi-company
-
[('company_id', 'in', company_ids)]
Stock Operation Type multi-company
-
[('company_id','in', company_ids)]
Stock Operation Type multi-company
-
[('company_id','in', company_ids)]
Stock Production Lot multi-company
-
[('company_id','in', company_ids)]
Warehouse multi-company
-
[('company_id', 'in', company_ids)]
Location multi-company
-
['|',('company_id','=',False),('company_id', 'in', company_ids)]
stock_move multi-company
-
[('company_id', 'in', company_ids)]
stock_move_line multi-company
-
['|',('company_id','=',False),('company_id', 'in', company_ids)]
stock_quant multi-company
-
['|',('company_id','=',False),('company_id', 'in', company_ids)]
Inventory Line multi-company
-
[('company_id', 'in', company_ids)]
Inventory multi-company
-
[('company_id', 'in', company_ids)]
stock_warehouse.orderpoint multi-company
-
[('company_id', 'in', company_ids)]
product_pulled_flow multi-company
-
['|',('company_id','=',False),('company_id', 'in', company_ids)]
stock_location_route multi-company
-
['|',('company_id','=',False),('company_id', 'in', company_ids)]
stock_quant_package multi-company
-
['|', ('company_id', '=', False), ('company_id', 'in', company_ids)]
stock_scrap_company multi-company
-
[('company_id', 'in', company_ids)]
report_stock_quantity_flow multi-company
-
['|',('company_id','=',False),('company_id', 'in', company_ids)]
diff --git a/addons/stock_account/security/stock_account_security.xml b/addons/stock_account/security/stock_account_security.xml
index 7a209e33678..91346b2f909 100644
--- a/addons/stock_account/security/stock_account_security.xml
+++ b/addons/stock_account/security/stock_account_security.xml
@@ -1,12 +1,9 @@
-
Stock Valuation Layer Multicompany
-
[('company_id', 'in', company_ids)]
-
diff --git a/addons/stock_landed_costs/security/stock_landed_cost_security.xml b/addons/stock_landed_costs/security/stock_landed_cost_security.xml
index 8dcbc0e9762..c74c9db151b 100644
--- a/addons/stock_landed_costs/security/stock_landed_cost_security.xml
+++ b/addons/stock_landed_costs/security/stock_landed_cost_security.xml
@@ -1,13 +1,10 @@
-
stock_landed_cost multi-company
-
['|',('company_id','=',False),('company_id', 'in', company_ids)]
-
-
\ No newline at end of file
+
diff --git a/addons/website_sale/security/website_sale.xml b/addons/website_sale/security/website_sale.xml
index 9c4702b0d9f..28fd4e1c420 100644
--- a/addons/website_sale/security/website_sale.xml
+++ b/addons/website_sale/security/website_sale.xml
@@ -46,13 +46,11 @@
product pricelist company rule
-
['|', ('company_id', 'in', [False,website.company_id.id]), ('company_id', 'in', company_ids)]
product pricelist item company rule
-
['|', ('company_id', 'in', [False,website.company_id.id]), ('company_id', 'in', company_ids)]
diff --git a/addons/website_slides/security/website_slides_security.xml b/addons/website_slides/security/website_slides_security.xml
index d732f167e27..ab14e8e2642 100644
--- a/addons/website_slides/security/website_slides_security.xml
+++ b/addons/website_slides/security/website_slides_security.xml
@@ -29,7 +29,6 @@
Channel: always visible (sub rules exist)
-
[(1, '=', 1)]
@@ -80,7 +79,6 @@
Slide: always visible (sub rules exist)
-
[(1, '=', 1)]
@@ -190,4 +188,4 @@
-
\ No newline at end of file
+
diff --git a/odoo/addons/base/security/base_security.xml b/odoo/addons/base/security/base_security.xml
index f3ee7bb6cbc..c2cb464bec4 100644
--- a/odoo/addons/base/security/base_security.xml
+++ b/odoo/addons/base/security/base_security.xml
@@ -58,8 +58,7 @@
Partner bank company rule
-
- ['|', ('company_id', 'in', company_ids), ('company_id', '=', False)]
+ ['|', ('company_id', 'in', company_ids), ('company_id', '=', False)]