access rights

bzr revid: fp@tinyerp.com-20100612162133-n94drwaqsuwq16eb

diff --git a/bin/addons/base/__openerp__.py b/bin/addons/base/__openerp__.py
index 0f0200f..e595436 100644 (file)
--- a/bin/addons/base/__openerp__.py
+++ b/bin/addons/base/__openerp__.py
@@ -36,7 +36,6 @@
         'base_menu.xml',
         'res/res_security.xml',
         'res/res_config.xml',
-        'maintenance/maintenance_security.xml',
         'data/res.country.state.csv'
     ],
     'update_xml': [

diff --git a/bin/addons/base/ir/ir_values.py b/bin/addons/base/ir/ir_values.py
index 7299b45..38e893a 100644 (file)
--- a/bin/addons/base/ir/ir_values.py
+++ b/bin/addons/base/ir/ir_values.py
@@ -232,8 +232,10 @@ class ir_values(osv.osv):
                     else:
                         pos+=1
                 try:
+                    print model, fields
                     datas = self.pool.get(model).read(cr, uid, [id], fields, context)
                 except except_orm, e:
+                    print 'Except', e
                     return False
                 datas= datas and datas[0] or None
                 if not datas:

diff --git a/bin/addons/base/maintenance/maintenance_security.xml b/bin/addons/base/maintenance/maintenance_security.xml
index bb47759..04b7d6d 100644 (file)
--- a/bin/addons/base/maintenance/maintenance_security.xml
+++ b/bin/addons/base/maintenance/maintenance_security.xml
@@ -2,13 +2,5 @@
 <openerp>
 <data noupdate="0">
 
-    <record model="res.groups" id="group_maintenance_manager">
-        <field name="name">Maintenance Manager</field>
-    </record>
-
-       <record model="ir.ui.menu" id="menu_maintenance_contract">
-               <field eval="[(6,0,[ref('group_maintenance_manager')])]" name="groups_id"/>
-       </record>
-
 </data>
 </openerp>

diff --git a/bin/addons/base/res/res_security.xml b/bin/addons/base/res/res_security.xml
index 9d935ca..99584de 100644 (file)
--- a/bin/addons/base/res/res_security.xml
+++ b/bin/addons/base/res/res_security.xml
@@ -6,10 +6,6 @@
         <field name="name">Partner Manager</field>
     </record>
 
-    <record model="ir.ui.menu" id="menu_base_partner">
-        <field eval="[(6,0,[ref('group_system'), ref('group_partner_manager')])]" name="groups_id"/>
-    </record>
-
     <record model="ir.ui.menu" id="menu_base_config">
         <field eval="[(6,0,[ref('group_system'), ref('group_partner_manager')])]" name="groups_id"/>
     </record>

diff --git a/bin/addons/base/security/base_security.xml b/bin/addons/base/security/base_security.xml
index ba5ea19..f2cd91d 100644 (file)
--- a/bin/addons/base/security/base_security.xml
+++ b/bin/addons/base/security/base_security.xml
@@ -6,11 +6,11 @@
  Users Groups
 -->
     <record model="res.groups" id="group_system">
-        <field name="name">Administrator / Configuration</field>
+        <field name="name">Administration / Configuration</field>
     </record>
 
     <record model="res.groups" id="group_erp_manager">
-        <field name="name">Administrator / Access Rights</field>
+        <field name="name">Administration / Access Rights</field>
     </record>
 
     <record model="res.groups" id="group_user">
@@ -18,7 +18,7 @@
     </record>
 
     <record model="res.groups" context="{'noadmin':True}" id="group_multi_company">
-        <field name="name">Multi Companies</field>
+        <field name="name">Useability / Multi Companies</field>
     </record>
 
     <record model="res.groups" context="{'noadmin':True}" id="group_extended">
@@ -51,7 +51,6 @@
     </record>
 
     <record id="base.menu_translation" model="ir.ui.menu">
-        <!-- FIXME: a "Usability / Translations" group ?? -->
         <field eval="[(6,0,[ref('base.group_system')])]" name="groups_id"/>
     </record>
 

diff --git a/bin/addons/base/security/ir.model.access.csv b/bin/addons/base/security/ir.model.access.csv
index 3819c74..c94923e 100644 (file)
--- a/bin/addons/base/security/ir.model.access.csv
+++ b/bin/addons/base/security/ir.model.access.csv
@@ -4,8 +4,8 @@
 "access_ir_cron_group_cron","ir_cron group_cron","model_ir_cron","group_system",1,1,1,1
 "access_ir_cron_user","ir_cron user","model_ir_cron","group_user",1,0,0,0
 "access_ir_default_group_system","ir_default group_system","model_ir_default",,1,1,1,1
-"access_ir_exports_group_system","ir_exports group_system","model_ir_exports",,1,1,1,1
-"access_ir_exports_line_group_system","ir_exports_line group_system","model_ir_exports_line",,1,1,1,1
+"access_ir_exports_group_system","ir_exports group_system","model_ir_exports",base.group_user,1,1,1,1
+"access_ir_exports_line_group_system","ir_exports_line group_system","model_ir_exports_line",base.group_user,1,1,1,1
 "access_ir_model_group_erp_manager","ir_model group_erp_manager","model_ir_model","group_erp_manager",1,1,1,1
 "access_ir_model_access_group_erp_manager","ir_model_access_group_erp_manager","model_ir_model_access","group_erp_manager",1,1,1,1
 "access_ir_model_grid_group_erp_manager","ir_model_access_grid_group_erp_manager","model_ir_model_grid","group_erp_manager",1,1,1,1
@@ -25,7 +25,7 @@
 "access_ir_report_custom_fields_group_system","ir_report_custom_fields group_system","model_ir_report_custom_fields",,1,0,0,0
 "access_ir_rule_group_user","ir_rule group_user","model_ir_rule",,1,0,0,0
 "access_ir_rule_group_erp_manager","ir_rule group_erp_manager","model_ir_rule","group_erp_manager",1,1,1,1
-"access_ir_sequence_group_user","ir_sequence group_user","model_ir_sequence",,1,1,1,1
+"access_ir_sequence_group_user","ir_sequence group_user","model_ir_sequence",,1,0,0,0
 "access_ir_sequence_type_group_user","ir_sequence_type group_user","model_ir_sequence_type",,1,0,0,0
 "access_ir_translation_all","ir_translation all","model_ir_translation",,1,0,0,0
 "access_ir_translation_group_system","ir_translation group_system","model_ir_translation","group_system",1,1,1,1
@@ -71,21 +71,23 @@
 "access_res_partner_canal_group_partner_manager","res_partner_canal group_partner_manager","model_res_partner_canal","group_partner_manager",1,1,1,1
 "access_res_partner_category_group_user","res_partner_category group_user","model_res_partner_category","group_user",1,0,0,0
 "access_res_partner_category_group_partner_manager","res_partner_category group_partner_manager","model_res_partner_category","group_partner_manager",1,1,1,1
-"access_res_partner_event_group_user","res_partner_event group_user","model_res_partner_event","group_user",1,1,1,1
+"access_res_partner_event_group_user","res_partner_event group_user","model_res_partner_event","group_user",1,0,0,0
 "access_res_partner_event_group_partner_manager","res_partner_event group_partner_manager","model_res_partner_event","group_partner_manager",1,1,1,1
 "access_res_partner_som_group_user","res_partner_som group_user","model_res_partner_som","group_partner_manager",1,1,1,1
 "access_res_partner_som_group_partner_manager","res_partner_som group_partner_manager","model_res_partner_som","group_user",1,0,0,0
 "access_res_partner_title_group_user","res_partner_title group_user","model_res_partner_title","group_partner_manager",1,1,1,1
 "access_res_partner_title_group_partner_manager","res_partner_title group_partner_manager","model_res_partner_title",,1,0,0,0
-"access_res_request_group_user","res_request group_user","model_res_request",,1,1,1,1
-"access_res_request_history_group_user","res_request_history group_user","model_res_request_history",,1,1,1,1
+"access_res_request_group_user","res_request group_user","model_res_request",base.group_user,1,1,1,1
+"access_res_request_history_group_user","res_request_history group_user","model_res_request_history",base.group_user,1,1,1,1
+"access_res_request_group_user_all","res_request group_user all","model_res_request",,1,0,0,0
+"access_res_request_history_group_user_all","res_request_history group_user all","model_res_request_history",,1,0,0,0
 "access_res_request_link_group_system","res_request_link group_system","model_res_request_link","group_system",1,1,1,1
 "access_res_request_link_group_user","res_request_link group_user","model_res_request_link",,1,0,0,0
 "access_res_users_all","res_users all","model_res_users",,1,0,0,0
 "access_res_users_group_erp_manager","res_users group_erp_manager","model_res_users","group_erp_manager",1,1,1,1
 "access_ir_actions_all","ir_actions_all","model_ir_actions_actions",,1,0,0,0
 "access_ir_actions_group_system","ir_actions_group_system","model_ir_actions_actions","group_system",1,1,1,1
-"access_ir_actions_act_window_all","ir_actions_act_window_all","model_ir_actions_act_window",,1,0,1,0
+"access_ir_actions_act_window_all","ir_actions_act_window_all","model_ir_actions_act_window",,1,0,0,0
 "access_ir_actions_act_window_system","ir_actions_act_window_system","model_ir_actions_act_window","group_system",1,1,1,1
 "access_ir_actions_act_window_close_all","ir_actions_act_window_close_all","model_ir_actions_act_window_close",,1,0,0,0
 "access_ir_actions_act_window_close_group_system","ir_actions_act_window_close_group_system","model_ir_actions_act_window_close","group_system",1,1,1,1
@@ -124,11 +126,11 @@
 "access_res_config_view_all","res_config_view_all","model_res_config_view",,1,0,0,0
 "access_res_bank_group_partner_manager","res_bank_group_partner_manager","model_res_bank","group_partner_manager",1,1,1,1
 "access_res_bank_user","res_bank user","model_res_bank","group_user",1,0,0,0
-"access_maintenance_group_user","maintenance_contract group_user","model_maintenance_contract","group_maintenance_manager",1,1,1,1
-"access_maintenance_contract_module","maintenance.contract.module","model_maintenance_contract_module","group_maintenance_manager",1,1,1,1
-"access_maintenance_contract_wizard","maintenance.contract.wizard","model_maintenance_contract_wizard","group_maintenance_manager",1,1,1,1
+"access_maintenance_group_user","maintenance_contract group_user","model_maintenance_contract","group_system",1,1,1,1
+"access_maintenance_contract_module","maintenance.contract.module","model_maintenance_contract_module","group_system",1,1,1,1
+"access_maintenance_contract_wizard","maintenance.contract.wizard","model_maintenance_contract_wizard","group_system",1,1,1,1
 "access_multi_company_default user","multi_company_default all","model_multi_company_default",,1,0,0,0
 "access_multi_company_default manager","multi_company_default Manager","model_multi_company_default","group_erp_manager",1,1,1,1
 "access_ir_filter all","ir_filters all","model_ir_filters",,1,0,0,0
 "access_ir_filter employee","ir_filters employee","model_ir_filters","group_user",1,1,1,1
-"access_res_log all","res_log all","model_res_log",,1,1,1,1
+"access_res_log all","res_log all","model_res_log",,1,0,1,1