diff --git a/bin/addons/base/base_security.xml b/bin/addons/base/base_security.xml
index e4c9a121c2e..aa0e1688b21 100644
--- a/bin/addons/base/base_security.xml
+++ b/bin/addons/base/base_security.xml
@@ -5,6 +5,10 @@
+
+ System
+
+
ERP Manager
@@ -20,6 +24,10 @@
Request
+
+
+ Cron Jobs
+
Extended View
@@ -261,6 +269,7 @@
+
ir.actions.actions Employee
@@ -281,6 +290,96 @@
+
+
+ ir.actions.act_window_close System
+
+
+
+
+
+
+
+
+
+ ir.actions.act_window_close System
+
+
+
+
+
+
+
+
+
+ ir.actions.act_window_close System
+
+
+
+
+
+
+
+
+
+ workflow group_system
+
+
+
+
+
+
+
+
+
+ workflow_activity group_system
+
+
+
+
+
+
+
+
+
+ workflow_instance group_system
+
+
+
+
+
+
+
+
+
+ workflow_transition group_system
+
+
+
+
+
+
+
+
+
+ workflow_triggers group_system
+
+
+
+
+
+
+
+
+
+ workflow_workitem group_system
+
+
+
+
+
+
+
@@ -292,7 +391,6 @@
-
ir_act_window_view group_employee
@@ -302,7 +400,78 @@
-
+
+ ir_attachment group_system
+
+
+
+
+
+
+
+
+ ir_cron group_cron
+
+
+
+
+
+
+
+
+ ir_default group_system
+
+
+
+
+
+
+
+
+ ir_exports group_system
+
+
+
+
+
+
+
+
+ ir_exports_line group_system
+
+
+
+
+
+
+
+
+ ir_model group_system
+
+
+
+
+
+
+
+
+ ir_model_access group_system
+
+
+
+
+
+
+
+
+ ir_model_config group_system
+
+
+
+
+
+
+
ir_model_data group_employee
@@ -312,7 +481,6 @@
-
ir_model_fields group_employee
@@ -322,7 +490,6 @@
-
ir_module_category group_employee
@@ -332,7 +499,6 @@
-
ir_module_module group_employee
@@ -342,7 +508,42 @@
-
+
+ ir_module_module_configuration_step group_system
+
+
+
+
+
+
+
+
+ ir_module_module_configuration_wizard group_system
+
+
+
+
+
+
+
+
+ ir_module_module_dependency group_system
+
+
+
+
+
+
+
+
+ ir_module_repository group_system
+
+
+
+
+
+
+
ir_property group_employee
@@ -352,7 +553,24 @@
-
+
+ ir_report_custom group_system
+
+
+
+
+
+
+
+
+ ir_report_custom_fields group_system
+
+
+
+
+
+
+
ir_rule group_employee
@@ -362,7 +580,6 @@
-
ir_rule_group group_employee
@@ -372,7 +589,33 @@
-
+
+ ir_sequence group_employee
+
+
+
+
+
+
+
+
+ ir_sequence_type group_employee
+
+
+
+
+
+
+
+
+ ir_translation group_system
+
+
+
+
+
+
+
-
ir_ui_view group_employee
@@ -392,7 +634,6 @@
-
ir_ui_view_sc group_employee
@@ -402,17 +643,6 @@
-
-
- ir_values group_employee
-
-
-
-
-
-
-
-
ir_values group_erp_manager
@@ -422,6 +652,42 @@
+
+ ir_values group_employee
+
+
+
+
+
+
+
+
+
+
+ wizard_module_lang_export group_system
+
+
+
+
+
+
+
diff --git a/bin/addons/base/ir/ir_model.py b/bin/addons/base/ir/ir_model.py
index 0bce4333abe..3b33745321c 100644
--- a/bin/addons/base/ir/ir_model.py
+++ b/bin/addons/base/ir/ir_model.py
@@ -33,8 +33,6 @@ import ir, re
import netsvc
from osv.orm import except_orm
-from pprint import pprint
-
import time
import tools
import pooler
@@ -165,7 +163,6 @@ class ir_model(osv.osv):
for k in req:
sql += '%s=%s,'%(k,req[k])
cr.execute("update ir_model_access set %s where id=%i"%(sql[:-1], rules[rule_len]))
- print "update ir_model_access set %s where id=%i"%(sql[:-1], rules[rule_len])
else:
model_name = self.pool.get('ir.model').browse(cr, user, [model_id])[0].name
group_name = self.pool.get('res.groups').browse(cr, user, [group_id])[0].name
@@ -184,7 +181,7 @@ class ir_model(osv.osv):
groups = self.pool.get('res.groups').search(cr, user, [])
groups_br = self.pool.get('res.groups').browse(cr, user, groups)
for group in groups_br:
- result['group_%i'%group.id] = {'string': 'Group %s'%group.name,'type': 'char','size': 7}
+ result['group_%i'%group.id] = {'string': '%s'%group.name,'type': 'char','size': 7}
return result
def fields_view_get(self, cr, uid, view_id=None, view_type='form', context={}, toolbar=False):
@@ -317,8 +314,6 @@ class ir_model_access(osv.osv):
'where m.model=%s and gu.uid=%s', (model_name, uid,))
r = cr.fetchall()
- print '%s in %s = %s by %i'%(mode, model_name, str(r[0][0]), uid) # FIXME: REMOVE PLEASE
-
if not r[0][0]:
if raise_exception:
msgs = {
diff --git a/bin/addons/base/res/res_security.xml b/bin/addons/base/res/res_security.xml
index 639e24e69dc..cc3b5680d1a 100644
--- a/bin/addons/base/res/res_security.xml
+++ b/bin/addons/base/res/res_security.xml
@@ -1,14 +1,4 @@
-
-
-
-
-
-
-
+
Account Manager
@@ -18,175 +8,125 @@
-
+
base
-
-
+
base
-
-
+
base
-
-
+
base
-
-
+
base
-
-
+
base
-
-
+
base
-
-
+
base
-
-
+
base
-
-
+
base
-
-
+
base
-
-
+
base
-
-
+
base
-
-
+
base
-
-
+
base
-
-
+
base
-
-
+
base
-
-
+
base
-
-
+
base
-
-
+
base
-
-
+
base
-
-
+
base
-
-
+
base
-
-
- base
-
-
-
- base
-
-
-
- base
-
-
-
- res_company group_employee
+
+ res_company base.group_erp_manager
-
-
-
-
-
-
-
-
- res_company group_erp_manager
-
-
+
-
-
- res_country group_employee
+
+ res_company base.group_employee
+
+
+
+
+
+
+
+
+ res_country base.group_employee
-
+
-
-
- res_country_state group_employee
+
+ res_country_state base.group_employee
-
+
-
-
- res_currency group_employee
+
+ res_currency base.group_employee
-
+
-
-
- res_currency_rate group_employee
-
-
-
-
-
-
-
-
res_currency_rate group_account_manager
@@ -196,157 +136,267 @@
-
-
- res_groups group_employee
-
-
+
+ res_currency_rate base.group_employee
+
+
-
-
- res_groups group_erp_manager
+
+ res_groups base.group_erp_manager
-
+
-
-
- res_lang group_employee
+
+ res_groups base.group_employee
+
+
+
+
+
+
+
+
+ res_lang base.group_employee
-
+
-
-
- res_partner group_employee
+
+ res_partner group_partner_manager
-
+
+
+
+
+
+
+
+ res_partner base.group_employee
+
+
-
+
-
-
- res_partner_address group_employee
+
+ res_partner_address group_partner_manager
-
+
+
+
+
+
+
+
+ res_partner_address base.group_employee
+
+
-
+
-
-
- res_partner_bank group_employee
+
+ res_partner_bank base.group_employee
-
+
+
+
+
+ res_partner_bank group_partner_manager
+
+
+
+
+
-
-
- res_partner_bank_type group_employee
+
+ res_partner_bank_type group_partner_manager
-
+
+
+
+
+
+
+
+ res_partner_bank_type base.group_employee
+
+
-
+
-
-
- res_partner_bank_type_field group_employee
+
+ res_partner_bank_type_field group_partner_manager
-
+
+
+
+
+
+
+
+ res_partner_bank_type_field base.group_employee
+
+
-
+
-
-
- res_partner_canal group_employee
+
+ res_partner_canal base.group_employee
-
+
+
+
+
+ res_partner_canal group_partner_manager
+
+
+
+
+
-
-
- res_partner_category group_employee
+
+ res_partner_category base.group_employee
-
+
+
+
+
+ res_partner_category group_partner_manager
+
+
+
+
+
-
-
- res_partner_event group_employee
+
+ res_partner_event group_partner_manager
-
+
+
+
+
+
+
+
+ res_partner_event base.group_employee
+
+
-
+
-
-
- res_partner_event_type group_employee
+
+ res_partner_event_type group_partner_manager
-
+
+
+
+
+
+
+
+ res_partner_event_type base.group_employee
+
+
-
+
-
-
- res_partner_function group_employee
+
+ res_partner_function base.group_employee
-
+
+
+
+
+ res_partner_function group_partner_manager
+
+
+
+
+
-
-
- res_partner_som group_employee
+
+ res_partner_som base.group_employee
-
+
+
+
+
+ res_partner_som group_partner_manager
+
+
+
+
+
-
-
- res_partner_title group_employee
+
+ res_partner_title base.group_employee
-
+
+
+
+
+ res_partner_title group_partner_manager
+
+
+
+
+
-
+
+ res_request base.group_employee
+
+
+
+
+
+
+
res_request group_request
@@ -356,56 +406,40 @@
-
-
- res_request group_employee
-
-
-
-
-
-
-
-
-
- res_request_history group_employee
+
+ res_request_history base.group_employee
-
+
-
-
- res_request_link group_employee
+
+ res_request_link base.group_employee
-
+
-
-
- res_users group_employee
+
+ res_users base.group_employee
-
+
-
-
- res_users group_erp_manager
+
+ res_users base.group_erp_manager
-
+
-
-
-
+
\ No newline at end of file