5e8f418d41
[MERGE] Forward port of 7.0 until rev. 8534.
...
bzr revid: vmt@openerp.com-20130104093953-p92uylaux9u24isn
2013-01-04 10:39:53 +01:00
7212971359
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20121222062604-dkriii8eozvsup5y
bzr revid: launchpad_translations_on_behalf_of_openerp-20121223044904-96hdn6ba6yrv4f9j
bzr revid: launchpad_translations_on_behalf_of_openerp-20121226044702-qvjpmsxaacy1cg43
bzr revid: launchpad_translations_on_behalf_of_openerp-20121229050621-bg925wq3m04p2g71
bzr revid: launchpad_translations_on_behalf_of_openerp-20121229050125-ezgc0pyinpf7cjpa
bzr revid: launchpad_translations_on_behalf_of_openerp-20121231044027-9ufahl14z8fnhu6p
bzr revid: launchpad_translations_on_behalf_of_openerp-20130101044603-wg53ihk00q2059zn
bzr revid: launchpad_translations_on_behalf_of_openerp-20130103044748-vijpm6xa5a4wkx8s
bzr revid: launchpad_translations_on_behalf_of_openerp-20130104044725-gnjicg5umjgca6x4
bzr revid: launchpad_translations_on_behalf_of_openerp-20121227052240-6m8i7kropwavbcnh
bzr revid: launchpad_translations_on_behalf_of_openerp-20121228051144-leldhj31i0soxbew
bzr revid: launchpad_translations_on_behalf_of_openerp-20121229050213-cxzd31aqqltp6q2x
bzr revid: launchpad_translations_on_behalf_of_openerp-20121230052006-x87nblyyoe179wg8
bzr revid: launchpad_translations_on_behalf_of_openerp-20121231044049-m31tcl22nog279qx
bzr revid: launchpad_translations_on_behalf_of_openerp-20130101044622-7p5h1mf14m4tlue5
bzr revid: launchpad_translations_on_behalf_of_openerp-20130102043722-j7bk1uojgtgsz7u1
bzr revid: launchpad_translations_on_behalf_of_openerp-20130103044815-xswvowa7jeizv4jk
bzr revid: launchpad_translations_on_behalf_of_openerp-20130104044801-0v8fmmv0jl7itv9b
2013-01-04 04:48:01 +00:00
fca02afad3
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20130101051924-2q3t0sbo83ti3ooe
bzr revid: launchpad_translations_on_behalf_of_openerp-20130102052612-z5wooakbv4fnww9x
2013-01-02 05:26:12 +00:00
22808e5a81
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20121228053716-q30ba0cxw7g5wxlo
2012-12-28 05:37:16 +00:00
9b2406948e
[IMP] mail, email_template: updated tests to match the new html sanitizer, that produces slighty different results (encoded symbols, encapsulated html).
...
bzr revid: tde@openerp.com-20121226162610-y2y5bmy8bux8smkp
2012-12-26 17:26:10 +01:00
5c360f7327
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20121225044840-forvhhdzu8wfuw2y
bzr revid: launchpad_translations_on_behalf_of_openerp-20121226043938-300zdp9oob5hc6e6
2012-12-26 04:39:38 +00:00
f49cf3ad50
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20121222073731-s1qift4p97f9s1zf
bzr revid: launchpad_translations_on_behalf_of_openerp-20121223050857-vzu6pl7ttzy10603
bzr revid: launchpad_translations_on_behalf_of_openerp-20121224051043-oxj4lz3tpjhai7hn
2012-12-24 05:10:43 +00:00
94afe1ccef
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20121222060744-44at9lbhw0npx5h6
bzr revid: launchpad_translations_on_behalf_of_openerp-20121223044213-e86qkwoh0uo3cjti
bzr revid: launchpad_translations_on_behalf_of_openerp-20121224044035-1y0s4fc6ns7ytko6
2012-12-24 04:40:35 +00:00
3815d22432
[I18N] Update translation templates for latest changes - ready for 7.0 release
...
bzr revid: odo@openerp.com-20121221172005-uuwfq58gslzikygl
2012-12-21 18:20:05 +01:00
d0934da481
[FIX] mail.message: all recipients explicitly mentioned should receive a notification, including the author
...
The above revision(s) will be removed.
bzr revid: odo@openerp.com-20121220182004-460168pd9rofbpgw
2012-12-20 19:20:04 +01:00
56248183fc
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20121219051749-jfkdv3ohgd61z9pq
bzr revid: launchpad_translations_on_behalf_of_openerp-20121219052238-gjyvmd0dp8pahk2c
2012-12-19 05:22:38 +00:00
15fe515601
[MERGE] From trunk
...
bzr revid: cto@openerp.com-20121217144306-tkodwpox30cuvb28
2012-12-17 15:43:06 +01:00
7145b7f5f3
[MERGE] trunk-mako_to_jinja-rco: use Jinja2 instead of mako to render email templates (fixes security vulnerability)
...
bzr revid: rco@openerp.com-20121217102829-zzj1974m9ojdp1zy
2012-12-17 11:28:29 +01:00
a7ddf7c689
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20121217044754-0kl222skaeva43lx
bzr revid: launchpad_translations_on_behalf_of_openerp-20121216050743-iza21869j5keaqi5
bzr revid: launchpad_translations_on_behalf_of_openerp-20121217045834-1f6wbi5gkmzotgsl
2012-12-17 04:58:34 +00:00
bfb52002b6
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20121216044909-hd4l9dxtqvx85a3h
2012-12-16 04:49:09 +00:00
a261f54c82
[FIX] email_template: use urlencode to build urls, and adapt email templates;
...
also fixes incorrect usage of 'safe' in those templates"
bzr revid: rco@openerp.com-20121214090340-nd3u4ahhb4460r4q
2012-12-14 10:03:40 +01:00
90062eb86a
[MERGE] Sync with trunk. portal_security.xml file is back, holding a custom res_partner rule.
...
bzr revid: tde@openerp.com-20121214085639-8xrn4l413x1901n0
2012-12-14 09:56:39 +01:00
33463a6bc3
[IMP] account: adapt edi email template
...
bzr revid: rco@openerp.com-20121213140135-zw9zhmx85ryucn81
2012-12-13 15:01:35 +01:00
42ad6511e6
[IMP] email_template: render mako templates with jinja2 sandboxed environment
...
bzr revid: rco@openerp.com-20121213095643-czuw8ls0he5ru1lx
2012-12-13 10:56:43 +01:00
e084ed51f3
[MERGE] Latest trunk
...
bzr revid: vta@openerp.com-20121212143932-sg99mw5npppocdos
2012-12-12 15:39:32 +01:00
6f1f3b325d
[FIX] email_template: fixed tests.
...
bzr revid: tde@openerp.com-20121212114919-aj1rq1ei1b0gkm48
2012-12-12 12:49:19 +01:00
afad97f722
[IMP] Portal, now auto_install (also all of its dependencies)
...
bzr revid: vta@openerp.com-20121212112237-1uvr5kuwheyq0sri
2012-12-12 12:22:37 +01:00
fd8d728190
[MERGE] Sync with trunk.
...
bzr revid: tde@openerp.com-20121212084625-c5u7w3vh9t4rfm74
2012-12-12 09:46:25 +01:00
2e7f68e09f
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20121212043903-maiyd94p4ifgdqew
bzr revid: launchpad_translations_on_behalf_of_openerp-20121212044145-k216g0bcavdlf2o3
bzr revid: launchpad_translations_on_behalf_of_openerp-20121212045414-tgg69aaw4dz72b0p
2012-12-12 04:54:14 +00:00
0237833240
[FIX] mail.compose.message: fixed rendering when no template is chosen in the selection box; also cleaned display of recipients when using the wizard in mass mailing mode.
...
bzr revid: tde@openerp.com-20121211155435-l5s9lpghpxw8bi9o
2012-12-11 16:54:35 +01:00
cc69fe1b25
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20121211044948-8q9vf1f9ftrzq4wm
bzr revid: launchpad_translations_on_behalf_of_openerp-20121211050318-3noic2ymt0j497rw
2012-12-11 05:03:18 +00:00
e7f4891d46
[IMP] use the openerp namespace.
...
bzr revid: vmt@openerp.com-20121206145632-0h1coh5aaem65wsy
2012-12-06 15:56:32 +01:00
683f31e51b
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20121204055506-fin73s7n3o52fmuy
bzr revid: launchpad_translations_on_behalf_of_openerp-20121204055956-fsd4tp3felpk8pm5
2012-12-04 05:59:56 +00:00
308e4f1073
[I18N] Removed duplicated terms for inherited [_sql]_constraints -> 400 terms removed
...
bzr revid: odo@openerp.com-20121203162755-p71dnn0k0t2b98yp
2012-12-03 17:27:55 +01:00
828cce9be0
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20121125063324-fjz8k77annh364u7
bzr revid: launchpad_translations_on_behalf_of_openerp-20121126044235-u20vi1440dgppikf
bzr revid: launchpad_translations_on_behalf_of_openerp-20121125064209-s515ia18188hl147
bzr revid: launchpad_translations_on_behalf_of_openerp-20121126045508-rm6d2mx71a0sjqh9
2012-11-26 04:55:08 +00:00
117bf937b9
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20121124055830-p04ni2o2ogsch9zc
bzr revid: launchpad_translations_on_behalf_of_openerp-20121124065500-zwtkurcb1ic9ktqb
bzr revid: launchpad_translations_on_behalf_of_openerp-20121124070752-itto1xb6r6oao3z5
2012-11-24 07:07:52 +00:00
771b216118
[I18N] Update translation templates in preparation for 7.0 release
...
bzr revid: odo@openerp.com-20121124030804-9dvr1qwec830p8fc
2012-11-24 04:08:04 +01:00
b770240247
[MERGE] Sync with trunk
...
bzr revid: odo@openerp.com-20121120113600-4oyx9sziigbxn8w8
bzr revid: odo@openerp.com-20121120163429-l4cf6r75vwqfvxty
2012-11-20 17:34:29 +01:00
e5374b93b4
[REF] email_template: cleanup/remove obsolete fields on mail composition wizard: use_template is the default
...
bzr revid: odo@openerp.com-20121116170259-08eot6wy40yehkh4
2012-11-16 18:02:59 +01:00
8ccbab8254
[MERGE] from trunk-mail-uploader-chm
...
bzr revid: chm@openerp.com-20121116151115-1u69yio8kb1h8fjd
2012-11-16 16:11:15 +01:00
01b9f4c3ed
[MERGE] removed a few warnings.
...
bzr revid: vmt@openerp.com-20121116141517-1dwjs27cwk2nq9t4
2012-11-16 15:15:17 +01:00
0cec2d9d06
[IMP] mail.compose.message: not filter the context for attachment but overwrite the value with type=binary
...
bzr revid: chm@openerp.com-20121116114348-2g80ll85rz3ha0o2
2012-11-16 12:43:48 +01:00
2cd9443b92
[IMP] email_template: dont give mail.mail.create() an unneeded email_recipients field.
...
bzr revid: vmt@openerp.com-20121116113551-le30lwfmignrxl0e
2012-11-16 12:35:51 +01:00
c1192ec3a0
[FIX] mail.compose.message: files can be attach to a document and send by mail
...
bzr revid: chm@openerp.com-20121116111226-0xvb262et94k7omh
2012-11-16 12:12:26 +01:00
e5921325bd
[REM] mail.compose.wizard: remove unused body_text and content_subtype fields
...
These fields were used in pre-7.0 to manage the plaintext variant of the
mail being composed, but as of 7.0 the composition wizard will always
use the HTML/Rich text mode, so they can be dropped.
bzr revid: odo@openerp.com-20121115135634-fcy6mexnctwg0nxb
2012-11-15 14:56:34 +01:00
c558ac6272
[MERGE] Sync with trunk
...
bzr revid: odo@openerp.com-20121114172252-q1xj3hdugqhky532
bzr revid: odo@openerp.com-20121115135141-ia8uf5649rapj0v7
2012-11-15 14:51:41 +01:00
da9951baf9
[CLEAN] removed a commented statement, fixed a var name in js.é
...
bzr revid: tde@openerp.com-20121115124931-w20igi8qk66uvnj0
2012-11-15 13:49:31 +01:00
81d4467c8f
[REV] mail.compose.message using email_template: _reopen is back, as the spec of a wizard should be that hitting a button close it. Therefore _reopen is necessaru to reopen the wizard with its previous value, to continue working on it.
...
bzr revid: tde@openerp.com-20121115122406-d88ozw5iclsqdyff
2012-11-15 13:24:06 +01:00
45eadceea6
[FIX] email_template: udpated test according to new specs of append_content_to_html.
...
bzr revid: tde@openerp.com-20121114133438-8m1q0r02i4xory0e
2012-11-14 14:34:38 +01:00
64277d04c3
[IMP] Addons: messages when installing key apps is not of comment subtype, meaning they are effectively pushed.
...
bzr revid: tde@openerp.com-20121114115504-tvh0j9ks0jde12ed
2012-11-14 12:55:04 +01:00
fbccb823f8
[MERGE] Sync with trunk.
...
bzr revid: tde@openerp.com-20121112161523-yfp1dczcnmi85t8e
bzr revid: tde@openerp.com-20121114083900-qw40e8ii1rfl7gt1
2012-11-14 09:39:00 +01:00
f5f6547fa7
[MERGE] Sync with trunk
...
bzr revid: odo@openerp.com-20121113164544-21tmr4bmpt2n1mfl
2012-11-13 17:45:44 +01:00
ad75b35c0e
[FIX] email_template: email_recipients, when void, generate a not-void partner_ids.
...
bzr revid: tde@openerp.com-20121113141213-j2hp2bdakjb4bw8z
2012-11-13 15:12:13 +01:00
c0d3cd2f81
[REVIEW] Removed unnecessary statements.
...
bzr revid: tde@openerp.com-20121113133815-rswtzhidara3u4zt
2012-11-13 14:38:15 +01:00
b5dbc3e5b3
[IMP] email_template list view: added email_recipients field.
...
bzr revid: tde@openerp.com-20121113133534-en53nvd7td91p1bs
2012-11-13 14:35:34 +01:00
Vo Minh Thu
Launchpad Translations on behalf of openerp
Thibault Delavallée
Olivier Dony
Cecile Tonglet
Raphael Collet
Christophe Matthieu