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

[FIX] sale: fixed demo data. Added a protection against void body in final body creation. 

bzr revid: tde@openerp.com-20120827153257-astw7738j6qdqc8l
This commit is contained in:
Thibault Delavallée 2012-08-27 17:32:57 +02:00
parent 4d510a3d31
commit 80a73e7237
2 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
addons/mail/mail_followers.py
View File

@ -106,7 +106,7 @@ class mail_notification(osv.Model):
:param message: browse record on source mail.message
"""
subject = msg.subject or '%s posted a comment on %s' % (msg.author_id.name, msg.record_name)
body = msg.body
body = msg.body or ''
author_signature = msg.author_id.user_ids[0].signature
if author_signature:
body += '<div>%s</div>' % (author_signature)

15
addons/sale/sale_demo.xml
View File

@ -304,36 +304,33 @@
<record id="message_sale_1" model="mail.message">
<field name="model">sale.order</field>
<field name="res_id" ref="sale_order_2"/>
<field name="content_subtype">plain</field>
<field name="body_text">Hi,
<field name="body">Hi,
I have a confusion for pricing of Services, I have heard there is a discount above 25 hours.
Can you clarify please?</field>
<field name="type">comment</field>
<field name="user_id" ref="base.user_demo"/>
<field name="author_id" ref="base.partner_demo"/>
</record>
<record id="message_sale_2" model="mail.message">
<field name="model">sale.order</field>
<field name="res_id" ref="sale_order_2"/>
<field name="parent_id" ref="message_sale_1"/>
<field name="content_subtype">plain</field>
<field name="body_text">Hello,
<field name="body">Hello,
Sorry but that scheme is not available for now,
We would like to know if you confirm the quotation with pricing we sent to you.
Thanks,
Sales Department</field>
<field name="type">comment</field>
<field name="user_id" ref="base.user_root"/>
<field name="author_id" ref="base.partner_root"/>
</record>
<record id="message_sale_3" model="mail.message">
<field name="model">sale.order</field>
<field name="res_id" ref="sale_order_2"/>
<field name="parent_id" ref="message_sale_2"/>
<field name="content_subtype">plain</field>
<field name="body_text">Ok, fine, we will intimate you after discussing with our team.</field>
<field name="body">Ok, fine, we will intimate you after discussing with our team.</field>
<field name="type">comment</field>
<field name="user_id" ref="base.user_demo"/>
<field name="author_id" ref="base.partner_demo"/>
</record>
<!-- sale advance demo.. -->
<!-- Demo Data for Product -->