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

[IMP] hr_server_log 

bzr revid: pna@tinyerp.com-20120612092717-pqyaxxyvib1c0zqh
This commit is contained in:
Pinakin Nayi (OpenERP) 2012-06-12 14:57:17 +05:30
parent 9e31716397
commit fe55d53961
3 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
addons/hr/hr_demo.xml
View File

File diff suppressed because one or more lines are too long

2
addons/mail/mail_subscription_view.xml
View File

@ -10,7 +10,6 @@
<field name="name">mail.subscription.tree</field>
<field name="model">mail.subscription</field>
<field name="type">tree</field>
<field name="sequence">10</field>
<field name="arch" type="xml">
<tree string="Subscription">
<field name="res_model"/>
@ -28,7 +27,6 @@
<field name="name">mail.notification.tree</field>
<field name="model">mail.notification</field>
<field name="type">tree</field>
<field name="sequence">10</field>
<field name="arch" type="xml">
<tree string="Subscription">
<field name="user_id"/>

4
addons/mail/mail_thread.py
View File

@ -293,8 +293,8 @@ class mail_thread(osv.osv):
'res_id': thread.id,
}
to_attach.append(ir_attachment.create(cr, uid, data_attach, context=context))
partner_id = hasattr(thread, 'partner_id') and (thread.partner_id and thread.partner_id.id or False) or False
partner_id = ('partner_id' in thread._columns.keys()) and (thread.partner_id and thread.partner_id.id or False) or False
#partner_id = hasattr(thread, 'partner_id') and (thread.partner_id and thread.partner_id.id or False) or False
if not partner_id and thread._name == 'res.partner':
partner_id = thread.id
data = {