odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity
83,235 Commits 3 Branches 0 Tags 961 MiB
Commit Graph

904 Commits

Author SHA1 Message Date
Denis Ledoux e11d1c2b7a [MERGE] forward port of branch 7.0 up to db98434 2014-12-11 12:15:09 +01:00
Ravi Gohil b035cfb7e9 [FIX] email_template: missing translations in email template 
When composing an email based on an email template, some parts of the template
(the result of name_get on fields) were not translated.
This was due to missing language in context when rendering the template.
Fixes #3708, opw 617309
 2014-12-10 15:56:57 +01:00
Denis Ledoux 7831fe631a [FIX] email_template: default model for save as new template feature 
When sending a message with the "Compose new message" button on the right of the user menu, in the top bar, if you tried to save the message as template, you had a traceback because model field of email.template is mandatory, but was set to True because there is no model in such a case.

As there is no any relevant model in such a place, and that the field is mandatory, mail.message is pretty convenient as the default value.
 2014-12-09 15:19:56 +01:00
Christophe Simonis db759948ff [MERGE] forward port of branch 7.0 up to 75d3ea6 2014-10-14 14:36:45 +02:00
Denis Ledoux 0b13f32868 [FIX] email_template: do not try to add user signature if none set 
append_content_to_html expects two strings. If the user has no signature, it returns user.signature returns False
 2014-10-14 13:41:52 +02:00
Denis Ledoux 0aa92fdb03 [FIX] email_template: a tag link rendering, do not process if no href 2014-09-09 19:17:23 +02:00
Christophe Simonis c914893f6f [MERGE] forward port of branch 7.0 up to 15ee4d8 2014-08-28 19:07:11 +02:00
Christophe Simonis 15ee4d83c9 [FIX] email_template: remove group restriction on field mail.compose.message.template_id 
This was added as a security check, but access to this field is need by the wizard itself.
As non employee users can't read/create email templates, this will not be problematic
 2014-08-28 19:04:14 +02:00
Christophe Simonis ada9724655 [MERGE] forward port of branch 7.0 up to 3509e15 2014-08-28 16:12:55 +02:00
Denis Ledoux 1f4f0c0768 [FIX] email_template: security, email_template no rights for externals 2014-08-26 17:32:04 +02:00
Olivier Dony 85d2b45aaa [I18N] Update 7.0 translations with latest changes on Launchpad 
See also https://github.com/odoo/odoo/wiki/GitHub-Transition#translations
 2014-08-14 03:38:58 +02:00
Olivier Dony 96c36e895c [I18N] Update all 7.0 translation templates with latest terms and annotations 
Total new terms: 168
Total deleted terms: 95
Total identical terms: 16329
(Some modules skipped, typically all l10n_* modules)
 2014-08-14 02:24:24 +02:00
Denis Ledoux 2c9a116c74 [MERGE] forward port of branch 7.0 up to 245bb4e 2014-08-12 14:16:35 +02:00
Denis Ledoux 245bb4ebdf [FIX] mail: to/from/reply-to addresses formated according to RFC2822 
Use formataddr method from email.utils lib, which do the job correctly
 2014-08-12 13:40:45 +02:00
Jeremy Kersten 581275a63c [IMP] email_template: add a lambda function to allow a user to format a date from a template mail into a specific timezone, and/or in a specific format. 
Eg: ${format_tz(object.name, object.employee_id.address_id.tz,'%m/%d/%Y %H:%M')}
 2014-08-07 17:38:01 +02:00
Christophe Simonis a35aec2a0b [MERGE] forward port of branch 7.0 up to 6e96ffd 2014-07-10 22:02:01 +02:00
FalcoBolger e6b6392f3a FIX email_template: Update help from lang field leading to confusion while creating a template 2014-07-10 11:28:33 +02:00
Christophe Simonis faace8493d [FIX] email_template: partners ids are integers, not strings 2014-06-01 10:52:02 +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
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
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
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
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
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
Launchpad Translations on behalf of openerp 19ba8c54c9 Launchpad automatic translations update. 
bzr revid: launchpad_translations_on_behalf_of_openerp-20140214074449-flu4n6hfh9nua9t3
bzr revid: launchpad_translations_on_behalf_of_openerp-20140214074835-2p2r1vb6ucynbspm
 2014-02-14 07:48:35 +00: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
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 ffabcd257c Launchpad automatic translations update. 
bzr revid: launchpad_translations_on_behalf_of_openerp-20140206062321-j6cpns6xz3f81net
bzr revid: launchpad_translations_on_behalf_of_openerp-20140206062510-x502ahdwzezvea54
 2014-02-06 06:25:10 +00:00
Launchpad Translations on behalf of openerp 2bebb9cd4d Launchpad automatic translations update. 
bzr revid: launchpad_translations_on_behalf_of_openerp-20140201065304-8md3g4d14l1b51ii
bzr revid: launchpad_translations_on_behalf_of_openerp-20140202060105-bnt8nw1mcbg2c3m3
bzr revid: launchpad_translations_on_behalf_of_openerp-20140203055609-uxdqgnistwilvo2v
bzr revid: launchpad_translations_on_behalf_of_openerp-20140204064835-qdcrcxldc5zsutio
 2014-02-04 06:48:35 +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
Launchpad Translations on behalf of openerp d9cdc8564c Launchpad automatic translations update. 
bzr revid: launchpad_translations_on_behalf_of_openerp-20140122061252-9jm03vlbr13ofqo9
bzr revid: launchpad_translations_on_behalf_of_openerp-20140123055652-0p71divui34v1c1q
bzr revid: launchpad_translations_on_behalf_of_openerp-20140124062440-hx0z2e4sd6nz7exc
bzr revid: launchpad_translations_on_behalf_of_openerp-20140126051449-rlunde7qysqsh1b1
bzr revid: launchpad_translations_on_behalf_of_openerp-20140125064003-v340hiykcngjg9ue
bzr revid: launchpad_translations_on_behalf_of_openerp-20140126051541-9fnyw12nex5poeth
bzr revid: launchpad_translations_on_behalf_of_openerp-20140127054606-1jb6usf6pj7gy1xl
 2014-01-27 05:46:06 +00: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
Launchpad Translations on behalf of openerp c5dd038011 Launchpad automatic translations update. 
bzr revid: launchpad_translations_on_behalf_of_openerp-20140124062506-2xq1lhj82n923dbl
 2014-01-24 06:25:06 +00:00
Turkesh Patel (Open ERP) 43ba81ad1b [IMP] use product.template model for templates 
bzr revid: tpa@tinyerp.com-20140123134233-vp52fv0e047bbfgk
 2014-01-23 19:12:33 +05:30
Martin Trigaux b25d08f917 [FIX] email_template: error message instead of traceback when sending an email from a user without user 
bzr revid: mat@openerp.com-20140122094837-a0bkx2huqvkylniy
 2014-01-22 10:48:37 +01:00