pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[FIX] purchase: fix mail templates

Browse Source 
Activate multi-company, deactivate the common contact book.
Create a PO P with user U1 in company A. Switch to company B.
User U2 in company A tries to send P by email.
Rendering of the template fails, because it tries to access object.create_uid,
which breaks multi-company record rules.

The signature was not working because it used user_id, a non-existing field,
instead of create_uid.

opw 1930521

closes odoo/odoo#30868
This commit is contained in:
Nans Lefebvre
2019-02-06 08:33:25 +00:00
parent 4f9fc188d3
commit a21864c36c
2 changed files with 18 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/purchase/data/mail_template_data.xml
+10 -5
View File
@@ -5,7 +5,7 @@
<!--Email template -->
<record id="email_template_edi_purchase" model="mail.template">
<field name="name">RFQ - Send by Email</field>
<field name="email_from">${(object.create_uid.email and '&quot;%s&quot; &lt;%s&gt;' % (object.create_uid.name, object.create_uid.email) or '')|safe}</field>
<field name="email_from">${(object.sudo().create_uid.email and '&quot;%s&quot; &lt;%s&gt;' % (object.sudo().create_uid.name, object.sudo().create_uid.email) or '')|safe}</field>
<field name="subject">${object.company_id.name} Order (Ref ${object.name or 'n/a' })</field>
<field name="partner_to">${object.partner_id.id}</field>
<field name="model_id" ref="purchase.model_purchase_order"/>
@@ -32,11 +32,11 @@ amounting in <strong>${format_amount(object.amount_total, object.currency_id)}</
from ${object.company_id.name}.
</p>
<p>Do not hesitate to contact us, further you have any question.</p>
<p>Do not hesitate to contact us if you have any further question.</p>
<p>Best regards,</p>
<p style="color:#888888;">
% if object.user_id and object.user_id.signature:
${object.user_id.signature | safe}
% if object.sudo().create_uid and object.sudo().create_uid.signature:
${object.sudo().create_uid.signature | safe}
% endif
</p>
]]></field>
@@ -46,7 +46,7 @@ from ${object.company_id.name}.
<!--Email template -->
<record id="email_template_edi_purchase_done" model="mail.template">
<field name="name">Purchase Order - Send by Email</field>
<field name="email_from">${(object.create_uid.email and '&quot;%s&quot; &lt;%s&gt;' % (object.create_uid.name, object.create_uid.email) or '')|safe}</field>
<field name="email_from">${(object.sudo().create_uid.email and '&quot;%s&quot; &lt;%s&gt;' % (object.sudo().create_uid.name, object.sudo().create_uid.email) or '')|safe}</field>
<field name="subject">${object.company_id.name} Order (Ref ${object.name or 'n/a' })</field>
<field name="partner_to">${object.partner_id.id}</field>
<field name="model_id" ref="purchase.model_purchase_order"/>
@@ -74,6 +74,11 @@ from ${object.company_id.name}.
<p>You can reply to this email if you have any questions.</p>
<p>Thank you,</p>
<p style="color:#888888;">
% if object.sudo().create_uid and object.sudo().create_uid.signature:
${object.sudo().create_uid.signature | safe}
% endif
</p>
]]></field>
</record>
addons/purchase/i18n/purchase.pot
+8 -3
View File
@@ -36,11 +36,11 @@ msgid "\n"
"from ${object.company_id.name}.\n"
"</p>\n"
"\n"
"<p>Do not hesitate to contact us, further you have any question.</p>\n"
"<p>Do not hesitate to contact us if you have any further question.</p>\n"
"<p>Best regards,</p>\n"
"<p style=\"color:#888888;\">\n"
"% if object.user_id and object.user_id.signature:\n"
" ${object.user_id.signature | safe}\n"
"% if object.sudo().create_uid and object.sudo().create_uid.signature:\n"
" ${object.sudo().create_uid.signature | safe}\n"
"% endif\n"
"</p>\n"
""
@@ -68,6 +68,11 @@ msgid "\n"
"\n"
"<p>You can reply to this email if you have any questions.</p>\n"
"<p>Thank you,</p>\n"
"<p style=\"color:#888888;\">\n"
"% if object.sudo().create_uid and object.sudo().create_uid.signature:\n"
" ${object.sudo().create_uid.signature | safe}\n"
"% endif\n"
"</p>\n"
""
msgstr ""