Maxime Chambreuil (http://www.savoirfairelinux.com) has proposed merging
lp:~savoirfairelinux-openerp/openerp-accountedge/6.1-fix-email-addresses-notifications
into lp:openerp-accountedge.
Commit message:
[MRG] Fix email addresses
Requested reviews:
OpenERP - AccountEdge (openerp-accountedge)
For more details, see:
https://code.launchpad.net/~savoirfairelinux-openerp/openerp-accountedge/6.1-fix-email-addresses-notifications/+merge/194052
--
https://code.launchpad.net/~savoirfairelinux-openerp/openerp-accountedge/6.1-fix-email-addresses-notifications/+merge/194052
Your team Savoir-faire Linux' OpenERP is subscribed to branch
lp:~savoirfairelinux-openerp/openerp-accountedge/6.1-fix-email-addresses-notifications.
=== modified file 'hr_expense_accountedge/hr_expense_accountedge.xml'
--- hr_expense_accountedge/hr_expense_accountedge.xml 2013-08-08 19:43:14 +0000
+++ hr_expense_accountedge/hr_expense_accountedge.xml 2013-11-06 02:54:21 +0000
@@ -194,12 +194,12 @@
-->
<record id="email_template_edi_expense_waiting_approval" model="email.template">
<field name="name">Automated Invoice Notification Mail</field>
- <field name="email_from">${object.company_id.email or 'noreply@localhost'}</field>
+ <field name="email_from">${object.employee_id.user_id.user_email or 'noreply@localhost'}</field>
<field name="subject">New expense waiting for approval</field>
- <field name="email_to">${object.employee_id.parent_id.work_email or '[email protected]'}</field>
+ <field name="email_to">${object.employee_id.parent_id.user_id.user_email}</field>
<field name="model_id" ref="model_hr_expense_expense"/>
<field name="auto_delete" eval="True"/>
- <field name="lang">${object.employee_id.partner_id.lang}</field>
+ <field name="lang">${object.employee_id.user_id.context_lang}</field>
<field name="body_html"><![CDATA[
<div style="
font-family : 'Lucica Grande', Ubuntu, Arial, Verdana, sans-serif;
@@ -240,12 +240,12 @@
-->
<record id="email_template_edi_expense_accepted" model="email.template">
<field name="name">Automated Invoice Notification Mail</field>
- <field name="email_from">${object.company_id.email or 'noreply@localhost'}</field>
+ <field name="email_from">${object.employee_id.user_id.user_email or 'noreply@localhost'}</field>
<field name="subject">New expense approved and ready for export</field>
- <field name="email_to">${object.manager_emails}</field>
+ <field name="email_to">payable@localhost</field>
<field name="model_id" ref="model_hr_expense_expense"/>
<field name="auto_delete" eval="True"/>
- <field name="lang">${object.employee_id.partner_id.lang}</field>
+ <field name="lang">${object.employee_id.user_id.context_lang}</field>
<field name="body_html"><![CDATA[
<div style="
font-family : 'Lucica Grande', Ubuntu, Arial, Verdana, sans-serif;
--
Mailing list: https://launchpad.net/~savoirfairelinux-openerp
Post to : [email protected]
Unsubscribe : https://launchpad.net/~savoirfairelinux-openerp
More help : https://help.launchpad.net/ListHelp
