Merge lp:~pexego/poweremail/nan_poweremail_improvements into lp:~nan-tic/poweremail/nan_poweremail

Proposed by Omar (Pexego) on 2010-12-16
Status: Needs review
Proposed branch: lp:~pexego/poweremail/nan_poweremail_improvements
Merge into: lp:~nan-tic/poweremail/nan_poweremail
Diff against target: 76 lines (+17/-2) (has conflicts)
5 files modified
i18n/es_ES.po (+5/-0)
i18n/poweremail.pot (+5/-0)
poweremail_core.py (+1/-1)
poweremail_scheduler_data.xml (+2/-1)
poweremail_template.py (+4/-0)
Text conflict in poweremail_template.py
To merge this branch: bzr merge lp:~pexego/poweremail/nan_poweremail_improvements
Reviewer Review Type Date Requested Status
Albert Cervera i Areny - http://www.NaN-tic.com 2010-12-16 Pending
Review via email: mp+43892@code.launchpad.net

Description of the change

This branch adds a return receipt field in mail configuration enabling this functionality and it fixes sending mail from any action, it failed in silent obtaining the lang field, if you have placeholder for this field

To post a comment you must log in.
215. By Omar (Pexego) on 2010-12-16

[FIX] Removes repeated definition of numbercall field in cron record

216. By Omar (Pexego) on 2011-01-25

[MERGE]

217. By Omar (Pexego) on 2011-01-25

[FIX] Allows to create act_windows for poweremail templates with non ascii name

218. By Omar (Pexego) on 2011-02-04

[FIX] Bug #581854 Encode to utf-8 email user and email password to avoid this issue

Unmerged revisions

218. By Omar (Pexego) on 2011-02-04

[FIX] Bug #581854 Encode to utf-8 email user and email password to avoid this issue

217. By Omar (Pexego) on 2011-01-25

[FIX] Allows to create act_windows for poweremail templates with non ascii name

216. By Omar (Pexego) on 2011-01-25

[MERGE]

215. By Omar (Pexego) on 2010-12-16

[FIX] Removes repeated definition of numbercall field in cron record

214. By Omar (Pexego) on 2010-12-16

Adds translation of new field return_receipt in .pot and es_ES.po

213. By Omar (Pexego) on 2010-12-16

[IMP] Adds return receipt field in mail configuration enabling this functionality. [FIX] sending mail from any action, it fails in silent obtaining the lang field if you have placeholder for this field

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'i18n/es_ES.po'
2--- i18n/es_ES.po 2010-02-26 12:03:41 +0000
3+++ i18n/es_ES.po 2011-02-04 10:34:09 +0000
4@@ -923,6 +923,11 @@
5 msgstr "Nombre de usuario"
6
7 #. module: poweremail
8+#: field:poweremail.core_accounts,return_receipt:0
9+msgid "Return Receipt"
10+msgstr "Acuse de Recibo"
11+
12+#. module: poweremail
13 #: field:poweremail.mailbox,pem_to:0
14 #: field:poweremail.templates,def_to:0
15 msgid "Recepient (To)"
16
17=== modified file 'i18n/poweremail.pot'
18--- i18n/poweremail.pot 2010-02-18 22:13:37 +0000
19+++ i18n/poweremail.pot 2011-02-04 10:34:09 +0000
20@@ -32,6 +32,11 @@
21 msgstr ""
22
23 #. module: poweremail
24+#: field:poweremail.core_accounts,return_receipt:0
25+msgid "Return Receipt"
26+msgstr ""
27+
28+#. module: poweremail
29 #: code:addons/poweremail/poweremail_core.py:0
30 #: code:addons/poweremail/poweremail_mailbox.py:0
31 #: code:addons/poweremail/poweremail_send_wizard.py:0
32
33=== modified file 'poweremail_core.py'
34--- poweremail_core.py 2011-01-19 16:27:06 +0000
35+++ poweremail_core.py 2011-02-04 10:34:09 +0000
36@@ -262,7 +262,7 @@
37 raise error
38 try:
39 if serv.has_extn('AUTH') or this_object.smtpuname or this_object.smtppass:
40- serv.login(this_object.smtpuname, this_object.smtppass)
41+ serv.login(this_object.smtpuname.encode('UTF-8'), this_object.smtppass.encode('UTF-8'))
42 except Exception, error:
43 raise error
44 return serv
45
46=== modified file 'poweremail_scheduler_data.xml'
47--- poweremail_scheduler_data.xml 2010-03-03 11:30:11 +0000
48+++ poweremail_scheduler_data.xml 2011-02-04 10:34:09 +0000
49@@ -5,9 +5,10 @@
50 <field name="name">Poweremail scheduler</field>
51 <field name="user_id" ref="base.user_root"/>
52 <field name="interval_number">1</field>
53+ <field name="numbercall">-1</field>
54 <field name="interval_type">hours</field>
55- <field name="numbercall">12</field>
56 <field eval="False" name="doall"/>
57+ <field eval="True" name="active"/>
58 <field eval="'poweremail.mailbox'" name="model"/>
59 <field eval="'run_mail_scheduler'" name="function"/>
60 <field eval="'()'" name="args"/>
61
62=== modified file 'poweremail_template.py'
63--- poweremail_template.py 2011-01-29 10:17:36 +0000
64+++ poweremail_template.py 2011-02-04 10:34:09 +0000
65@@ -436,7 +436,11 @@
66 id = super(poweremail_templates, self).create(cr, uid, vals, context)
67 src_obj = self.pool.get('ir.model').read(cr, uid, vals['object_name'], ['model'], context)['model']
68 vals['ref_ir_act_window'] = self.pool.get('ir.actions.act_window').create(cr, uid, {
69+<<<<<<< TREE
70 'name': _("%s Mail Form") % tools.ustr( vals['name'] ),
71+=======
72+ 'name': _("%s Mail Form") % tools.ustr(vals['name']),
73+>>>>>>> MERGE-SOURCE
74 'type': 'ir.actions.act_window',
75 'res_model': 'poweremail.send.wizard',
76 'src_model': src_obj,

Subscribers

People subscribed via source and target branches

to all changes: