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

[FIX] portal_sale: inadvertence during the forward port 978fd47261

This commit is contained in:
Denis Ledoux 2014-08-06 13:50:35 +02:00
parent 5666c219ad
commit 63dffd5e79
1 changed files with 1 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
addons/portal_sale/portal_sale_data.xml
View File

@ -97,13 +97,8 @@
<record id="email_template_edi_invoice" model="email.template">
<field name="name">Invoice - Send by Email (Portal)</field>
<field name="email_from">${(object.user_id.email or object.company_id.email or 'noreply@localhost')|safe}</field>
<<<<<<< HEAD
<field name="subject">${object.company_id.name} Invoice (Ref ${object.number or 'n/a' })</field>
<field name="partner_to">${object.partner_id.id}</field>
=======
<field name="subject">${object.company_id.name|safe} Invoice (Ref ${object.number or 'n/a' })</field>
<field name="email_recipients">${object.partner_id.id}</field>
>>>>>>> 7.0
<field name="partner_to">${object.partner_id.id}</field>
<field name="model_id" ref="account.model_account_invoice"/>
<field name="auto_delete" eval="True"/>
<field name="report_template" ref="account.account_invoices"/>