Commit Graph

207 Commits

Author SHA1 Message Date
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 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
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
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 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 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 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
Thibault Delavallée e6f6960d17 [MERGE] Sync with trunk
bzr revid: tde@openerp.com-20140314162124-fn8f9ne80skha19h
2014-03-14 17:21:24 +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
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 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
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
Fabien Pinckaers b15dbfa3a6 [IMP] mini imp
bzr revid: fp@openerp.com-20140125123758-4fhewd19ib38oal3
2014-01-25 13:37:58 +01:00
Pooja Zankhariya (OpenERP) 722aee5336 [MERGE]Merge with Parent
bzr revid: pza@tinyerp.com-20140117062056-yaw069hktnsk3iwj
2014-01-17 11:20:56 +05:00
Thibault Delavallée 9cf78e93cc [MERGE] Sync with trunk, tries to solve conflicts. There are still some new images to convert into images in xml files.
bzr revid: tde@openerp.com-20140116103910-qmm2y6kucmngplnk
2014-01-16 11:39:10 +01:00
Pooja Zankhariya (OpenERP) ba458f6abc [MERGE]Merge with Parent
bzr revid: pza@tinyerp.com-20140115123052-n9pfmaoh5jzev28d
2014-01-15 17:30:52 +05:00
Denis Ledoux 899166ecac [MERGE] Forward-port of latest 7.0 bugfixes, up to rev. 9761 revid:dle@openerp.com-20140114164804-zhfy9lb308554kp1
bzr revid: dle@openerp.com-20140114173653-xhh85ubx27uu1306
2014-01-14 18:36:53 +01:00
Olivier Dony a7cb9b762d [FIX] email_template: fix invalid uses of tools.email_split
This is necessary to have the tests pass after
the corresponding server patch in server 7.0
at revision 5198 revision-id: odo@openerp.com-20140114120344-r58wndgybqusnnq7

lp bug: https://launchpad.net/bugs/1199386 fixed
lp bug: https://launchpad.net/bugs/1165531 fixed

bzr revid: odo@openerp.com-20140114134627-6j83f4s6pvnj4uma
2014-01-14 14:46:27 +01:00
Thibault Delavallée 49c0b7a820 [MERGE] Sync with trunk
bzr revid: tde@openerp.com-20140106135700-rt0g44w5xmpbtxiu
2014-01-06 14:57:00 +01:00
Fabien Pinckaers 9cbe77bc90 [IMP] several cleaning
bzr revid: fp@tinyerp.com-20140101154754-cp4m9u84okx7m057
2014-01-01 16:47:54 +01:00
Denis Ledoux 1508c5dd00 [MERGE] Forward-port of latest 7.0 bugfixes, up to rev. 9718 rev-id: dle@openerp.com-20131224103535-rhtje7dnq1ie7jtb
bzr revid: tde@openerp.com-20131220162158-hbgktly09dv37958
bzr revid: dle@openerp.com-20131223155041-8zp8e08fihbr0ie2
bzr revid: dle@openerp.com-20131224112407-aw6dq2q92312kjbk
2013-12-24 12:24:07 +01:00
Thibault Delavallée ba73588c6c [FIX] email_template: fixed default_get, not possible ot render when we do not have any data about the record used for rendering
bzr revid: tde@openerp.com-20131217165931-muxsi0hwhihcvo1f
2013-12-17 17:59:31 +01:00
ajay javiya (OpenERP) 8f4617c335 [MERGE]: with main
bzr revid: aja@tinyerp.com-20131210050701-116a01x8r194arg2
2013-12-10 10:37:01 +05:30
Thibault Delavallée 1037874e15 [CLEAN] mail: removed modifications that have nothing to do with website in mail.js + typo introduced in a test file
bzr revid: tde@openerp.com-20131206101716-08q6f4ufhj50e239
2013-12-06 11:17:16 +01:00
ajay javiya (OpenERP) 3e5ae00690 [ADD]: Quote roller module
bzr revid: aja@tinyerp.com-20131202123437-zn6u2ckxbid3jknb
2013-12-02 18:04:37 +05:30
Thibault Delavallée 4fb0880259 [IMP] email_template: already generate tmeplate values in default_get
bzr revid: tde@openerp.com-20131120135904-r630n937txivqak9
2013-11-20 14:59:04 +01:00
Thibault Delavallée ce8c987089 [IMP] mail, email_template, mass_mailing: improvev mass mailing management in mail.compose.message + form view cleanings + some fixes in mail_mail about set_opened/replied/bounced, now checking that ids effectively exist
bzr revid: tde@openerp.com-20130910151901-nhuwvtrkbwekyh7x
2013-09-10 17:19:01 +02:00
Thibault Delavallée 9ef46123a6 [IMP] mail.compose.message, email.template: rendering is now done in batch.
Also refactored send_mail in mail.compose.message in order to be able to override
mail values without having to intefere with the send_mail behavior.

bzr revid: tde@openerp.com-20130828140929-xe9hbmbo6jxgs9mh
2013-08-28 16:09:29 +02:00
Olivier Dony c02afb45fa [MERGE] Forward-port of bugfixes from saas-1 series up to rev.8759 rev-id: odo@openerp.com-20130820152607-0p0fx87v1rqhk3vy
bzr revid: odo@openerp.com-20130820165258-3mjzbo990xg44dfu
2013-08-20 18:52:58 +02:00
Thibault Delavallée f1f2b2ba06 [IMP] mail: mail.message now has mail_server_id from template_id.
bzr revid: tde@openerp.com-20130722131725-i30xd4b03nui3hyw
2013-07-22 15:17:25 +02:00
Christophe Simonis bf29a2ebc7 [MERGE] forward port of branch 7.0 up to revid 9302 chs@openerp.com-20130718111616-apacuhc2qhquobtc
bzr revid: dle@openerp.com-20130627104833-b9zgtu8urj43f12b
bzr revid: mat@openerp.com-20130702135856-kmg7d8anw17nkbd8
bzr revid: chs@openerp.com-20130718115928-wpa84dqh8tcq31zt
2013-07-18 13:59:28 +02:00
Denis Ledoux f8480b69be [FIX]email_template: generate_email_for_composer, clean context before find or create partner, to avoid default values for partner
bzr revid: dle@openerp.com-20130716095928-z79ipwgjxw5ypg3y
2013-07-16 11:59:28 +02:00
Thibault Delavallée 62a03693a3 [FIX] mail.compose.message in email_template: var typo
bzr revid: tde@openerp.com-20130606130851-h5jswklvvz98enue
2013-06-06 15:08:51 +02:00
Thibault Delavallée 72f6a8c646 [FIX] mail.compose.message: supports user_signature of template. Note that in case of multiple wizards (send on ids that is not a singleton list), user_signature on one template is valid for all wizard.
bzr revid: tde@openerp.com-20130606123724-f7q3mwm81ek7mr5c
2013-06-06 14:37:24 +02:00
Thibault Delavallée 3adb202441 [FIX] mail.compose.message in email_template: fix model used to filter the available templates.
bzr revid: tde@openerp.com-20130425141743-gcq4wsso8jleosps
2013-04-25 16:17:43 +02:00
Thibault Delavallée f728ec93fd [FIX] email_template: fixed errors due to template_id now being a many2one, not an int anymore.
bzr revid: tde@openerp.com-20130411134119-q1o71pn34v8u49jy
2013-04-11 15:41:19 +02:00
Thibault Delavallée 4da68cbc22 [FORWARD] Forward port of addons 7.0 until revision 9008
bzr revid: tde@openerp.com-20130411124446-73gzyw3eo925w3dv
2013-04-11 14:44:46 +02:00
Raphael Collet 894eeef8e0 [MERGE] from trunk
bzr revid: rco@openerp.com-20130411073708-gaxl2332umtedmg6
2013-04-11 09:37:08 +02:00
Raphael Collet 96ad608854 [IMP] general: use registry[X] instead registry.get(X) when X is dynamic
bzr revid: rco@openerp.com-20130329143720-80pkd4csemlk1aqz
2013-03-29 15:37:20 +01:00
Thibault Delavallée 0d14fd300a [MERGE] [IMP] email_template: template_id field is now a many2one towards email.template
- changed selection field to a many2one using a domain; this
allows to edit the template while being in a composition wizard.
- improved email template and template preview form view

bzr revid: tde@openerp.com-20130329114631-fd6phvjaxojk9ja5
2013-03-29 12:46:31 +01:00
Thibault Delavallée b2fc9d75c7 [IMP] email_template_preview: improved form view.
bzr revid: tde@openerp.com-20130329112722-9aulsfcixis2id6w
2013-03-29 12:27:22 +01:00
Thibault Delavallée 56e28b9a56 [FIX] email_template: saving as template did not choose the right template.
bzr revid: tde@openerp.com-20130327151727-agbzm41sae2bsxan
2013-03-27 16:17:27 +01:00
Thibault Delavallée d8b49e6598 [IMP] email_template, template_preview: updated form views.
bzr revid: tde@openerp.com-20130327142026-kfe326abxe1myl6h
2013-03-27 15:20:26 +01:00
Turkesh Patel (Open ERP) 4da7cba96c [IMP] fix issue of many2one in footer.
bzr revid: tpa@tinyerp.com-20130322060750-f0xx5a6ih79kcw4r
2013-03-22 11:37:50 +05:30
Turkesh Patel (Open ERP) cd90ed025a [MRG] merge with lp:openobject-addons
bzr revid: tpa@tinyerp.com-20130321045350-wrm8yh6p0zywlhbb
2013-03-21 10:23:50 +05:30
Thibault Delavallée 522f144781 [CLEAN] Misc cleaning and code review before merging.
bzr revid: tde@openerp.com-20130319091844-tnpd0w8tlagcbypz
2013-03-19 10:18:44 +01:00
Thibault Delavallée 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
Thibault Delavallée f4dbf7051b [FIX] email_template: fixed behavior of email_to, email_cc, partner_to; improved form view.
bzr revid: tde@openerp.com-20130314110315-3gfl7mjj08jgqo93
2013-03-14 12:03:15 +01:00