Cecile Tonglet
15fe515601
[MERGE] From trunk
...
bzr revid: cto@openerp.com-20121217144306-tkodwpox30cuvb28
2012-12-17 15:43:06 +01:00
Raphael Collet
a261f54c82
[FIX] email_template: use urlencode to build urls, and adapt email templates;
...
also fixes incorrect usage of 'safe' in those templates"
bzr revid: rco@openerp.com-20121214090340-nd3u4ahhb4460r4q
2012-12-14 10:03:40 +01:00
Raphael Collet
33463a6bc3
[IMP] account: adapt edi email template
...
bzr revid: rco@openerp.com-20121213140135-zw9zhmx85ryucn81
2012-12-13 15:01:35 +01:00
Raphael Collet
42ad6511e6
[IMP] email_template: render mako templates with jinja2 sandboxed environment
...
bzr revid: rco@openerp.com-20121213095643-czuw8ls0he5ru1lx
2012-12-13 10:56:43 +01:00
Vo Minh Thu
e7f4891d46
[IMP] use the openerp namespace.
...
bzr revid: vmt@openerp.com-20121206145632-0h1coh5aaem65wsy
2012-12-06 15:56:32 +01:00
Vo Minh Thu
2cd9443b92
[IMP] email_template: dont give mail.mail.create() an unneeded email_recipients field.
...
bzr revid: vmt@openerp.com-20121116113551-le30lwfmignrxl0e
2012-11-16 12:35:51 +01:00
Thibault Delavallée
fbccb823f8
[MERGE] Sync with trunk.
...
bzr revid: tde@openerp.com-20121112161523-yfp1dczcnmi85t8e
bzr revid: tde@openerp.com-20121114083900-qw40e8ii1rfl7gt1
2012-11-14 09:39:00 +01:00
Thibault Delavallée
78959edc48
[IMP] email_template: cleaned a bit tools imports.
...
bzr revid: tde@openerp.com-20121109095122-pifpwr5u1hhyjakw
2012-11-09 10:51:22 +01:00
Christophe Matthieu
42dd7711b5
[FIX] email_template: change name value and concat test
...
bzr revid: chm@openerp.com-20121107113925-1nmjicj444nez25c
2012-11-07 12:39:25 +01:00
Christophe Matthieu
71c73945fa
[IMP] email template: add a email_to_partner field for send a email to a partner with the id
...
bzr revid: chm@openerp.com-20121106191255-dd1xv90ebsejqunf
2012-11-06 20:12:55 +01:00
Thibault Delavallée
53a6056a35
[FIX] email_template: html_sanitize not in html_sanitize, but in mail.é
...
bzr revid: tde@openerp.com-20121106121134-8tws1ckwh0mhpiwm
2012-11-06 13:11:34 +01:00
Thibault Delavallée
c3aecf0630
[FIX] Fixed fix of revision 7750. Correct fix was to add in the generated action an use_template context key, that triggers the use of templates. Eveything is then managed inside the email_template override of mail.compose.message.
...
bzr revid: tde@openerp.com-20121016115839-8cj0u9si20qo14av
2012-10-16 13:58:39 +02:00
Jalpesh Patel (OpenERP)
6aba62a847
[fix]fix problem of send RFQ
...
bzr revid: pja@tinyerp.com-20121004070227-rqo5ec0mckj5vqx8
2012-10-04 12:32:27 +05:30
Antonin Bourguignon
6359d39de2
[MERGE] latest trunk
...
bzr revid: abo@openerp.com-20120924171736-awxstwkuaflv1y7r
2012-09-24 19:17:36 +02:00
Antonin Bourguignon
1fbb4a5c16
[IMP] handling of '(copy)' l10n
...
bzr revid: abo@openerp.com-20120924162645-z1h4l2mj6c8i6wr3
2012-09-24 18:26:45 +02:00
Antonin Bourguignon
f7b90af93a
[FIX] forgot to remove })
...
bzr revid: abo@openerp.com-20120924155600-dnaanyupa5jm0yre
2012-09-24 17:56:00 +02:00
Antonin Bourguignon
05059bef7f
[MERGE] trunk
...
bzr revid: abo@openerp.com-20120924153547-i1r9l0i5asjhml0k
2012-09-24 17:35:47 +02:00
Antonin Bourguignon
7b62802435
[IMP] use kwargs instead of a new dict
...
bzr revid: abo@openerp.com-20120924153430-0nb2gxker8v9is5p
2012-09-24 17:34:30 +02:00
Thibault Delavallée
089b64214d
[FIX] email_template: various improvements and fixes.
...
email_template.py: fixed attachments
mail.compose.message: fixed various bugs of onchanges and the use of templates
with the composer. Cleaned and added tests related to the composer using
email_template.
mail.compose.message form view: the use of templates is now for
advanced formatting only.
bzr revid: tde@openerp.com-20120905155626-h6laee191ttnglkh
2012-09-05 17:56:26 +02:00
Olivier Dony
5f1dce419b
[IMP] mail*: implement auto-deletion mechanism for mail.message, mail.mail and the attachment
...
This is based on the auto_delete flag on mail.mail
and the assumption that mail.mail records created
without a parent message will be deleted as a whole,
including the parent message and its attachments.
This is contrasted with mail.mail records created
for notifications regarding a mail.message, and therefore
created with an existing `mail_message_id` parent.
For this last case the parent must not be deleted
along with the child mail.mail, as it exists on its own.
bzr revid: odo@openerp.com-20120905151950-7jv6hi0x5fx5iytp
2012-09-05 17:19:50 +02:00
Thibault Delavallée
c52ab94960
[REVIEW] addons: small cleanups nex to a diff read. Some improvements will follow, this commit is about small cleanups.
...
bzr revid: tde@openerp.com-20120904092820-56zgwpkqfpd7as5k
2012-09-04 11:28:20 +02:00
Olivier Dony
9d16f324e9
[IMP] email.template: review/adapt form to 7.0-style + continue refactoring polishing
...
bzr revid: odo@openerp.com-20120901010907-703t6vx6n99tnyzq
2012-09-01 03:09:07 +02:00
Thibault Delavallée
7eb5b82950
[FIX] email_template: generate_email now returns a standard-looking attachments in values (list of tuples).
...
bzr revid: tde@openerp.com-20120831171622-ibrrz5us0lunoi0q
2012-08-31 19:16:22 +02:00
Olivier Dony
04c6823a99
[IMP] email_template: email.template does not inherit from mail.mail anymore, they had almost nothing left in common
...
+ minor lint cleanup
bzr revid: odo@openerp.com-20120831155805-bs8jmpt3eh52zwfb
2012-08-31 17:58:05 +02:00
Olivier Dony
24fab3ca7d
[IMP] mail: refactor various places where we append content to HTML
...
bzr revid: odo@openerp.com-20120831155103-t13p33p7232g0128
2012-08-31 17:51:03 +02:00
Olivier Dony
9aabe91bbf
[FIX] email_template: wip - trying to make templates work again
...
bzr revid: odo@openerp.com-20120830174452-59q43k1x13at4i37
2012-08-30 19:44:52 +02:00
Olivier Dony
545d7843e3
[FIX] marketing_campaign: make tests pass again, move partner resolution to mail_compose_message
...
email_template's job is to generate a mail.mail record, but it
does not care about linking it automatically to a partner
(and certainly not creating new partners) as this must be
usable for mass mailing and for marketing campaign,
and we don't want to pollute the partners database with
possibly thousands of partially fake emails
bzr revid: odo@openerp.com-20120824120102-jycs8x4vkxdmrvge
2012-08-24 14:01:02 +02:00
Amit (OpenERP)
0195eb407d
[FIX] mail_template : Fixes the duplication problem on email template
...
lp bug: https://launchpad.net/bugs/1039645 fixed
bzr revid: amp@tinyerp.com-20120822062555-d7thh474wn5lisnv
2012-08-22 11:55:55 +05:30
Olivier Dony
95b13bdaa4
[FIX] *mail: s/mail_message/mail_mail/ for cases where a full mail_mail is necessary
...
bzr revid: odo@openerp.com-20120821212419-yu2criox6sayf2cv
2012-08-21 23:24:19 +02:00
Fabien Pinckaers
043dc83d20
[IMP] mails
...
bzr revid: fp@tinyerp.com-20120817125004-wcchhac2cvxuf93i
2012-08-17 14:50:04 +02:00
Fabien Pinckaers
06f60b3517
[FIX] body_text --> body, not ure it's good enough
...
bzr revid: fp@tinyerp.com-20120817120606-t97l9x2dguuv7kmp
2012-08-17 14:06:06 +02:00
Fabien Pinckaers
a71b01ab24
[IMP] mail cleaning
...
bzr revid: fp@tinyerp.com-20120817115513-3b3faqcl78blyrfo
2012-08-17 13:55:13 +02:00
Thibault Delavallée
f725d5e679
[FIX] email_template: fixed an issue where no destination partner could be found.
...
bzr revid: tde@openerp.com-20120807160924-hdnqudnwowkbmsem
2012-08-07 18:09:24 +02:00
Thibault Delavallée
6b9783629b
[IMP] mail: composition form: added partner form email templates; when sending an email, email_to is composed based on partner_ids also.
...
bzr revid: tde@openerp.com-20120719135745-b9ksd2adtrfdb2bm
2012-07-19 15:57:45 +02:00
Thibault Delavallée
4e038b3615
[IMP] email_template: override name_get, because old one coming from mail.message.common was quite ugly for email templates.
...
bzr revid: tde@openerp.com-20120717132329-5m15l8akdu8hksy4
2012-07-17 15:23:29 +02:00
Thibault Delavallée
289dad87d4
[MERGE] Merged with addons/trunk.
...
bzr revid: tde@openerp.com-20120703122020-79rl9b03mygz5s0h
2012-07-03 14:20:20 +02:00
Kuldeep Joshi (OpenERP)
3c50eb017a
[IMP] set logging.getLogger(__name__)
...
bzr revid: kjo@tinyerp.com-20120622064854-5f6fss55k7305e8q
2012-06-22 12:18:54 +05:30
Thibault Delavallée
7a553f429b
[MERGE] Merged with main addons.
...
bzr revid: tde@openerp.com-20120511124643-y1rsa0ouh3e6xq1k
2012-05-11 14:46:43 +02:00
Raphael Collet
a327b7aed5
[IMP] adapt po files to label changes, to ease translations
...
bzr revid: rco@openerp.com-20120510130751-3vhhfbsmo45zitzx
2012-05-10 15:07:51 +02:00
Mayur Maheshwari (OpenERP)
9e59ce8812
[IMP]all: Improve all typos
...
bzr revid: mma@tinyerp.com-20120424060532-ohrf0sxwq8rpq6ls
2012-04-24 11:35:32 +05:30
Thibault Delavallée
318ef517ab
[REF] mail.message.common model: renamed subtype to content_subtype. Purpose: make a distinction between content and message model. Type and subtype will be used to distinguish messages, content_subtype to distinguish the content itself.
...
bzr revid: tde@openerp.com-20120420093645-tt78zzrmq2nxomvb
2012-04-20 11:36:45 +02:00
Rucha Patel
b3f2abec46
[FIX] email_template: ensure non-empty context when rendering template'
...
bzr revid: odo@openerp.com-20120322141153-8u3kia3k125et6b5
2012-03-22 15:11:53 +01:00
Christophe Simonis
b7bad83c21
[FIX] email_template: report_name must be rendered
...
bzr revid: chs@openerp.com-20120316091517-e2hc8ydzd3vnnv3j
2012-03-16 10:15:17 +01:00
Olivier Dony
3e0279ac4a
[FIX] email_template: attachments were not being sent due to programming error
...
bzr revid: odo@openerp.com-20120315155512-s76y2u3gz3awfy74
2012-03-15 16:55:12 +01:00
Olivier Dony
d55eff4218
[FIX] email.template: body_html should be translatable
...
bzr revid: odo@openerp.com-20120309160625-kwp4pof4vm7aci2g
2012-03-09 17:06:25 +01:00
Olivier Dony
eefbb2ac5c
[FIX] email_template: care for missing context
...
bzr revid: odo@openerp.com-20120309011156-q53pc4h6stlz3kq2
2012-03-09 02:11:56 +01:00
Olivier Dony
16a8811930
[IMP] mail,email_template: improved views, assert missing email_from
...
- add missing colspans for notebooks
- remove some buttons from mail.message form view,
namely because send button can cause record deletion
possibly causing some weird UI result.. better used
from the list view for now (web was fixed anyway)
- better domain on Message action, to ease debugging
- added assert for email_from in email_template.send_email()
to catch errors earlier
bzr revid: odo@openerp.com-20120213143531-eiuhulo46bv059pl
2012-02-13 15:35:31 +01:00
Olivier Dony
a4a36695c7
[IMP] email_template: use button name as action name
...
The action name is what gets displayed in the sidebar
and there is no reason to have a different name for
the action and button anyway.
lp bug: https://launchpad.net/bugs/886144 fixed
bzr revid: odo@openerp.com-20120125174249-wxor3br5xbqtluld
2012-01-25 18:42:49 +01:00
tfr@openerp.com
dde2a5766f
[FIX] auto populate Wizard while clicking on email template
...
lp bug: https://launchpad.net/bugs/886144 fixed
bzr revid: tfr@openerp.com-20120118164943-4u1c79bzeqakizua
2012-01-18 17:49:43 +01:00
fp
8aff5209ea
[IMP] improved error message, constraints must allways propose a solution
...
bzr revid: fp@fp-laptop-20111231075720-4kak7o320td4wxqc
2011-12-31 08:57:20 +01:00