Commit Graph

907 Commits

Author SHA1 Message Date
Thibault Delavallée 3eaeae55a0 [IMP] mail, mass_mailing: better recipientsz computation
for mass mailing, composer and template. This allows to have one method computing recipints
and avoid repetiting myself.

bzr revid: tde@openerp.com-20140415154700-zu2izvxfjq1k4h4a
2014-04-15 17:47:00 +02:00
Thibault Delavallée 55fc583f36 [REM] mail: compose message: removed unnecessary code
bzr revid: tde@openerp.com-20140415143343-on2d3j92o6zifq59
2014-04-15 16:33:43 +02:00
Thibault Delavallée 5ea15d56fb [MERGE] Sync with trunk
bzr revid: tde@openerp.com-20140414090428-y435e4tsy4ju5nc3
2014-04-14 11:04:28 +02:00
Launchpad Translations on behalf of openerp e82fbf7d91 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20140412083153-3ona1js7o6z421vg
2014-04-12 08:31:53 +00:00
Thibault Delavallée e65b472cb5 [IMP] email_template: previw improvements :
- usability improveemnts on the sample document, more clear
- add partner_ids fields, displaying result of email template rendering that now also
generated partner_ids that will be recipient_ids on a mail_mail
- added attachment display

bzr revid: tde@openerp.com-20140327141241-2w2lxj5hkq8nqcu5
2014-03-27 15:12:41 +01:00
Thibault Delavallée 272a7e5f80 [FIX] email_template: fixed error in default recipients calculation
bzr revid: tde@openerp.com-20140327141141-qe47tlnnfb5xt9s8
2014-03-27 15:11:41 +01:00
Thibault Delavallée dae3551132 [IMP] mass_mailing: usability improvements
- from mass_mailing, creating or editing a template now goes through a wizard to avoid
tweaking too much the email.template view. This allows an easier management of templates
and their link with mailings.
- moved email.template minimal form view from email_tmeplate to mass_mailing, because it
is the sole module to use it. Tweaked it a bit by the way.
- removed dead code about actions not used anymore in mass_mailing
- empty list help on mail.mass_mailing.list
- various small usability fixes

bzr revid: tde@openerp.com-20140327130827-h9dy2m6mq10gzg1s
2014-03-27 14:08:27 +01:00
Thibault Delavallée f002d9ff17 [MERGE] Sync with trunk
bzr revid: tde@openerp.com-20140327093823-ev9mv771enwmdgrz
2014-03-27 10:38:23 +01:00
Launchpad Translations on behalf of openerp 51aa261b44 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20140327073504-l0fydwct329jhirh
2014-03-27 07:35:04 +00:00
Thibault Delavallée d9ff66c3de [FIX] email_template minimal form view: add some required field in invisible
in the view, to be able ot use default values when creating records

bzr revid: tde@openerp.com-20140325154031-vi773ggoz2q3qkxz
2014-03-25 16:40:31 +01:00
Thibault Delavallée 2dc0372431 [FIX] email_template: protect against possible non existent value
bzr revid: tde@openerp.com-20140325154006-fb5bu1khcvg6vdjb
2014-03-25 16:40:06 +01:00
Thibault Delavallée 8c270f9b87 [FIX] email_template: fixed iteration on a dict
bzr revid: tde@openerp.com-20140325142519-z3j1saqry9j23e0p
2014-03-25 15:25:19 +01:00
Thibault Delavallée 97d49659d0 [IMP] email_template: added an option to automatically generate
recipients instead of using template-based values. This should be the default way of using
templates actually, to avoid confusion with mako, ill-defined templates, ...

email_template code has been updated to handle recipient_ids when creating an email, depending
on its generated template values or default recipients.

mail_compose_message has also been updated, delegating the calculation of recipient when
having a template to the template itself, using some context keys to force the use
of partners instead of email_to and email_cc.

Also updated email_template form view to be a bit less confusing.

bzr revid: tde@openerp.com-20140325140324-bljvybigk3zv5ugm
2014-03-25 15:03:24 +01:00
Thibault Delavallée 9c80b99e5e [FIX] email_template: sending an email using the
send_mail method of a template is not related to openchatter anymore;
therefore recipients should not be called 'followers of XX', but use
their real name instead. This is already done, but the tests were not
updated.

bzr revid: tde@openerp.com-20140325103955-oc7ob98b1jql7tlz
2014-03-25 11:39:55 +01:00
Thibault Delavallée 7185a68775 [MERGE] Sync with trunk.
bzr revid: tde@openerp.com-20140325090209-w1qtcswiao01gqlu
2014-03-25 10:02:09 +01:00
Thibault Delavallée 7945d4bb97 [IMP] email_template: added a minimal form view + some custo in mass mailing views
bzr revid: tde@openerp.com-20140324171017-mcv5m493zpba5tgd
2014-03-24 18:10:17 +01:00
Thibault Delavallée 1ce1468cea [CLEAN] email_template: mail_compose_message: small code cleaning and dead code removal
bzr revid: tde@openerp.com-20140321172025-ntwxfakem8odo2nt
2014-03-21 18:20:25 +01:00
Simon Lejeune 1c5a57a129 [FIX] email_template now use the new get_pdf method on the report model in order to avoid the blocking bug of generating a pdf with a public request.session
bzr revid: sle@openerp.com-20140319185350-5t8iuvnzikwfajei
2014-03-19 19:53:50 +01:00
Thibault Delavallée 48deceb6c6 [IMP] [REF] mail_compose_message: slightly cleaned wizard code to lessen the number of corner cases and
to remove unnecessary code.
post and filter_id fields have been removed as they are not necessary.
Updated tests accordingly to new mass mailing tests: mass mailing create
emails, no message_post anymore using followers.

bzr revid: tde@openerp.com-20140317115315-ws8dvjbiv5rspk43
2014-03-17 12:53:15 +01:00
Thibault Delavallée fd85a00311 [MERGE] Merged prototyping branch about improving performances
in messaging, especially for mass mailing and mail mail creation. Some things will
probably be discarded or improved further, but this work will serve as a basis
for the whole mass mailing refactorign about speed.

bzr revid: tde@openerp.com-20140314165621-stpmdbq92fbigc3u
2014-03-14 17:56:21 +01:00
Thibault Delavallée 08ab922468 [IMP] [REF] mass_mailing: first draft for the saas-4 refactoring.
Improved mass mailing form view, that is used as a central point to create new
mailings.
Added concept of contact list (based on partner, or leads (to add)), as well as
contact (a list of name / email to import). Mailings are done un contact list
to simplify the way it works.
Added a kanban view of templates, with a flag to filter only mass mailing templates
(to avoid havign to deal with acknoledgments).
Using campaigns is now an option (a group), mailings can be done without having to
deal with campaigns.
Mailings and campaigns now have a status, used to display their kanban view.

bzr revid: tde@openerp.com-20140314165113-g4gvvifrhr2nfu15
2014-03-14 17:51:13 +01:00
Thibault Delavallée e6f6960d17 [MERGE] Sync with trunk
bzr revid: tde@openerp.com-20140314162124-fn8f9ne80skha19h
2014-03-14 17:21:24 +01:00
Christophe Simonis d504764eff [MERGE] forward port of branch saas-3 up to revid 9298 chm@openerp.com-20140311130852-3ft0v1mc9ht1any6
bzr revid: chs@openerp.com-20140311145205-s56fj113fsrnisc3
2014-03-11 15:52:05 +01:00
Olivier Dony 9a3261da85 [IMP] email_template: allow extra builtins in rendering sandbox
bzr revid: odo@openerp.com-20140310102410-m66aa8164tekr51t
2014-03-10 11:24:10 +01:00
Thibault Delavallée db2bdee343 MERGE] [FIX] email_template: fix relative -> absolute url conversion
Local URLs are converted into absolute URLs, notably because when using the
email designer, images are added using local URLs. Previously to this fix
the template was analyzed to find local URLs and make them absolute.
However this causes 2 issues :
- mako-based URLs are broken because a scheme is added before the mako that
generated the image src
- when changing the base url, the templates are not updated
The URLs are now converted dynamically when generating the content of the
html. This is done by passing a new parameter that enable the post processing
of the generated content.
Also fixed double body generation when using templates; fields parameter
was not propagated correctly.

bzr revid: tde@openerp.com-20140304112957-l9b10gyjqphs5fgc
2014-03-04 12:29:57 +01:00
Launchpad Translations on behalf of openerp 9863dbe5c8 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20140304075238-yra39uwmwahmrnf3
2014-03-04 07:52:38 +00:00
Thibault Delavallée 05fdc2290a [IMP] email_template: relocate url rewritign stuff directly into the rendering method.
bzr revid: tde@openerp.com-20140303104044-hgmii31ga6msf72z
2014-03-03 11:40:44 +01:00
Thibault Delavallée a9a4767d17 [FIX] email_template :
- fixed composer using template that were rendering the body twice, once form the template and
once from the composer body. Only the latter one is used, so avoid generating the template body
that is not necessary
- fixed email_template generating values for a set of given fields, ignoring the field list
given into parameter
- fixed post processing of templates to transform local urls into absolute urls; now urls are
transformed after body generation, when sending email based on templates , or when generating
the content when using the composer.

bzr revid: tde@openerp.com-20140227153835-gmqnxrzed9fnbxhm
2014-02-27 16:38:35 +01:00
Thibault Delavallée a17c09afff [IMP] [FIX] email_template: do not sanitize the template content.
Indeed its content may contain invalid html that could be stripped by the
sanitizer. The content generated based on the template will be sanitized
when stored in the mail_mail or mail_message body field, thus after
rendering.

bzr revid: tde@openerp.com-20140227144228-d275lxz6ryarkg4t
2014-02-27 15:42:28 +01:00
Thibault Delavallée b1f88d634d [IMP] [FIX] email_template: do not sanitize the template content.
Indeed its content may contain invalid html that could be stripped by the
sanitizer. The content generated based on the template will be sanitized
when stored in the mail_mail or mail_message body field, thus after
rendering.
The template therefore holds html, but that is not sanitized. But that's
still html, therefore using an html field.

bzr revid: tde@openerp.com-20140227134829-te8mxeakc3s96fun
2014-02-27 14:48:29 +01:00
Thibault Delavallée 47b1500c4b [CLEAN] email_template: cleaned modified code to lessen the diff
bzr revid: tde@openerp.com-20140224135008-b43mf3fqw0ib13r6
2014-02-24 14:50:08 +01:00
Thibault Delavallée 4739eb138b [IMP] mail, email_template: still continuing work to improve performances of mass mailing.
main differences :
- record_name is not a function field anymore, but a char field + a method in create
if not given (default-like, but dependent of other values). This allows the composer
to give a value for record_name (False for email mass mailing) to avoid browsing
records and having their access rights issues in the way
- author_id, email_from coming from composer instead of called in every mail.message
creation
- moved code dealing with attachments from send_mail to get_mail-values, to that at
the end of this method we know all values of the email

Some tests have been updated / temporarily disabled.

bzr revid: tde@openerp.com-20140224132038-txdi0g30a7fzbnxp
2014-02-24 14:20:38 +01:00
Thibault Delavallée 4a284821b4 [MERGE] Sync with trunnk
bzr revid: tde@openerp.com-20140221145716-vkusdgd56rnc85rl
2014-02-21 15:57:16 +01:00
Simon Lejeune 35b64811e9 [MERGE] trunk
bzr revid: sle@openerp.com-20140221095425-9043pbzjy7rtbxd1
2014-02-21 10:54:25 +01:00
Christophe Simonis 4b72678bc7 [MERGE] forward port of branch saas-2 up to revid 9195 chs@openerp.com-20140220154517-6y531n1mqtnfnsmr
bzr revid: chs@openerp.com-20140220163815-69sza1kclnh5mavs
2014-02-20 17:38:15 +01:00
Thibault Delavallée 1ac8e7cdfd [IMP] mail, email_template: mass mailing feature cleaning
- now differentiates mass mailing and mass post.
- mass mailing is a true mass mailing
- using same_thread log a copy in the document, without using message_post
(using notification field, + model and res_id)
- improved form view of composer, adding a filed explaining a bit the various
recipients
- removed unnecessary fields coming from the template (partner_to, ...) because
they are confusing -> composer should be easier to understand and use
- removed some unnecessary code
- removed double body computation when using templates (one for tmeplate, then
the wizard -> not necessary)

This commit will be followed by other to try to improve the mass mailing
and mass post.

bzr revid: tde@openerp.com-20140220152945-ash0hfkzevzamihq
2014-02-20 16:29:45 +01:00
openerp-sle 999050a9df [IMP] Email_template module now handles qweb-pdf report in mail attachment
bzr revid: openerp-sle@openerp-sle.home-20140212212259-sq7mpkt09a0t6v6d
2014-02-12 22:22:59 +01:00
Olivier Dony bbd813e76e [MERGE] Forward-port of latest saas-2 (incl. 7.0) bugfixes, up to rev. 9127 odo@openerp.com-20140212122042-3m2tysmr31mtecnc
bzr revid: odo@openerp.com-20140212175141-i9yz8zlseglrk8sb
2014-02-12 18:51:41 +01:00
Olivier Dony 08fc70a221 [FIX] email_template: attachments using many2many_binary widget are invisible unless label is present - pending widget fix as well
bzr revid: odo@openerp.com-20140210143613-v56rmg1vwwgfxhhq
2014-02-10 15:36:13 +01:00
Antony Lesuisse 87172d90d2 [MERGE] saas-3
bzr revid: al@openerp.com-20140209140315-ukqlf90ngy6ycu2k
2014-02-09 15:03:15 +01:00
Denis Ledoux 4ecf5bb09a [FIX] mail: create and edit of template_id in compose message now works, as we pass the template model in context (among others useful default value)
bzr revid: dle@openerp.com-20140207104637-lkx5am24608n8jka
2014-02-07 11:46:37 +01:00
Launchpad Translations on behalf of openerp 4208281471 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20140201060213-5gub5wavdno2vcu4
bzr revid: launchpad_translations_on_behalf_of_openerp-20140202053135-qolj2vd2n4tjwbp3
bzr revid: launchpad_translations_on_behalf_of_openerp-20140203051828-wflc11kw2q8wc0aq
2014-02-03 05:18:28 +00:00
Christophe Simonis c202dc1c52 merge upstream
bzr revid: chs@openerp.com-20140129190834-xfcat3ulfbg5omhn
2014-01-29 20:08:34 +01:00
Christophe Simonis 731019154a [MERGE] forward port of branch saas-2 up to revid 9109 dle@openerp.com-20140129171022-wf6244k90lpncmah
bzr revid: chs@openerp.com-20140129184703-ypd7iqnor5m5lr3d
2014-01-29 19:47:03 +01:00
Antony Lesuisse 033c38c304 [MERGE] trunk
bzr revid: al@openerp.com-20140129021916-ckb3rplmcpjbqel3
2014-01-29 03:19:16 +01:00
Launchpad Translations on behalf of openerp 3ce5e01eca Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20140128064139-6fjg3b236v5d790j
2014-01-28 06:41:39 +00:00
Frédéric van der Essen 5585a38ecc [MERGE] from trunk, need point_of_sale updates
bzr revid: fva@openerp.com-20140127160946-yeswyv4o7t2tfbqt
2014-01-27 17:09:46 +01:00
Fabien Pinckaers b15dbfa3a6 [IMP] mini imp
bzr revid: fp@openerp.com-20140125123758-4fhewd19ib38oal3
2014-01-25 13:37:58 +01:00
Denis Ledoux 1fb1a6f2af [MERGE] Forward-port of latest 7.0 bugfixes, up to rev. 9789 revid:dle@openerp.com-20140124120102-we2yxio553ws2yz4
bzr revid: dle@openerp.com-20140120174449-tui0a24zgn9bien2
bzr revid: dle@openerp.com-20140121125538-ke7i6kaz486hwgl8
bzr revid: dle@openerp.com-20140122134115-0ogjemlqe327xoac
bzr revid: dle@openerp.com-20140123103655-mf2zslfbgue97ed2
bzr revid: dle@openerp.com-20140124121027-uk9zy4dx9tqlsblr
2014-01-24 13:10:27 +01:00
Thibault Delavallée b845b708af [CLEAN] email_template: cleaned code
bzr revid: tde@openerp.com-20140124114743-m6s8d1byabl78l63
2014-01-24 12:47:43 +01:00