diff --git a/addons/account/security/account_security.xml b/addons/account/security/account_security.xml
index 24265065b25..347a82e33c2 100644
--- a/addons/account/security/account_security.xml
+++ b/addons/account/security/account_security.xml
@@ -100,14 +100,14 @@
Account fiscal Mapping company rule
- [('company_id','=',user.company_id.id)]
+ ['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]
Account model company rule
- [('company_id','=',user.company_id.id)]
+ ['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]
diff --git a/addons/account_budget/security/account_budget_security.xml b/addons/account_budget/security/account_budget_security.xml
index ec075205f68..1fbcd82e86c 100644
--- a/addons/account_budget/security/account_budget_security.xml
+++ b/addons/account_budget/security/account_budget_security.xml
@@ -1,27 +1,27 @@
-
+
-
- Budget post multi-company
-
-
- ['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]
-
+
+ Budget post multi-company
+
+
+ ['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]
+
-
- Budget multi-company
-
-
- ['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]
-
+
+ Budget multi-company
+
+
+ ['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]
+
-
- Budget lines multi-company
-
-
- ['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]
-
+
+ Budget lines multi-company
+
+
+ ['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]
+
-
+
diff --git a/addons/account_coda/security/account_security.xml b/addons/account_coda/security/account_security.xml
index f1a453da542..b8fdd32ebe6 100644
--- a/addons/account_coda/security/account_security.xml
+++ b/addons/account_coda/security/account_security.xml
@@ -5,7 +5,7 @@
Account Coda model company rule
- [('company_id','=',user.company_id.id)]
+ ['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]
diff --git a/addons/account_payment/security/account_payment_security.xml b/addons/account_payment/security/account_payment_security.xml
index 6561373bafb..5977ea36365 100644
--- a/addons/account_payment/security/account_payment_security.xml
+++ b/addons/account_payment/security/account_payment_security.xml
@@ -10,7 +10,7 @@
Payment Mode company rule
- [('company_id','=',user.company_id.id)]
+ ['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]
diff --git a/addons/analytic/security/analytic_security.xml b/addons/analytic/security/analytic_security.xml
index 2eeda3aa370..dfa8c840bb6 100644
--- a/addons/analytic/security/analytic_security.xml
+++ b/addons/analytic/security/analytic_security.xml
@@ -5,7 +5,7 @@
Analytic multi company rule
- [('company_id','=',user.company_id.id)]
+ ['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]
Useability / Analytic Accounting
diff --git a/addons/crm/crm_lead_menu.xml b/addons/crm/crm_lead_menu.xml
index a92a36aba33..6c74dccac15 100644
--- a/addons/crm/crm_lead_menu.xml
+++ b/addons/crm/crm_lead_menu.xml
@@ -31,7 +31,7 @@
parent="base.menu_base_partner" sequence="1" />
diff --git a/addons/crm/security/crm_security.xml b/addons/crm/security/crm_security.xml
index 78018a4031b..1e25ecb5bdd 100644
--- a/addons/crm/security/crm_security.xml
+++ b/addons/crm/security/crm_security.xml
@@ -34,6 +34,6 @@
-
+
diff --git a/addons/fetchmail/fetchmail_data.xml b/addons/fetchmail/fetchmail_data.xml
index 1b60f4ca0a8..ef40a76489f 100644
--- a/addons/fetchmail/fetchmail_data.xml
+++ b/addons/fetchmail/fetchmail_data.xml
@@ -12,15 +12,4 @@
-
-
-
-
- User wise Server
-
-
- [('user_id', '=', user.id)]
-
-
-
diff --git a/addons/hr_attendance/__openerp__.py b/addons/hr_attendance/__openerp__.py
index 8a52d0e2577..d38c0fcebf3 100644
--- a/addons/hr_attendance/__openerp__.py
+++ b/addons/hr_attendance/__openerp__.py
@@ -36,15 +36,16 @@
'hr_attendance_view.xml',
'hr_attendance_report.xml',
'security/ir.model.access.csv',
+ 'security/ir_rule.xml',
'wizard/hr_attendance_bymonth_view.xml',
'wizard/hr_attendance_byweek_view.xml',
'wizard/hr_attendance_error_view.xml',
'wizard/hr_attendance_sign_in_out_view.xml',
- ],
+ ],
'demo_xml': ['hr_attendance_demo.xml'],
'test': ['test/test_hr_attendance.yml',
'test/hr_attendance_report.yml'
- ],
+ ],
'installable': True,
'active': False,
'certificate': '0063495605613',
diff --git a/addons/hr_attendance/hr_attendance_demo.xml b/addons/hr_attendance/hr_attendance_demo.xml
index d2967167ec8..372e9112269 100644
--- a/addons/hr_attendance/hr_attendance_demo.xml
+++ b/addons/hr_attendance/hr_attendance_demo.xml
@@ -121,17 +121,6 @@
sign_out
-
- Employee Attendance
-
- [('employee_id.user_id','=',user.id)]
-
-
-
- Manager Attendance
-
- ['|',('employee_id.user_id','=',user.id),('employee_id.parent_id.user_id','=',user.id )]
-
-
+
diff --git a/addons/hr_attendance/security/ir_rule.xml b/addons/hr_attendance/security/ir_rule.xml
new file mode 100644
index 00000000000..914acbb1974
--- /dev/null
+++ b/addons/hr_attendance/security/ir_rule.xml
@@ -0,0 +1,21 @@
+
+
+
+
+
+ Employee Attendance
+
+ [('employee_id.user_id','=',user.id)]
+
+
+
+ Manager Attendance
+
+ [('1','=',1)]
+
+
+
+
+
+
+
diff --git a/addons/hr_evaluation/hr_evaluation_demo.xml b/addons/hr_evaluation/hr_evaluation_demo.xml
index f8513bf63ea..59396717d49 100644
--- a/addons/hr_evaluation/hr_evaluation_demo.xml
+++ b/addons/hr_evaluation/hr_evaluation_demo.xml
@@ -1599,31 +1599,31 @@ Once the form had been filled, the employee send it to his supervisor.
-
-
- Run Employee Evaluation
-
-
- 1
- minutes
- -1
-
-
-
-
+
+
+ Run Employee Evaluation
+
+
+ 1
+ minutes
+ -1
+
+
+
+
Employee Evaluation
[('employee_id.user_id','=',user.id)]
-
+
Manager Evaluation
['|',('employee_id.user_id','=',user.id),('employee_id.parent_id.user_id','=',user.id )]
-
+
-
+
diff --git a/addons/hr_expense/__openerp__.py b/addons/hr_expense/__openerp__.py
index c9df8587153..75d79d4bfc6 100644
--- a/addons/hr_expense/__openerp__.py
+++ b/addons/hr_expense/__openerp__.py
@@ -49,10 +49,11 @@
'hr_expense_view.xml',
'hr_expense_report.xml',
'process/hr_expense_process.xml',
+ 'security/ir_rule.xml',
'report/hr_expense_report_view.xml',
'board_hr_expense_view.xml',
'board_hr_expense_manager_view.xml'
- ],
+ ],
'demo_xml': [
'hr_expense_demo.xml',
],
diff --git a/addons/hr_expense/hr_expense_demo.xml b/addons/hr_expense/hr_expense_demo.xml
index cb9e28b5543..4c85bd8384e 100644
--- a/addons/hr_expense/hr_expense_demo.xml
+++ b/addons/hr_expense/hr_expense_demo.xml
@@ -1,8 +1,8 @@
-
+
-
+
1.0
1.0
@@ -38,61 +38,61 @@
-
-
-
-
- May Expenses
-
- 2010-05-03
- draft
-
+
+
+
+
+ May Expenses
+
+ 2010-05-03
+ draft
+
-
- Travel by Air
- 2010-05-03
-
-
-
-
-
-
-
+
+ Travel by Air
+ 2010-05-03
+
+
+
+
+
+
+
-
- Basic PC - Server for Seagate
- 2010-05-03
-
-
-
-
-
-
-
+
+ Basic PC - Server for Seagate
+ 2010-05-03
+
+
+
+
+
+
+
-
+
-
-
-
-
-
- Travel Expenses
-
- 2010-04-20
- draft
-
+
+
+
+
+
+ Travel Expenses
+
+ 2010-04-20
+ draft
+
-
- Hotel Expenses - Thymbra
- 2010-05-03
-
-
-
-
-
-
-
+
+ Hotel Expenses - Thymbra
+ 2010-05-03
+
+
+
+
+
+
+
Bruxelles - Paris
@@ -104,17 +104,5 @@
-
- Employee Expense
-
- [('employee_id.user_id','=',user.id)]
-
-
-
- Manager Expense
-
- ['|',('employee_id.user_id','=',user.id),('employee_id.parent_id.user_id','=',user.id )]
-
-
-
+
diff --git a/addons/hr_expense/security/ir_rule.xml b/addons/hr_expense/security/ir_rule.xml
new file mode 100644
index 00000000000..1a3ee41cdcb
--- /dev/null
+++ b/addons/hr_expense/security/ir_rule.xml
@@ -0,0 +1,19 @@
+
+
+
+
+
+ Employee Expense
+
+ [('employee_id.user_id','=',user.id)]
+
+
+
+ Manager Expense
+
+ [('1','=',1)]
+
+
+
+
+
diff --git a/addons/hr_holidays/__openerp__.py b/addons/hr_holidays/__openerp__.py
index 308f03ba293..09b312f0834 100644
--- a/addons/hr_holidays/__openerp__.py
+++ b/addons/hr_holidays/__openerp__.py
@@ -54,6 +54,7 @@
'init_xml': [],
'update_xml': [
'security/ir.model.access.csv',
+ 'security/ir_rule.xml',
'hr_holidays_workflow.xml',
'hr_holidays_view.xml',
'hr_holidays_data.xml',
diff --git a/addons/hr_holidays/hr_holidays_demo.xml b/addons/hr_holidays/hr_holidays_demo.xml
index e12d7de16b5..dca01d06b1a 100644
--- a/addons/hr_holidays/hr_holidays_demo.xml
+++ b/addons/hr_holidays/hr_holidays_demo.xml
@@ -33,19 +33,5 @@
-
-
- Employee Holidays
-
- [('employee_id.user_id','=',user.id)]
-
-
-
- Manager Holidays
-
- ['|',('employee_id.user_id','=',user.id),('employee_id.parent_id.user_id','=',user.id )]
-
-
-
diff --git a/addons/hr_holidays/security/ir_rule.xml b/addons/hr_holidays/security/ir_rule.xml
new file mode 100644
index 00000000000..12217aaddf2
--- /dev/null
+++ b/addons/hr_holidays/security/ir_rule.xml
@@ -0,0 +1,19 @@
+
+
+
+
+
+ Employee Holidays
+
+ [('employee_id.user_id','=',user.id)]
+
+
+
+ Manager Holidays
+
+ [('1','=',1)]
+
+
+
+
+
diff --git a/addons/hr_timesheet_sheet/security/hr_timesheet_sheet_security.xml b/addons/hr_timesheet_sheet/security/hr_timesheet_sheet_security.xml
index 2ff303cb48f..af6786a2a77 100644
--- a/addons/hr_timesheet_sheet/security/hr_timesheet_sheet_security.xml
+++ b/addons/hr_timesheet_sheet/security/hr_timesheet_sheet_security.xml
@@ -1,13 +1,13 @@
-
+
-
- Timesheet multi-company
-
-
- [('company_id','child_of',[user.company_id.id])]
-
+
+ Timesheet multi-company
+
+
+ [('company_id','child_of',[user.company_id.id])]
+
-
+
diff --git a/addons/mrp/security/mrp_security.xml b/addons/mrp/security/mrp_security.xml
index 406371a89dd..b105e1cbb8a 100644
--- a/addons/mrp/security/mrp_security.xml
+++ b/addons/mrp/security/mrp_security.xml
@@ -10,28 +10,28 @@
-
-
-
-
+
+
+
+
- mrp_production multi-company
+ mrp_production multi-company
['|',('company_id','child_of',[user.company_id.id]),('company_id','=',False)]
- mrp_workcenter multi-company
+ mrp_workcenter multi-company
['|',('company_id','child_of',[user.company_id.id]),('company_id','=',False)]
- mrp_bom multi-company
+ mrp_bom multi-company
['|',('company_id','child_of',[user.company_id.id]),('company_id','=',False)]
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 6163d65a36f..d70fd1caa85 100644
--- a/addons/point_of_sale/security/point_of_sale_security.xml
+++ b/addons/point_of_sale/security/point_of_sale_security.xml
@@ -8,13 +8,6 @@
Point of Sale / User
-
-
- Registers
-
-
- [('user_id','!=',['base.user_root'])]
-
diff --git a/addons/procurement/security/procurement_security.xml b/addons/procurement/security/procurement_security.xml
index cf32286fd2f..b6b15d565c6 100644
--- a/addons/procurement/security/procurement_security.xml
+++ b/addons/procurement/security/procurement_security.xml
@@ -1,20 +1,20 @@
-
-
-
- procurement multi-company
-
-
- ['|',('company_id','child_of',[user.company_id.id]),('company_id','=',False)]
-
-
-
- stock_warehouse.orderpoint multi-company
-
-
- ['|',('company_id','child_of',[user.company_id.id]),('company_id','=',False)]
-
-
-
-
\ No newline at end of file
+
+
+
+ procurement multi-company
+
+
+ ['|',('company_id','child_of',[user.company_id.id]),('company_id','=',False)]
+
+
+
+ stock_warehouse.orderpoint multi-company
+
+
+ ['|',('company_id','child_of',[user.company_id.id]),('company_id','=',False)]
+
+
+
+
diff --git a/addons/project/security/project_security.xml b/addons/project/security/project_security.xml
index e77b1f338d1..cf8a333a71d 100644
--- a/addons/project/security/project_security.xml
+++ b/addons/project/security/project_security.xml
@@ -37,13 +37,7 @@
['|','|','|',('user_id','=',False),('user_id','=',user.id),('project_id.members','in', [user.id]),('project_id.user_id','=',user.id)]
-
-
-
- Projects According to User
-
-
- [('user_id','=',user.id)]
+
diff --git a/addons/purchase_requisition/security/purchase_tender.xml b/addons/purchase_requisition/security/purchase_tender.xml
index ebee3d040c2..9ccab8fdbb9 100644
--- a/addons/purchase_requisition/security/purchase_tender.xml
+++ b/addons/purchase_requisition/security/purchase_tender.xml
@@ -10,7 +10,7 @@
- Purchase Requisition multi-company
+ Purchase Requisition multi-company
['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]