Christophe Simonis c202dc1c52 merge upstream ... bzr revid: chs@openerp.com-20140129190834-xfcat3ulfbg5omhn		2014-01-29 20:08:34 +01:00
..
doc	[DOC] mail, email_template: added changelog	2013-07-26 13:59:18 +02:00
i18n	Launchpad automatic translations update.	2014-01-28 06:41:39 +00:00
security	[IMP] email.template: review/adapt form to 7.0-style + continue refactoring polishing	2012-09-01 03:09:07 +02:00
static/src/img	[IMP] mail, email_template: chatter: added forgotton images for links/buttons, cleaned a bit the CSS for the composer.	2012-07-18 15:32:34 +02:00
tests	[MERGE] Sync with trunk, tries to solve conflicts. There are still some new images to convert into images in xml files.	2014-01-16 11:39:10 +01:00
wizard	[IMP] mini imp	2014-01-25 13:37:58 +01:00
__init__.py	[ADD] email_template: added support for 'email' server action.	2013-07-15 17:25:16 +02:00
__openerp__.py	[ADD] email_template: added support for 'email' server action.	2013-07-15 17:25:16 +02:00
email_template.py	merge upstream	2014-01-29 20:08:34 +01:00
email_template_view.xml	[IMP] email_template, template_preview: updated form views.	2013-03-27 15:20:26 +01:00
html2text.py	[IMP] clean permissions and shebang in files	2013-05-14 12:31:13 +02:00
ir_actions.py	[IMP] ir_actions in email_template: template_id domain not only on view, directly on field	2013-10-03 16:04:58 +02:00
ir_actions_view.xml	[IMP] ir_actions in email_template: template_id domain not only on view, directly on field	2013-10-03 16:04:58 +02:00
res_partner.py	[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.	2013-03-13 12:20:13 +01:00
res_partner_demo.yml	[IMP] email_template: added opt_out flag on res.partner	2011-10-05 13:38:46 +02:00
res_partner_view.xml	[CLEAN] Misc cleaning and code review before merging.	2013-03-19 10:18:44 +01:00