[IMP] ir.rule reviewed

bzr revid: fp@tinyerp.com-20101018092840-7a6wv2vw2s6a1a2s

diff --git a/addons/account/security/account_security.xml b/addons/account/security/account_security.xml
index 2426506..347a82e 100644 (file)
--- a/addons/account/security/account_security.xml
+++ b/addons/account/security/account_security.xml
@@ -100,14 +100,14 @@
         <field name="name">Account fiscal Mapping company rule</field>
         <field model="ir.model" name="model_id" ref="model_account_fiscal_position"/>
         <field eval="True" name="global"/>
-        <field name="domain_force">[('company_id','=',user.company_id.id)]</field>
+        <field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>
     </record>
 
     <record id="account_model_comp_rule" model="ir.rule">
         <field name="name">Account model company rule</field>
         <field model="ir.model" name="model_id" ref="model_account_model"/>
         <field eval="True" name="global"/>
-        <field name="domain_force">[('company_id','=',user.company_id.id)]</field>
+        <field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>
     </record>
 
 </data></openerp>

diff --git a/addons/account_budget/security/account_budget_security.xml b/addons/account_budget/security/account_budget_security.xml
index ec07520..1fbcd82 100644 (file)
--- a/addons/account_budget/security/account_budget_security.xml
+++ b/addons/account_budget/security/account_budget_security.xml
@@ -1,27 +1,27 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
-       <data noupdate="0">
+    <data noupdate="0">
 
-           <record id="budget_post_comp_rule" model="ir.rule">
-               <field name="name">Budget post multi-company</field>
-               <field name="model_id" ref="model_account_budget_post"/>
-               <field eval="True" name="global"/>
-               <field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>
-           </record>
+        <record id="budget_post_comp_rule" model="ir.rule">
+            <field name="name">Budget post multi-company</field>
+            <field name="model_id" ref="model_account_budget_post"/>
+            <field eval="True" name="global"/>
+            <field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>
+        </record>
 
-           <record id="budget_comp_rule" model="ir.rule">
-               <field name="name">Budget multi-company</field>
-               <field name="model_id" ref="model_crossovered_budget"/>
-               <field eval="True" name="global"/>
-               <field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>
-           </record>
+        <record id="budget_comp_rule" model="ir.rule">
+            <field name="name">Budget multi-company</field>
+            <field name="model_id" ref="model_crossovered_budget"/>
+            <field eval="True" name="global"/>
+            <field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>
+        </record>
 
-           <record id="budget_lines_comp_rule" model="ir.rule">
-               <field name="name">Budget lines multi-company</field>
-               <field name="model_id" ref="model_crossovered_budget_lines"/>
-               <field eval="True" name="global"/>
-               <field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>
-           </record>
+        <record id="budget_lines_comp_rule" model="ir.rule">
+            <field name="name">Budget lines multi-company</field>
+            <field name="model_id" ref="model_crossovered_budget_lines"/>
+            <field eval="True" name="global"/>
+            <field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>
+        </record>
 
-       </data>
+    </data>
 </openerp>

diff --git a/addons/account_coda/security/account_security.xml b/addons/account_coda/security/account_security.xml
index f1a453d..b8fdd32 100644 (file)
--- a/addons/account_coda/security/account_security.xml
+++ b/addons/account_coda/security/account_security.xml
@@ -5,7 +5,7 @@
         <field name="name">Account Coda model company rule</field>
         <field model="ir.model" name="model_id" ref="model_account_coda"/>
         <field eval="True" name="global"/>
-        <field name="domain_force">[('company_id','=',user.company_id.id)]</field>
+        <field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>
     </record>
 
 </data></openerp>

diff --git a/addons/account_payment/security/account_payment_security.xml b/addons/account_payment/security/account_payment_security.xml
index 6561373..5977ea3 100644 (file)
--- a/addons/account_payment/security/account_payment_security.xml
+++ b/addons/account_payment/security/account_payment_security.xml
@@ -10,7 +10,7 @@
         <field name="name">Payment Mode company rule</field>
         <field model="ir.model" name="model_id" ref="model_payment_mode"/>
         <field eval="True" name="global"/>
-        <field name="domain_force">[('company_id','=',user.company_id.id)]</field>
+        <field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>
     </record>
 
 </data>

diff --git a/addons/analytic/security/analytic_security.xml b/addons/analytic/security/analytic_security.xml
index 2eeda3a..dfa8c84 100644 (file)
--- a/addons/analytic/security/analytic_security.xml
+++ b/addons/analytic/security/analytic_security.xml
@@ -5,7 +5,7 @@
         <field name="name">Analytic multi company rule</field>
         <field model="ir.model" name="model_id" ref="model_account_analytic_account"/>
         <field eval="True" name="global"/>
-        <field name="domain_force">[('company_id','=',user.company_id.id)]</field>
+        <field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>
     </record>
     <record id="group_analytic_accounting" model="res.groups" context="{'noadmin':True}">
         <field name="name">Useability / Analytic Accounting</field>

diff --git a/addons/crm/crm_lead_menu.xml b/addons/crm/crm_lead_menu.xml
index a92a36a..6c74dcc 100644 (file)
--- 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" />
 
     <menuitem parent="base.menu_sales" name="Leads"
-        groups="base.group_extended,base.group_sale_salesman"
+        groups="base.group_extended"
         id="menu_crm_case_categ0_act_leads"
         action="crm_case_category_act_leads_all" sequence="1" />
 

diff --git a/addons/crm/security/crm_security.xml b/addons/crm/security/crm_security.xml
index 78018a4..1e25ecb 100644 (file)
--- a/addons/crm/security/crm_security.xml
+++ b/addons/crm/security/crm_security.xml
@@ -34,6 +34,6 @@
     <record model="ir.ui.menu" id="base.menu_base_config">
         <field eval="[(4, ref('base.group_sale_manager'))]" name="groups_id"/>
     </record>
-    
+
     </data>
 </openerp>

diff --git a/addons/fetchmail/fetchmail_data.xml b/addons/fetchmail/fetchmail_data.xml
index 1b60f4c..ef40a76 100644 (file)
--- a/addons/fetchmail/fetchmail_data.xml
+++ b/addons/fetchmail/fetchmail_data.xml
@@ -12,15 +12,4 @@
             <field eval="'()'" name="args"/>
         </record>
     </data>
-
-    <data>
-
-        <record id="fetchmail_user_server_rule" model="ir.rule">
-               <field name="name">User wise Server</field>
-            <field ref="model_email_server" name="model_id" model="ir.model"/>
-            <field eval="True" name="global"/>
-            <field name="domain_force">[('user_id', '=', user.id)]</field>
-        </record>
-
-    </data>
 </openerp>

diff --git a/addons/hr_attendance/__openerp__.py b/addons/hr_attendance/__openerp__.py
index 8a52d0e..d38c0fc 100644 (file)
--- 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 d296716..372e911 100644 (file)
--- a/addons/hr_attendance/hr_attendance_demo.xml
+++ b/addons/hr_attendance/hr_attendance_demo.xml
@@ -121,17 +121,6 @@
             <field name="action">sign_out</field>
             <field name="employee_id" ref="hr.employee1"/>
         </record>
-        <record id="property_rule_attendace" model="ir.rule">
-            <field name="name">Employee Attendance</field>
-            <field model="ir.model" name="model_id" ref="model_hr_attendance"/>
-            <field name="domain_force">[('employee_id.user_id','=',user.id)]</field>
-            <field name="groups" eval="[(6,0,[ref('base.group_hr_user')])]"/>
-        </record>
-        <record id="property_rule_attendace_manager" model="ir.rule">
-            <field name="name">Manager Attendance</field>
-            <field model="ir.model" name="model_id" ref="model_hr_attendance"/>
-            <field name="domain_force">['|',('employee_id.user_id','=',user.id),('employee_id.parent_id.user_id','=',user.id )]</field>
-            <field name="groups" eval="[(6,0,[ref('base.group_hr_manager')])]"/>
-        </record>
+
     </data>
 </openerp>

diff --git a/addons/hr_attendance/security/ir_rule.xml b/addons/hr_attendance/security/ir_rule.xml
new file mode 100644 (file)
index 0000000..914acbb
--- /dev/null
+++ b/addons/hr_attendance/security/ir_rule.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data noupdate="True">
+
+        <record id="property_rule_attendace" model="ir.rule">
+            <field name="name">Employee Attendance</field>
+            <field model="ir.model" name="model_id" ref="model_hr_attendance"/>
+            <field name="domain_force">[('employee_id.user_id','=',user.id)]</field>
+            <field name="groups" eval="[(4,ref('base.group_hr_user'))]"/>
+        </record>
+        <record id="property_rule_attendace_manager" model="ir.rule">
+            <field name="name">Manager Attendance</field>
+            <field model="ir.model" name="model_id" ref="model_hr_attendance"/>
+            <field name="domain_force">[('1','=',1)]</field>
+            <field name="groups" eval="[(4,ref('base.group_hr_manager'))]"/>
+        </record>
+
+
+    </data>
+</openerp>
+

diff --git a/addons/hr_evaluation/hr_evaluation_demo.xml b/addons/hr_evaluation/hr_evaluation_demo.xml
index f8513bf..5939671 100644 (file)
--- 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.
         </record>
     </data>
 
-               <data>
-                 <record forcecreate="True" id="ir_cron_scheduler_evaluation" model="ir.cron">
-                  <field name="name">Run Employee Evaluation</field>
-                  <field eval="True" name="active" />
-                  <field name="user_id" ref="base.user_root" />
-                  <field name="interval_number">1</field>
-                  <field name="interval_type">minutes</field>
-                  <field name="numbercall">-1</field>
-                  <field eval="'hr.employee'" name="model" />
-                  <field eval="'run_employee_evaluation'" name="function" />
-                  <field eval="'(False,)'" name="args" />
-                 </record>
+        <data>
+          <record forcecreate="True" id="ir_cron_scheduler_evaluation" model="ir.cron">
+           <field name="name">Run Employee Evaluation</field>
+           <field eval="True" name="active" />
+           <field name="user_id" ref="base.user_root" />
+           <field name="interval_number">1</field>
+           <field name="interval_type">minutes</field>
+           <field name="numbercall">-1</field>
+           <field eval="'hr.employee'" name="model" />
+           <field eval="'run_employee_evaluation'" name="function" />
+           <field eval="'(False,)'" name="args" />
+          </record>
 
         <record id="property_rule_evaluation" model="ir.rule">
             <field name="name">Employee Evaluation</field>
             <field model="ir.model" name="model_id" ref="model_hr_evaluation_evaluation"/>
             <field name="domain_force">[('employee_id.user_id','=',user.id)]</field>
-            <field name="groups" eval="[(6,0,[ref('base.group_hr_user')])]"/>
+            <field name="groups" eval="[(4,ref('base.group_hr_user'))]"/>
         </record>
         <record id="property_rule_evaluation_manager" model="ir.rule">
             <field name="name">Manager Evaluation</field>
             <field model="ir.model" name="model_id" ref="model_hr_evaluation_evaluation"/>
             <field name="domain_force">['|',('employee_id.user_id','=',user.id),('employee_id.parent_id.user_id','=',user.id )]</field>
-            <field name="groups" eval="[(6,0,[ref('base.group_hr_manager')])]"/>
+            <field name="groups" eval="[(4,ref('base.group_hr_manager'))]"/>
         </record>
-                </data>
+         </data>
 
 </openerp>

diff --git a/addons/hr_expense/__openerp__.py b/addons/hr_expense/__openerp__.py
index c9df858..75d79d4 100644 (file)
--- 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 cb9e28b..4c85bd8 100644 (file)
--- a/addons/hr_expense/hr_expense_demo.xml
+++ b/addons/hr_expense/hr_expense_demo.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" ?>
 <openerp>
-       <data noupdate="1">
+    <data noupdate="1">
 
-           <record id="product_product_expense_air" model="product.product">
+        <record id="product_product_expense_air" model="product.product">
             <field name="list_price">1.0</field>
             <field name="standard_price">1.0</field>
             <field name="uom_id" ref="product.product_uom_unit"/>
@@ -38,61 +38,61 @@
             <field name="hr_expense_ok" eval="True" />
         </record>
 
-               <record id="hr_expense_expense_septemberexpenses0" model="hr.expense.expense">
-                       <field name="currency_id" ref="base.EUR"/>
-                       <field name="employee_id" ref="hr.employee1"/>
-                       <field name="user_id" ref="base.user_root"/>
-                       <field name="name">May Expenses</field>
-                       <field name="company_id" ref="base.main_company"/>
-                       <field name="date">2010-05-03</field>
-                       <field name="state">draft</field>
-               </record>
+        <record id="hr_expense_expense_septemberexpenses0" model="hr.expense.expense">
+            <field name="currency_id" ref="base.EUR"/>
+            <field name="employee_id" ref="hr.employee1"/>
+            <field name="user_id" ref="base.user_root"/>
+            <field name="name">May Expenses</field>
+            <field name="company_id" ref="base.main_company"/>
+            <field name="date">2010-05-03</field>
+            <field name="state">draft</field>
+        </record>
 
-               <record id="hr_expense_line_travelbycarcustomerseagatedouble0" model="hr.expense.line">
-                       <field name="name">Travel by Air</field>
-                       <field name="date_value">2010-05-03</field>
-                       <field name="analytic_account" ref="account.analytic_consultancy"/>
-                       <field name="product_id" ref="product_product_expense_air"/>
-                       <field model="hr.expense.expense" name="expense_id" search="[('name', '=', u'May Expenses')]"/>
-                       <field eval="700.0" name="unit_amount"/>
-                       <field name="uom_id" ref="product.product_uom_unit"/>
-                       <field eval="1.0" name="unit_quantity"/>
-               </record>
+        <record id="hr_expense_line_travelbycarcustomerseagatedouble0" model="hr.expense.line">
+            <field name="name">Travel by Air</field>
+            <field name="date_value">2010-05-03</field>
+            <field name="analytic_account" ref="account.analytic_consultancy"/>
+            <field name="product_id" ref="product_product_expense_air"/>
+            <field model="hr.expense.expense" name="expense_id" search="[('name', '=', u'May Expenses')]"/>
+            <field eval="700.0" name="unit_amount"/>
+            <field name="uom_id" ref="product.product_uom_unit"/>
+            <field eval="1.0" name="unit_quantity"/>
+        </record>
 
-               <record id="hr_expense_line_basicpcserverforseagate0" model="hr.expense.line">
-                       <field name="name">Basic PC - Server for Seagate</field>
-                       <field name="date_value">2010-05-03</field>
-                       <field name="analytic_account" ref="account.analytic_seagate_p2"/>
-                       <field name="product_id" ref="product.product_product_pc4"/>
-                       <field model="hr.expense.expense" name="expense_id" search="[('name', '=', u'May Expenses')]"/>
-                       <field eval="1200.0" name="unit_amount"/>
-                       <field name="uom_id" ref="product.product_uom_unit"/>
-                       <field eval="1.0" name="unit_quantity"/>
-               </record>
+        <record id="hr_expense_line_basicpcserverforseagate0" model="hr.expense.line">
+            <field name="name">Basic PC - Server for Seagate</field>
+            <field name="date_value">2010-05-03</field>
+            <field name="analytic_account" ref="account.analytic_seagate_p2"/>
+            <field name="product_id" ref="product.product_product_pc4"/>
+            <field model="hr.expense.expense" name="expense_id" search="[('name', '=', u'May Expenses')]"/>
+            <field eval="1200.0" name="unit_amount"/>
+            <field name="uom_id" ref="product.product_uom_unit"/>
+            <field eval="1.0" name="unit_quantity"/>
+        </record>
 
-       </data>
+    </data>
 
-       <data noupdate="1">
-               <record id="hr_expense_expense_septemberexpenses1" model="hr.expense.expense">
-                       <field name="currency_id" ref="base.EUR"/>
-                       <field name="employee_id" ref="hr.employee1"/>
-                       <field name="user_id" ref="base.user_root"/>
-                       <field name="name">Travel Expenses</field>
-                       <field name="company_id" ref="base.main_company"/>
-                       <field name="date">2010-04-20</field>
-                       <field name="state">draft</field>
-               </record>
+    <data noupdate="1">
+        <record id="hr_expense_expense_septemberexpenses1" model="hr.expense.expense">
+            <field name="currency_id" ref="base.EUR"/>
+            <field name="employee_id" ref="hr.employee1"/>
+            <field name="user_id" ref="base.user_root"/>
+            <field name="name">Travel Expenses</field>
+            <field name="company_id" ref="base.main_company"/>
+            <field name="date">2010-04-20</field>
+            <field name="state">draft</field>
+        </record>
 
-               <record id="hr_expense_line_hotelexpensesthymbra0" model="hr.expense.line">
-                       <field name="name">Hotel Expenses - Thymbra</field>
-                       <field name="date_value">2010-05-03</field>
-                       <field name="analytic_account" ref="account.analytic_thymbra"/>
-                       <field name="product_id" ref="product_product_expense_hotel"/>
-                       <field model="hr.expense.expense" name="expense_id" search="[('name', '=', u'Travel Expenses')]"/>
-                       <field eval="400.0" name="unit_amount"/>
-                       <field name="uom_id" ref="product.product_uom_unit"/>
-                       <field eval="5.0" name="unit_quantity"/>
-               </record>
+        <record id="hr_expense_line_hotelexpensesthymbra0" model="hr.expense.line">
+            <field name="name">Hotel Expenses - Thymbra</field>
+            <field name="date_value">2010-05-03</field>
+            <field name="analytic_account" ref="account.analytic_thymbra"/>
+            <field name="product_id" ref="product_product_expense_hotel"/>
+            <field model="hr.expense.expense" name="expense_id" search="[('name', '=', u'Travel Expenses')]"/>
+            <field eval="400.0" name="unit_amount"/>
+            <field name="uom_id" ref="product.product_uom_unit"/>
+            <field eval="5.0" name="unit_quantity"/>
+        </record>
 
         <record id="hr_expense_line_car_travel" model="hr.expense.line">
                 <field name="name">Bruxelles - Paris</field>
@@ -104,17 +104,5 @@
                 <field name="uom_id" ref="product.product_uom_km"/>
                 <field eval="622.0" name="unit_quantity"/>
         </record>
-        <record id="property_rule_expense" model="ir.rule">
-            <field name="name">Employee Expense</field>
-            <field model="ir.model" name="model_id" ref="model_hr_expense_expense"/>
-            <field name="domain_force">[('employee_id.user_id','=',user.id)]</field>
-            <field name="groups" eval="[(6,0,[ref('base.group_hr_user')])]"/>
-        </record>
-        <record id="property_rule_expense_manager" model="ir.rule">
-            <field name="name">Manager Expense</field>
-            <field model="ir.model" name="model_id" ref="model_hr_expense_expense"/>
-            <field name="domain_force">['|',('employee_id.user_id','=',user.id),('employee_id.parent_id.user_id','=',user.id )]</field>
-            <field name="groups" eval="[(6,0,[ref('base.group_hr_manager')])]"/>
-        </record>
-       </data>
+    </data>
 </openerp>

diff --git a/addons/hr_expense/security/ir_rule.xml b/addons/hr_expense/security/ir_rule.xml
new file mode 100644 (file)
index 0000000..1a3ee41
--- /dev/null
+++ b/addons/hr_expense/security/ir_rule.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" ?>
+<openerp>
+    <data noupdate="1">
+
+        <record id="property_rule_expense" model="ir.rule">
+            <field name="name">Employee Expense</field>
+            <field model="ir.model" name="model_id" ref="model_hr_expense_expense"/>
+            <field name="domain_force">[('employee_id.user_id','=',user.id)]</field>
+            <field name="groups" eval="[(4,ref('base.group_hr_user'))]"/>
+        </record>
+        <record id="property_rule_expense_manager" model="ir.rule">
+            <field name="name">Manager Expense</field>
+            <field model="ir.model" name="model_id" ref="model_hr_expense_expense"/>
+            <field name="domain_force">[('1','=',1)]</field>
+            <field name="groups" eval="[(4,ref('base.group_hr_manager'))]"/>
+        </record>
+
+    </data>
+</openerp>

diff --git a/addons/hr_holidays/__openerp__.py b/addons/hr_holidays/__openerp__.py
index 308f03b..09b312f 100644 (file)
--- 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 e12d7de..dca01d0 100644 (file)
--- a/addons/hr_holidays/hr_holidays_demo.xml
+++ b/addons/hr_holidays/hr_holidays_demo.xml
@@ -33,19 +33,5 @@
 
     <workflow action="confirm" model="hr.holidays" ref="hr_holidays_employee1_sl"/>
     <workflow action="validate" model="hr.holidays" ref="hr_holidays_employee1_sl"/>
-
-    <record id="property_rule_holidays" model="ir.rule">
-        <field name="name">Employee Holidays</field>
-        <field model="ir.model" name="model_id" ref="model_hr_holidays"/>
-        <field name="domain_force">[('employee_id.user_id','=',user.id)]</field>
-        <field name="groups" eval="[(6,0,[ref('base.group_hr_user')])]"/>
-    </record>
-    <record id="property_rule_holidays_manager" model="ir.rule">
-        <field name="name">Manager Holidays</field>
-        <field model="ir.model" name="model_id" ref="model_hr_holidays"/>
-        <field name="domain_force">['|',('employee_id.user_id','=',user.id),('employee_id.parent_id.user_id','=',user.id )]</field>
-        <field name="groups" eval="[(6,0,[ref('base.group_hr_manager')])]"/>
-        </record>
-
   </data>
 </openerp>

diff --git a/addons/hr_holidays/security/ir_rule.xml b/addons/hr_holidays/security/ir_rule.xml
new file mode 100644 (file)
index 0000000..12217aa
--- /dev/null
+++ b/addons/hr_holidays/security/ir_rule.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0"?>
+<openerp>
+  <data>
+
+    <record id="property_rule_holidays" model="ir.rule">
+        <field name="name">Employee Holidays</field>
+        <field model="ir.model" name="model_id" ref="model_hr_holidays"/>
+        <field name="domain_force">[('employee_id.user_id','=',user.id)]</field>
+        <field name="groups" eval="[(6,0,[ref('base.group_hr_user')])]"/>
+    </record>
+    <record id="property_rule_holidays_manager" model="ir.rule">
+        <field name="name">Manager Holidays</field>
+        <field model="ir.model" name="model_id" ref="model_hr_holidays"/>
+        <field name="domain_force">[('1','=',1)]</field>
+        <field name="groups" eval="[(6,0,[ref('base.group_hr_manager')])]"/>
+    </record>
+
+  </data>
+</openerp>

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 2ff303c..af6786a 100644 (file)
--- 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 @@
 <?xml version="1.0"?>
 <openerp>
-       <data>
+    <data>
 
-               <record model="ir.rule" id="timesheet_comp_rule">
-                       <field name="name">Timesheet multi-company</field>
-                       <field name="model_id" search="[('model','=','hr_timesheet_sheet.sheet')]" model="ir.model"/>
-                       <field name="global" eval="True"/>
-                       <field name="domain_force">[('company_id','child_of',[user.company_id.id])]</field>
-               </record>
+        <record model="ir.rule" id="timesheet_comp_rule">
+            <field name="name">Timesheet multi-company</field>
+            <field name="model_id" search="[('model','=','hr_timesheet_sheet.sheet')]" model="ir.model"/>
+            <field name="global" eval="True"/>
+            <field name="domain_force">[('company_id','child_of',[user.company_id.id])]</field>
+        </record>
 
-       </data>
+    </data>
 </openerp>

diff --git a/addons/mrp/security/mrp_security.xml b/addons/mrp/security/mrp_security.xml
index 406371a..b105e1c 100644 (file)
--- a/addons/mrp/security/mrp_security.xml
+++ b/addons/mrp/security/mrp_security.xml
@@ -10,28 +10,28 @@
     </record>
 
 
-       <!-- restrict access to menu -->
-       <record model='ir.ui.menu' id="mrp_Sched_all">
-               <field eval="[(6,0,[ref('group_mrp_manager')])]" name="groups_id"/>
-       </record>
+    <!-- restrict access to menu -->
+    <record model='ir.ui.menu' id="mrp_Sched_all">
+        <field eval="[(6,0,[ref('group_mrp_manager')])]" name="groups_id"/>
+    </record>
 
 <!-- Multi -->
     <record model="ir.rule" id="mrp_production_rule">
-       <field name="name">mrp_production multi-company</field>
+        <field name="name">mrp_production multi-company</field>
         <field name="model_id" search="[('model','=','mrp.production')]" model="ir.model"/>
         <field name="global" eval="True"/>
         <field name="domain_force">['|',('company_id','child_of',[user.company_id.id]),('company_id','=',False)]</field>
     </record>
 
     <record model="ir.rule" id="mrp_workcenter_rule">
-       <field name="name">mrp_workcenter multi-company</field>
+        <field name="name">mrp_workcenter multi-company</field>
         <field name="model_id" search="[('model','=','mrp.workcenter')]" model="ir.model"/>
         <field name="global" eval="True"/>
         <field name="domain_force">['|',('company_id','child_of',[user.company_id.id]),('company_id','=',False)]</field>
     </record>
 
     <record model="ir.rule" id="mrp_bom_rule">
-       <field name="name">mrp_bom multi-company</field>
+        <field name="name">mrp_bom multi-company</field>
         <field name="model_id" search="[('model','=','mrp.bom')]" model="ir.model"/>
         <field name="global" eval="True"/>
         <field name="domain_force">['|',('company_id','child_of',[user.company_id.id]),('company_id','=',False)]</field>

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 6163d65..d70fd1c 100644 (file)
--- 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 @@
     <record id="group_pos_user" model="res.groups">
         <field name="name">Point of Sale / User</field>
     </record>
-    
-    <record model="ir.rule" id="pos_cash_statement_rule">
-        <field name="name">Registers</field>
-        <field name="model_id" search="[('model','=','account.bank.statement')]" model="ir.model"/>
-        <field name="global" eval="True"/>
-        <field name="domain_force">[('user_id','!=',['base.user_root'])]</field>
-    </record>
 
 </data>
 </openerp>

diff --git a/addons/procurement/security/procurement_security.xml b/addons/procurement/security/procurement_security.xml
index cf32286..b6b15d5 100644 (file)
--- a/addons/procurement/security/procurement_security.xml
+++ b/addons/procurement/security/procurement_security.xml
@@ -1,20 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
-       <data noupdate="0">
-       
-           <record model="ir.rule" id="procurement_rule">
-               <field name="name">procurement multi-company</field>
-               <field name="model_id" search="[('model','=','procurement.order')]" model="ir.model"/>
-               <field name="global" eval="True"/>
-               <field name="domain_force">['|',('company_id','child_of',[user.company_id.id]),('company_id','=',False)]</field>
-           </record>
-       
-           <record model="ir.rule" id="stock_warehouse_orderpoint_rule">
-               <field name="name">stock_warehouse.orderpoint multi-company</field>
-               <field name="model_id" search="[('model','=','stock.warehouse.orderpoint')]" model="ir.model"/>
-               <field name="global" eval="True"/>
-               <field name="domain_force">['|',('company_id','child_of',[user.company_id.id]),('company_id','=',False)]</field>
-           </record>
-           
-       </data>
-</openerp>
\ No newline at end of file
+    <data noupdate="0">
+
+        <record model="ir.rule" id="procurement_rule">
+            <field name="name">procurement multi-company</field>
+            <field name="model_id" search="[('model','=','procurement.order')]" model="ir.model"/>
+            <field name="global" eval="True"/>
+            <field name="domain_force">['|',('company_id','child_of',[user.company_id.id]),('company_id','=',False)]</field>
+        </record>
+
+        <record model="ir.rule" id="stock_warehouse_orderpoint_rule">
+            <field name="name">stock_warehouse.orderpoint multi-company</field>
+            <field name="model_id" search="[('model','=','stock.warehouse.orderpoint')]" model="ir.model"/>
+            <field name="global" eval="True"/>
+            <field name="domain_force">['|',('company_id','child_of',[user.company_id.id]),('company_id','=',False)]</field>
+        </record>
+
+    </data>
+</openerp>

diff --git a/addons/project/security/project_security.xml b/addons/project/security/project_security.xml
index e77b1f3..cf8a333 100644 (file)
--- a/addons/project/security/project_security.xml
+++ b/addons/project/security/project_security.xml
@@ -37,13 +37,7 @@
         <field name="model_id" ref="model_project_task"/>
         <field name="global" eval="True"/>
         <field name="domain_force">['|','|','|',('user_id','=',False),('user_id','=',user.id),('project_id.members','in', [user.id]),('project_id.user_id','=',user.id)]</field>
-    </record>
-
-     <record model="ir.rule" id="project_details_comp_rule">
-        <field name="name" >Projects According to User</field>
-        <field name="model_id" ref="model_project_project"/>
-        <field name="groups" eval="[(6, 0, [ref('group_project_manager')])]"/>
-        <field name="domain_force">[('user_id','=',user.id)]</field>
+        <field name="groups" eval="[(4,ref('project.group_project_user'))]"/>
     </record>
 
 </data>

diff --git a/addons/purchase_requisition/security/purchase_tender.xml b/addons/purchase_requisition/security/purchase_tender.xml
index ebee3d0..9ccab8f 100644 (file)
--- a/addons/purchase_requisition/security/purchase_tender.xml
+++ b/addons/purchase_requisition/security/purchase_tender.xml
@@ -10,7 +10,7 @@
     </record>
 
     <record model="ir.rule" id="purchase_requisition_comp_rule">
-       <field name="name">Purchase Requisition multi-company</field>
+        <field name="name">Purchase Requisition multi-company</field>
         <field name="model_id" ref="model_purchase_requisition"/>
         <field name="global" eval="True"/>
         <field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>