522f144781
[CLEAN] Misc cleaning and code review before merging.
...
bzr revid: tde@openerp.com-20130319091844-tnpd0w8tlagcbypz
2013-03-19 10:18:44 +01:00
5d59401b91
[MERGE] Sync with trunk, tried to resolve the conflicts without breakign everything.
...
bzr revid: tde@openerp.com-20130315120759-sf1o1sd80ycuuy7n
2013-03-15 13:07:59 +01:00
93d815efab
[CLEAN] crm, res_partner: added name on added filters; added oline breaks in big help of notification_email_send.
...
bzr revid: tde@openerp.com-20130313125124-wbu17isbi6cay100
2013-03-13 13:51:24 +01:00
3dc1a58ed5
[FIX] crm, email_template: fixed help messages talking about partners and leads instead of leads and partners... well, I think this comment is not very understandable, but at least there is a commit message. Horray.
...
bzr revid: tde@openerp.com-20130313121221-lo0kmkt2lltyr94e
2013-03-13 13:12:21 +01:00
fdf7410acf
[FIX] crm, res_partner: added separator in search views after adding not opt-out filter.
...
bzr revid: tde@openerp.com-20130313115901-s60j69qn3e3q4bpk
2013-03-13 12:59:01 +01:00
2f4a59fd06
[IMP] email_template, crm: added forgotten filters for opt-out; cleaned help of opt-out; email body is back into internal note as it has been decided that it was too much change for 7.0, especially that email content parsing is not robust enough.
...
bzr revid: tde@openerp.com-20130313112013-veqzplextey1300p
2013-03-13 12:20:13 +01:00
d7e5763dcb
[IMP] mail, email_template: improved mass mailing action (renamed, now using a well defined template) + improved form view of mail.compose.message wizard.
...
bzr revid: tde@openerp.com-20130312133817-y9xztv6gs4ut7ndj
2013-03-12 14:38:17 +01:00
2d6aae609b
[IMP]Remove type field from the views
...
bzr revid: tch@tinyerp.com-20120808121950-r4tux6lfej82bi2h
2012-08-08 17:49:50 +05:30
7d382f34d7
[IMP]:email_template:solved inheritance problem
...
bzr revid: apa@tinyerp.com-20120605073234-xtdjpdfwlcxpqk5v
2012-06-05 13:02:34 +05:30
ac94300f0f
[IMP] base_*, email_template, fetchmail, mail, import_*: remove group_extended
...
bzr revid: rco@openerp.com-20120425144258-jpb9xey20h7fq4tx
2012-04-25 16:42:58 +02:00
a173d8aa7c
[FIX] email_template: typo in partner view
...
bzr revid: odo@openerp.com-20111006113353-ksb490zpxtvx4qio
2011-10-06 13:33:53 +02:00
72d5ab8b99
[IMP] email_template: added opt_out flag on res.partner
...
In the context of email templates or for related features
like marketing campaigns or automated business document
notification, this flag may be used to disable the sending
of template-based emails to the partner.
It will not prevent sending an email based on a template
by default, each feature using a template should implement
this if needed.
bzr revid: odo@openerp.com-20111005113846-qik6d5gxd4xqeqdj
2011-10-05 13:38:46 +02:00
Thibault Delavallée
Twinkle Christian (OpenERP)
Amit Patel (OpenERP)
Raphael Collet
Olivier Dony