summaryrefslogtreecommitdiff
path: root/addons/import_google
diff options
context:
space:
mode:
authorHarry (OpenERP) <hmo@tinyerp.com>2011-12-14 17:59:24 +0530
committerHarry (OpenERP) <hmo@tinyerp.com>2011-12-14 17:59:24 +0530
commit092f97b32b35af6a40b9d2ae70c3159da2fb235f (patch)
tree2974d3719af9338cd0b1814da900d7e9ca8d4779 /addons/import_google
parent593f5f571bbc49673975afc405e9345ef3457b92 (diff)
parente36dc8c5e3ca3da1474747bae5ec87fea19b23b8 (diff)
[MERGE] merged with trunk-development-branch
bzr revid: hmo@tinyerp.com-20111214122924-izzibrz1yz67rt7g
Diffstat (limited to 'addons/import_google')
-rw-r--r--addons/import_google/__openerp__.py1
-rw-r--r--addons/import_google/security/ir.model.access.csv9
2 files changed, 4 insertions, 6 deletions
diff --git a/addons/import_google/__openerp__.py b/addons/import_google/__openerp__.py
index a0a15756ec3..fe469c94504 100644
--- a/addons/import_google/__openerp__.py
+++ b/addons/import_google/__openerp__.py
@@ -42,6 +42,5 @@
],
'installable': True,
'active': False,
- 'certificate': '',
}
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/import_google/security/ir.model.access.csv b/addons/import_google/security/ir.model.access.csv
index 50b689efa69..cb0a8946d46 100644
--- a/addons/import_google/security/ir.model.access.csv
+++ b/addons/import_google/security/ir.model.access.csv
@@ -1,5 +1,4 @@
-"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
-"access_res_users_partner_manager","google.res.partner.manager","base.model_ir_model_data","base.group_partner_manager",1,1,1,0
-"access_ir_model_data_partner_manager","ir.model.data.partner.manager","base.model_res_users","base.group_partner_manager",1,1,0,0
-"access_google_import_message_partner_manager","google.import.message.partner.manager","model_google_import_message","base.group_partner_manager",1,1,0,0
-
+id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
+access_res_users_partner_manager,google.res.partner.manager,base.model_ir_model_data,base.group_partner_manager,1,1,1,0
+access_ir_model_data_partner_manager,ir.model.data.partner.manager,base.model_res_users,base.group_partner_manager,1,1,0,0
+access_google_import_message_partner_manager,google.import.message.partner.manager,model_google_import_message,base.group_partner_manager,1,1,0,0