odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

[MERGE] 

bzr revid: hmo@tinyerp.com-20110405064349-18en29p2t28kwf62
This commit is contained in:
Harry (OpenERP) 2011-04-05 12:13:49 +05:30
parent 1cf2e0e884 63de8740bc
commit 501ff3e51a
6 changed files with 55 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
addons/hr_recruitment/security/ir.model.access.csv
View File

@ -1,11 +1,11 @@
"id";"name";"model_id:id";"group_id:id";"perm_read";"perm_write";"perm_create";"perm_unlink"
"access_hr_applicant_user";"hr.applicant.user";"model_hr_applicant";"base.group_hr_user";1;1;1;1
"access_hr_recruitment_report";"hr.recruitment.report";"model_hr_recruitment_report";"base.group_hr_manager";1;1;1;1
"access_hr_recruitment_stage_user";"hr.recruitment.stage.user";"model_hr_recruitment_stage";"base.group_hr_user";1;1;1;1
"access_hr_recruitment_degree";"hr.recruitment.degree";"model_hr_recruitment_degree";"base.group_hr_user";1;1;1;1
"access_email_message_user";"email.message.user";"mail.model_email_message";"base.group_hr_user";1;1;1;1
"access_res_partner_hr_user";"res.partner.user";"base.model_res_partner";"base.group_hr_user";1;1;1;1
"access_res_partner_address_hr_user";"res.partner.address.user";"base.model_res_partner_address";"base.group_hr_user";1;1;1;1
"access_survey_hr_user";"survey.hr.user";"survey.model_survey";"base.group_hr_user";1;1;1;0
"access_crm_phonecall_hruser";"crm.phonecall hruser";"crm.model_crm_phonecall";"base.group_hr_user";1;1;1;1
"access_crm_meeting_hruser";"crm.meeting.hruser";"crm.model_crm_meeting";"base.group_hr_user";1;1;1;1
"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
"access_hr_applicant_user","hr.applicant.user","model_hr_applicant","base.group_hr_user",1,1,1,1
"access_hr_recruitment_report","hr.recruitment.report","model_hr_recruitment_report","base.group_hr_manager",1,1,1,1
"access_hr_recruitment_stage_user","hr.recruitment.stage.user","model_hr_recruitment_stage","base.group_hr_user",1,1,1,1
"access_hr_recruitment_degree","hr.recruitment.degree","model_hr_recruitment_degree","base.group_hr_user",1,1,1,1
"access_email_message_user","email.message.user","mail.model_email_message","base.group_hr_user",1,1,1,1
"access_res_partner_hr_user","res.partner.user","base.model_res_partner","base.group_hr_user",1,1,1,1
"access_res_partner_address_hr_user","res.partner.address.user","base.model_res_partner_address","base.group_hr_user",1,1,1,1
"access_survey_hr_user","survey.hr.user","survey.model_survey","base.group_hr_user",1,1,1,0
"access_crm_phonecall_hruser","crm.phonecall hruser","crm.model_crm_phonecall","base.group_hr_user",1,1,1,1
"access_crm_meeting_hruser","crm.meeting.hruser","crm.model_crm_meeting","base.group_hr_user",1,1,1,1

1 id name model_id:id group_id:id perm_read perm_write perm_create perm_unlink
2 access_hr_applicant_user hr.applicant.user model_hr_applicant base.group_hr_user 1 1 1 1
3 access_hr_recruitment_report hr.recruitment.report model_hr_recruitment_report base.group_hr_manager 1 1 1 1
4 access_hr_recruitment_stage_user hr.recruitment.stage.user model_hr_recruitment_stage base.group_hr_user 1 1 1 1
5 access_hr_recruitment_degree hr.recruitment.degree model_hr_recruitment_degree base.group_hr_user 1 1 1 1
6 access_email_message_user email.message.user mail.model_email_message base.group_hr_user 1 1 1 1
7 access_res_partner_hr_user res.partner.user base.model_res_partner base.group_hr_user 1 1 1 1
8 access_res_partner_address_hr_user res.partner.address.user base.model_res_partner_address base.group_hr_user 1 1 1 1
9 access_survey_hr_user survey.hr.user survey.model_survey base.group_hr_user 1 1 1 0
10 access_crm_phonecall_hruser crm.phonecall hruser crm.model_crm_phonecall base.group_hr_user 1 1 1 1
11 access_crm_meeting_hruser crm.meeting.hruser crm.model_crm_meeting base.group_hr_user 1 1 1 1

12
addons/mail/email_thread.py
View File

@ -63,7 +63,7 @@ class email_thread(osv.osv):
'date_closed': False,
'date_open': False
})
return super(mailgate_thread, self).copy(cr, uid, id, default, context=context)
return super(email_thread, self).copy(cr, uid, id, default, context=context)
def message_new(self, cr, uid, msg, context):
raise Exception, _('Method is not implemented')
@ -185,6 +185,7 @@ class email_thread(osv.osv):
@param email_error: Default Email address in case of any Problem
"""
model_pool = self.pool.get(model)
smtp_server_obj = self.pool.get('ir.mail_server')
for res in model_pool.browse(cr, uid, res_ids, context=context):
thread_followers = model_pool.thread_followers(cr, uid, [res.id])[res.id]
@ -202,12 +203,15 @@ class email_thread(osv.osv):
msg['reply-to'] = res.section_id.reply_to
smtp_from = self.to_email(msg['from'])
if not tools.misc._email_send(smtp_from, message_forward, msg, openobject_id=res.id) and email_error:
msg['from'] = smtp_from
msg['to'] = message_forward
msg['Message-Id'] = tools.generate_tracking_message_id(res.id)
if not smtp_server_obj.send_email(cr, uid, msg) and email_error:
subj = msg['subject']
del msg['subject'], msg['to'], msg['cc'], msg['bcc']
msg['subject'] = '[OpenERP-Forward-Failed] %s' % subj
msg['to'] = email_error
tools.misc._email_send(smtp_from, self.to_email(email_error), msg, openobject_id=res.id)
msg['To'] = email_error
smtp_server_obj.send_email(cr, uid, msg)
def process_email(self, cr, uid, model, message, custom_values=None, attach=True, context=None):
"""This function Processes email and create record for given OpenERP model

42
addons/marketing_campaign/security/ir.model.access.csv
View File

@ -1,21 +1,21 @@
"id";"name";"model_id:id";"group_id:id";"perm_read";"perm_write";"perm_create";"perm_unlink"
"access_marketing_campaign_admin";"marketing.campaign";"model_marketing_campaign";"marketing.group_marketing_user";1;1;0;0
"access_marketing_campaign_segment_campaignadmin";"marketing.campaign.segment";"model_marketing_campaign_segment";"marketing.group_marketing_user";1;1;0;0
"access_marketing_campaign_activity_campaignadmin";"marketing.campaign.activity";"model_marketing_campaign_activity";"marketing.group_marketing_user";1;1;0;0
"access_marketing_campaign_workitem_campaignadmin";"marketing.campaign.workitem";"model_marketing_campaign_workitem";"marketing.group_marketing_user";1;1;0;0
"access_marketing_campaign_transition_campaignadmin";"marketing.campaign.transition";"model_marketing_campaign_transition";"marketing.group_marketing_user";1;1;0;0
"access_marketing_campaign_analysis_campaignadmin";"campaign.analysis";"model_campaign_analysis";"marketing.group_marketing_user";1;1;0;0
"access_marketing_campaign_workitem_all";"marketing.campaign.workitem";"model_marketing_campaign_workitem";"base.group_user";1;0;0;0
"access_email_template_user";"email.template";"model_email_template";"marketing.group_marketing_user";1;1;0;0
"access_email_template_account_user";"ir.mail_server";"base.model_ir_mail_server";"marketing.group_marketing_user";1;1;0;0
"access_marketing_campaign_system";"marketing.campaign system";"model_marketing_campaign";"base.group_system";1;0;0;0
"access_marketing_campaign_segment_system";"marketing.campaign.segment system";"model_marketing_campaign_segment";"base.group_system";1;0;0;0
"access_marketing_campaign_workitem_system";"marketing.campaign.workitem system";"model_marketing_campaign_workitem";"base.group_system";1;0;0;0
"access_marketing_campaign_manager";"marketing.campaign";"model_marketing_campaign";"marketing.group_marketing_manager";1;1;1;1
"access_marketing_campaign_segment_campaign_manager";"marketing.campaign.segment";"model_marketing_campaign_segment";"marketing.group_marketing_manager";1;1;1;1
"access_marketing_campaign_activity_campaign_manager";"marketing.campaign.activity";"model_marketing_campaign_activity";"marketing.group_marketing_manager";1;1;1;1
"access_marketing_campaign_workitem_campaign_manager";"marketing.campaign.workitem";"model_marketing_campaign_workitem";"marketing.group_marketing_manager";1;1;1;1
"access_marketing_campaign_transition_campaign_manager";"marketing.campaign.transition";"model_marketing_campaign_transition";"marketing.group_marketing_manager";1;1;1;1
"access_marketing_campaign_analysis_campaign_manager";"campaign.analysis";"model_campaign_analysis";"marketing.group_marketing_manager";1;1;1;1
"access_email_template_manager";"email.template";"model_email_template";"marketing.group_marketing_manager";1;1;1;1
"access_email_template_account_manager";"ir.mail_server";"base.model_ir_mail_server";"marketing.group_marketing_manager";1;1;1;1
"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
"access_marketing_campaign_admin","marketing.campaign","model_marketing_campaign","marketing.group_marketing_user",1,1,0,0
"access_marketing_campaign_segment_campaignadmin","marketing.campaign.segment","model_marketing_campaign_segment","marketing.group_marketing_user",1,1,0,0
"access_marketing_campaign_activity_campaignadmin","marketing.campaign.activity","model_marketing_campaign_activity","marketing.group_marketing_user",1,1,0,0
"access_marketing_campaign_workitem_campaignadmin","marketing.campaign.workitem","model_marketing_campaign_workitem","marketing.group_marketing_user",1,1,0,0
"access_marketing_campaign_transition_campaignadmin","marketing.campaign.transition","model_marketing_campaign_transition","marketing.group_marketing_user",1,1,0,0
"access_marketing_campaign_analysis_campaignadmin","campaign.analysis","model_campaign_analysis","marketing.group_marketing_user",1,1,0,0
"access_marketing_campaign_workitem_all","marketing.campaign.workitem","model_marketing_campaign_workitem","base.group_user",1,0,0,0
"access_email_template_user","email.template","model_email_template","marketing.group_marketing_user",1,1,0,0
"access_email_template_account_user","ir.mail_server","base.model_ir_mail_server","marketing.group_marketing_user",1,1,0,0
"access_marketing_campaign_system","marketing.campaign system","model_marketing_campaign","base.group_system",1,0,0,0
"access_marketing_campaign_segment_system","marketing.campaign.segment system","model_marketing_campaign_segment","base.group_system",1,0,0,0
"access_marketing_campaign_workitem_system","marketing.campaign.workitem system","model_marketing_campaign_workitem","base.group_system",1,0,0,0
"access_marketing_campaign_manager","marketing.campaign","model_marketing_campaign","marketing.group_marketing_manager",1,1,1,1
"access_marketing_campaign_segment_campaign_manager","marketing.campaign.segment","model_marketing_campaign_segment","marketing.group_marketing_manager",1,1,1,1
"access_marketing_campaign_activity_campaign_manager","marketing.campaign.activity","model_marketing_campaign_activity","marketing.group_marketing_manager",1,1,1,1
"access_marketing_campaign_workitem_campaign_manager","marketing.campaign.workitem","model_marketing_campaign_workitem","marketing.group_marketing_manager",1,1,1,1
"access_marketing_campaign_transition_campaign_manager","marketing.campaign.transition","model_marketing_campaign_transition","marketing.group_marketing_manager",1,1,1,1
"access_marketing_campaign_analysis_campaign_manager","campaign.analysis","model_campaign_analysis","marketing.group_marketing_manager",1,1,1,1
"access_email_template_manager","email.template","model_email_template","marketing.group_marketing_manager",1,1,1,1
"access_email_template_account_manager","ir.mail_server","base.model_ir_mail_server","marketing.group_marketing_manager",1,1,1,1

1 id name model_id:id group_id:id perm_read perm_write perm_create perm_unlink
2 access_marketing_campaign_admin marketing.campaign model_marketing_campaign marketing.group_marketing_user 1 1 0 0
3 access_marketing_campaign_segment_campaignadmin marketing.campaign.segment model_marketing_campaign_segment marketing.group_marketing_user 1 1 0 0
4 access_marketing_campaign_activity_campaignadmin marketing.campaign.activity model_marketing_campaign_activity marketing.group_marketing_user 1 1 0 0
5 access_marketing_campaign_workitem_campaignadmin marketing.campaign.workitem model_marketing_campaign_workitem marketing.group_marketing_user 1 1 0 0
6 access_marketing_campaign_transition_campaignadmin marketing.campaign.transition model_marketing_campaign_transition marketing.group_marketing_user 1 1 0 0
7 access_marketing_campaign_analysis_campaignadmin campaign.analysis model_campaign_analysis marketing.group_marketing_user 1 1 0 0
8 access_marketing_campaign_workitem_all marketing.campaign.workitem model_marketing_campaign_workitem base.group_user 1 0 0 0
9 access_email_template_user email.template model_email_template marketing.group_marketing_user 1 1 0 0
10 access_email_template_account_user ir.mail_server base.model_ir_mail_server marketing.group_marketing_user 1 1 0 0
11 access_marketing_campaign_system marketing.campaign system model_marketing_campaign base.group_system 1 0 0 0
12 access_marketing_campaign_segment_system marketing.campaign.segment system model_marketing_campaign_segment base.group_system 1 0 0 0
13 access_marketing_campaign_workitem_system marketing.campaign.workitem system model_marketing_campaign_workitem base.group_system 1 0 0 0
14 access_marketing_campaign_manager marketing.campaign model_marketing_campaign marketing.group_marketing_manager 1 1 1 1
15 access_marketing_campaign_segment_campaign_manager marketing.campaign.segment model_marketing_campaign_segment marketing.group_marketing_manager 1 1 1 1
16 access_marketing_campaign_activity_campaign_manager marketing.campaign.activity model_marketing_campaign_activity marketing.group_marketing_manager 1 1 1 1
17 access_marketing_campaign_workitem_campaign_manager marketing.campaign.workitem model_marketing_campaign_workitem marketing.group_marketing_manager 1 1 1 1
18 access_marketing_campaign_transition_campaign_manager marketing.campaign.transition model_marketing_campaign_transition marketing.group_marketing_manager 1 1 1 1
19 access_marketing_campaign_analysis_campaign_manager campaign.analysis model_campaign_analysis marketing.group_marketing_manager 1 1 1 1
20 access_email_template_manager email.template model_email_template marketing.group_marketing_manager 1 1 1 1
21 access_email_template_account_manager ir.mail_server base.model_ir_mail_server marketing.group_marketing_manager 1 1 1 1

22
addons/project_issue/security/ir.model.access.csv
View File

@ -1,11 +1,11 @@
"id";"name";"model_id:id";"group_id:id";"perm_read";"perm_write";"perm_create";"perm_unlink"
"access_project_issue_all";"project.issue";"model_project_issue";"project.group_project_manager";1;1;1;1
"access_project_issue_user";"project.issue";"model_project_issue";"project.group_project_user";1;1;1;1
"access_project_issue_report_all";"project.issue.report";"model_project_issue_report";"project.group_project_manager";1;1;1;1
"access_crm_case_categ_id";"crm.case.categ";"crm.model_crm_case_categ";"project.group_project_manager";1;1;1;1
"access_project_issue_version_project";"project_issue_version manager";"model_project_issue_version";"project.group_project_manager";1;1;1;1
"access_project_issue_version_project_user";"project_issue_version user";"model_project_issue_version";"project.group_project_user";1;0;0;0
"access_email_message_project_manager";"email.message.manager";"mail.model_email_message";"project.group_project_manager";1;1;1;1
"access_resource_calendar_project_manager";"resource.calendar.project.manager";"resource.model_resource_calendar";"project.group_project_manager";1;1;1;1
"access_project_issue_report_user";"project.issue.report user";"model_project_issue_report";"project.group_project_user";1;0;0;0
"access_email_message_issue_project_user";"email.message..user";"mail.model_email_message";"project.group_project_user";1;1;1;0
"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
"access_project_issue_all","project.issue","model_project_issue","project.group_project_manager",1,1,1,1
"access_project_issue_user","project.issue","model_project_issue","project.group_project_user",1,1,1,1
"access_project_issue_report_all","project.issue.report","model_project_issue_report","project.group_project_manager",1,1,1,1
"access_crm_case_categ_id","crm.case.categ","crm.model_crm_case_categ","project.group_project_manager",1,1,1,1
"access_project_issue_version_project","project_issue_version manager","model_project_issue_version","project.group_project_manager",1,1,1,1
"access_project_issue_version_project_user","project_issue_version user","model_project_issue_version","project.group_project_user",1,0,0,0
"access_email_message_project_manager","email.message.manager","mail.model_email_message","project.group_project_manager",1,1,1,1
"access_resource_calendar_project_manager","resource.calendar.project.manager","resource.model_resource_calendar","project.group_project_manager",1,1,1,1
"access_project_issue_report_user","project.issue.report user","model_project_issue_report","project.group_project_user",1,0,0,0
"access_email_message_issue_project_user","email.message.user","mail.model_email_message","project.group_project_user",1,1,1,0

1 id name model_id:id group_id:id perm_read perm_write perm_create perm_unlink
2 access_project_issue_all project.issue model_project_issue project.group_project_manager 1 1 1 1
3 access_project_issue_user project.issue model_project_issue project.group_project_user 1 1 1 1
4 access_project_issue_report_all project.issue.report model_project_issue_report project.group_project_manager 1 1 1 1
5 access_crm_case_categ_id crm.case.categ crm.model_crm_case_categ project.group_project_manager 1 1 1 1
6 access_project_issue_version_project project_issue_version manager model_project_issue_version project.group_project_manager 1 1 1 1
7 access_project_issue_version_project_user project_issue_version user model_project_issue_version project.group_project_user 1 0 0 0
8 access_email_message_project_manager email.message.manager mail.model_email_message project.group_project_manager 1 1 1 1
9 access_resource_calendar_project_manager resource.calendar.project.manager resource.model_resource_calendar project.group_project_manager 1 1 1 1
10 access_project_issue_report_user project.issue.report user model_project_issue_report project.group_project_user 1 0 0 0
11 access_email_message_issue_project_user email.message..user email.message.user mail.model_email_message project.group_project_user 1 1 1 0

6
addons/project_mailgate/security/ir.model.access.csv
View File

@ -1,3 +1,3 @@
"id";"name";"model_id:id";"group_id:id";"perm_read";"perm_write";"perm_create";"perm_unlink"
"access_email_message_project_manager";"project.email.message.manager";"mail.model_email_message";"project.group_project_manager";1;1;1;0
"access_email_message_project_user";"project.email.message.user";"mail.model_email_message";"project.group_project_user";1;1;1;0
"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
"access_email_message_project_manager","project.email.message.manager","mail.model_email_message","project.group_project_manager",1,1,1,0
"access_email_message_project_user","project.email.message.user","mail.model_email_message","project.group_project_user",1,1,1,0

1 id name model_id:id group_id:id perm_read perm_write perm_create perm_unlink
2 access_email_message_project_manager project.email.message.manager mail.model_email_message project.group_project_manager 1 1 1 0
3 access_email_message_project_user project.email.message.user mail.model_email_message project.group_project_user 1 1 1 0

2
addons/survey/survey_demo.xml
View File

@ -3,7 +3,7 @@
<data noupdate="1">
<record id="base.user_demo" model="res.users">
<field eval="[(4, ref('base.group_tool_user')),(4, ref('group_survey_user'))]" name="groups_id"/>
<field eval="[(4, ref('base.group_tool_user')),(4, ref('base.group_survey_user'))]" name="groups_id"/>
</record>
<record model="survey.type" id="survey_type1">