[MERGE]: merge with lp:~openerp-dev/openobject-addons/trunk-dev-addons2

bzr revid: atp@tinyerp.co.in-20100519054514-uu6bgnb4hez2gs94

addons/base_calendar/security/ir.model.access.csv

@@ -6,3 +6,4 @@
 "access_calendar_todo","calendar.todo","model_calendar_todo",,1,1,1,1
 "access_base_calendar_invite_attendee","base_calendar.invite.attendee","model_base_calendar_invite_attendee",,1,1,1,1
 "access_calendar_event_edit_all","calendar_event_edit_all","model_calendar_event_edit_all",,1,1,1,1
+"access_base_calendar_set_exrule","base.calendar.set.exrule","model_base_calendar_set_exrule",,1,1,1,1

addons/caldav/security/ir.model.access.csv

@@ -10,3 +10,4 @@
 "access_calendar_event_export","calendar.event.export","model_calendar_event_export","base.group_user",1,1,1,1
 "access_calendar_event_import","calendar.event.import","model_calendar_event_import","base.group_user",1,1,1,1
 "access_calendar_event_subscribe","calendar.event.subscribe","model_calendar_event_subscribe","base.group_user",1,1,1,1
+"access_basic_calendar","basic.calendar","model_basic_calendar","base.group_user",1,1,1,1

addons/crm/security/ir.model.access.csv

@@ -30,3 +30,4 @@
 "access_crm_lead2opportunity_partner","crm.lead2opportunity.partner","model_crm_lead2opportunity_partner","crm.group_crm_user",1,1,1,1
 "access_crm_installer","crm.installer.rule","model_crm_installer","crm.group_crm_user",1,1,1,1
 "access_crm_lead_forward_to_partner","crm.lead.forward.to.partner","model_crm_lead_forward_to_partner","crm.group_crm_user",2,2,2,2
+"access_mailgate_thread","mailgate.thread","model_mailgate_thread","crm.group_crm_user",1,1,1,1

addons/document_ics/__openerp__.py

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 ##############################################################################
-#    
+#
 #    OpenERP, Open Source Management Solution
 #    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
 #
@@ -15,7 +15,7 @@
 #    GNU Affero General Public License for more details.
 #
 #    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
 

addons/idea/security/ir.model.access.csv

@@ -5,3 +5,4 @@
 "access_idea_vote_stat","idea.vote.stat","model_idea_vote_stat","base.group_user",1,0,0,0
 "access_idea_category_system","idea.category system","model_idea_category","base.group_system",1,1,1,1
 "idea_post_vote","idea.post.vote","model_idea_post_vote","base.group_user",1,1,1,1
+"access_idea_select","idea.select","model_idea_select","base.group_user",1,1,1,1

addons/mail_gateway/__openerp__.py

@@ -27,7 +27,7 @@
     * IMAP / IMAP with SSL
     * POP / POP with SSL
     * SMTP / SMTP with TLS
-    * ACL basd access polocy 
+    * ACL basd access polocy
     * Queing and History for Emails
     * Easy Integration with any Module""",
     'author': 'Tiny',
@@ -35,7 +35,8 @@
     'depends': ['smtpclient'],
     'init_xml': [],
     'update_xml': [
-        "mail_gateway_view.xml"
+        "mail_gateway_view.xml",
+        'security/ir.model.access.csv'
     ],
     'demo_xml': [],
     'installable': True,

addons/mail_gateway/security/ir.model.access.csv

@@ -0,0 +1,3 @@
+"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
+"mail_gateway_mailgate_message","mail_gateway.mailgate.message","model_mailgate_message","base.group_user",1,1,1,1
+"mail_gateway_mailgate_thread","mail_gateway.mailgate.thread","model_mailgate_thread","base.group_user",1,1,1,1

addons/resource/resource.py

@@ -161,7 +161,7 @@ class resource_resource(osv.osv):
         'resource_type' : lambda *a: 'user',
         'time_efficiency' : lambda *a: 1,
         'active' : lambda *a: True,
-        'company_id': lambda self,cr,uid,c: self.pool.get('res.company')._company_default_get(cr, uid, 'resource.resource', c)
+        'company_id': lambda self,cr,uid,c: self.pool.get('res.company')._company_default_get(cr, uid, 'resource.resource', context=c)
     }
 
     def search(self, cr, uid, args, offset=0, limit=None, order=None, context=None, count=False):

addons/smtpclient/security/ir.model.access.csv

@@ -9,3 +9,4 @@
 "access_res_company_address_erpmanager","res.company.address","model_res_company_address","base.group_erp_manager",1,1,1,1
 "access_email_smtpclient_queue","Smtpclient_queue all","model_email_smtpclient_queue",,1,1,1,0
 "access_email_smtpclient_queue_erpmanager","Smtpclient_queue erp_manager","model_email_smtpclient_queue","base.group_erp_manager",1,1,1,1
+"access_email_headers","email.headers","model_email_headers","base.group_erp_manager",1,1,1,1

addons/thunderbird/security/ir.model.access.csv

@@ -1,3 +1,3 @@
 "id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
 "access_tinythunderbird_partner","tinythunderbird.partner","model_tinythunderbird_partner",,1,1,1,1
-
+"access_thunderbird_installer","thunderbird.installer","model_thunderbird_installer","base.group_user",1,1,1,1