Commit Graph

932 Commits

Author SHA1 Message Date
Gery Debongnie 5aa2fa150c [MERGE] merge from trunk
bzr revid: ged@openerp.com-20140502130753-4z24z1to9pkrckvq
2014-05-02 15:07:53 +02:00
Antony Lesuisse 7e25b9ae55 [MERGE] saas-4 report_webkit missing dependency on report
bzr revid: al@openerp.com-20140501152604-4cobh5ui47dt4pem
bzr revid: al@openerp.com-20140501155633-gefnc3zqcsr2rhaz
bzr revid: al@openerp.com-20140501161156-4wbsvhh8gz4r22h3
2014-05-01 18:11:56 +02:00
Christophe Simonis 7a7d7febf8 [MERGE] forward port of branch saas-3 up to revid 9429 chs@openerp.com-20140424123538-rxk9got9k2on1ki1
bzr revid: chs@openerp.com-20140424131824-4ksluvhnegp7kplb
bzr revid: chs@openerp.com-20140424134533-lhhcd32n3s0m9cqk
2014-04-24 15:45:33 +02:00
Thibault Delavallée 3d78f4a17e [FIX] email_template: fixed a test not checking signature but
using a template adding signature.

bzr revid: tde@openerp.com-20140424082622-71ratcz4xrdn8d7t
2014-04-24 10:26:22 +02:00
Thibault Delavallée 0ae0b643d1 [REM] Removed print statement
bzr revid: tde@openerp.com-20140423153008-jngdjm0qx7cgqctu
2014-04-23 17:30:08 +02:00
Thibault Delavallée 549da11e40 [FIX] email_template: when usign the composer in mass mailing mode with
a template, display the user's signature if asked by the template. The use will
then be able to modify the generated content and to remove / update it if necessary;
Otherwise the signature is not added in mass mailing mode, because the content
of the email is based on the wizard's body, not the template one.

Some rewriting in the onchange: now using a browse instead of a read.

bzr revid: tde@openerp.com-20140423152926-sno0gk8lup9l442p
2014-04-23 17:29:26 +02:00
Launchpad Translations on behalf of openerp fa60b90c1f Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20140422075247-nxfftok20ltlnea6
2014-04-22 07:52:47 +00:00
Denis Ledoux 2b2153bc39 [MERGE] Forward-port of latest 7.0 bugfixes, up to rev. 9991 revid:dle@openerp.com-20140417110435-u8uwwcf5ji1b54ao
bzr revid: dle@openerp.com-20140417112655-eeaiokbqzokpwx4i
2014-04-17 13:26:55 +02:00
Gery Debongnie 0c24df7074 [MERGE] merge from trunk
bzr revid: ged@openerp.com-20140417065356-x7o3jg5bo5430zth
2014-04-17 08:53:56 +02:00
Thibault Delavallée f9b2b667a0 [FIX] email_template: back to partner_ids generation when using templates
bzr revid: tde@openerp.com-20140416083946-2qlv0liu8doshh9q
2014-04-16 10:39:46 +02:00
Martin Trigaux 1ab962d338 [FIX] mail: convert attachments to binary as it is the expected format of message_post opw 604205
The double convertion (render_message and send_mail) is done to keep the API but should be changed in next version.

bzr revid: mat@openerp.com-20140415161441-q6pfueetvv0namgw
2014-04-15 18:14:41 +02:00
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
Gery Debongnie f57b767361 [MERGE] merge from trunk
bzr revid: ged@openerp.com-20140415150146-5ovdjzta58t5dhd2
2014-04-15 17:01:46 +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
Gery Debongnie ecd2b4fd30 [IMP] improves the add/remove actions and preview buttons in email template form view (addon email_template)
bzr revid: ged@openerp.com-20140414130910-hrx1wqy71ahdsmy4
2014-04-14 15:09:10 +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
Gery Debongnie 2e9ee9c76e [MERGE] merge from rma branch
bzr revid: ged@openerp.com-20140410145131-fj17mdpi13wa5a9m
2014-04-10 16:51:31 +02:00
Launchpad Translations on behalf of openerp bb8560f779 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20140405061904-60l019fp9qbl890t
bzr revid: launchpad_translations_on_behalf_of_openerp-20140406065319-1cr9ypow2w870fbo
bzr revid: launchpad_translations_on_behalf_of_openerp-20140407065316-8z3pm4a79uff45z5
2014-04-07 06:53:16 +00:00
Launchpad Translations on behalf of openerp 16ce262c33 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20140329073038-m7q4sxpb8tprh00r
bzr revid: launchpad_translations_on_behalf_of_openerp-20140330061549-r3t0pecngy76c2rw
bzr revid: launchpad_translations_on_behalf_of_openerp-20140331064021-x3wjc8s4oa0ncq95
bzr revid: launchpad_translations_on_behalf_of_openerp-20140401065325-w3viflz7c33n4uis
bzr revid: launchpad_translations_on_behalf_of_openerp-20140402064459-d7e3d8nwo8famjh6
2014-04-02 06:44:59 +00:00
Randhir Mayatra rma-openerp 77ff3a69b8 [IMP] improve icons and views
bzr revid: rma@tinyerp.com-20140328133051-2amm63n2vy3bj3xe
2014-03-28 19:00:51 +05:30
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
Randhir Mayatra rma-openerp 457a62dee6 [IMP] add stat button for point of sale, email template
bzr revid: rma@tinyerp.com-20140327113720-1jlqhlk17muqv5nf
2014-03-27 17:07:20 +05:30
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
Randhir Mayatra rma-openerp c086291ddd [MERGE] merge with latest trunk
bzr revid: rma@tinyerp.com-20140325135635-rev8asknqwk08svy
2014-03-25 19:26:35 +05:30
Randhir Mayatra rma-openerp 3caf591550 [IMP] change related button into stat for account,project
bzr revid: rma@tinyerp.com-20140325124531-kkwm1v8bhndzs846
2014-03-25 18:15:31 +05:30
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 b201dc79b7 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20140218054104-8egkh4jj7hiiwuih
bzr revid: launchpad_translations_on_behalf_of_openerp-20140219054048-688twg0fubtm2x2q
bzr revid: launchpad_translations_on_behalf_of_openerp-20140220054214-237ri67t9rw3l4fu
bzr revid: launchpad_translations_on_behalf_of_openerp-20140221063855-wniw42r27gyg3h6y
bzr revid: launchpad_translations_on_behalf_of_openerp-20140222073328-xpn7nwqz407yzumq
bzr revid: launchpad_translations_on_behalf_of_openerp-20140223074516-0r09cpmma58ylqji
bzr revid: launchpad_translations_on_behalf_of_openerp-20140224060319-535oheaq2w9u2ye3
bzr revid: launchpad_translations_on_behalf_of_openerp-20140225062420-zl7curej0e0warhz
bzr revid: launchpad_translations_on_behalf_of_openerp-20140226073146-3vzhw4hddr81olbs
bzr revid: launchpad_translations_on_behalf_of_openerp-20140227062959-24e2rn98rqb9afpr
bzr revid: launchpad_translations_on_behalf_of_openerp-20140228072152-f9gm4ud1wu19ge27
bzr revid: launchpad_translations_on_behalf_of_openerp-20140301055205-r0df0fqz9yf5z66i
bzr revid: launchpad_translations_on_behalf_of_openerp-20140302052638-bjf11oumy7w15oco
bzr revid: launchpad_translations_on_behalf_of_openerp-20140304082704-k1z2te1tfud43zy3
2014-03-04 08:27:04 +00: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