fe2ea997a2
[MERGE] Sync with trunk.
...
bzr revid: tde@openerp.com-20130411103645-rmr3sa8p9ropx2gc
2013-04-11 12:36:45 +02:00
252bcc802f
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20130330060824-pc5f2pj14gj0ak27
bzr revid: launchpad_translations_on_behalf_of_openerp-20130331055726-frtzw3gc9ut4wx4y
bzr revid: launchpad_translations_on_behalf_of_openerp-20130401053127-tolr13p1b3bhjny1
bzr revid: launchpad_translations_on_behalf_of_openerp-20130402054749-t3x0zc7qk3n4man2
bzr revid: launchpad_translations_on_behalf_of_openerp-20130330060920-k0cnlpk0rxcli841
bzr revid: launchpad_translations_on_behalf_of_openerp-20130331055741-loojniiz6du9upat
bzr revid: launchpad_translations_on_behalf_of_openerp-20130401053211-yvt1h32v41rs6jje
bzr revid: launchpad_translations_on_behalf_of_openerp-20130402054814-fwg742kzhsupr6kc
bzr revid: launchpad_translations_on_behalf_of_openerp-20130329051100-3ul1k4qwwm2f49gt
bzr revid: launchpad_translations_on_behalf_of_openerp-20130330060923-wch1f8ndmb15nu6x
bzr revid: launchpad_translations_on_behalf_of_openerp-20130331055759-aj1nc93t9420lov0
bzr revid: launchpad_translations_on_behalf_of_openerp-20130401053215-kqqgqefzp95fa1tk
bzr revid: launchpad_translations_on_behalf_of_openerp-20130402054817-k33rri349nc2ioiz
2013-04-02 05:48:17 +00:00
7a8d71be6d
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20130329050903-yuxb08q83hlvg6ok
2013-03-29 05:09:03 +00:00
fc04522286
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20130328060500-yc40z00ubsz154vw
2013-03-28 06:05:00 +00:00
e3ac95411a
[MERGE] Sync with 7.0
...
bzr revid: tde@openerp.com-20130319100303-ck8q56i70faasod1
2013-03-19 11:03:03 +01:00
9485c49f4f
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20130316063604-hv8xtn4g8e76no72
bzr revid: launchpad_translations_on_behalf_of_openerp-20130317053030-q0f5iyfhv4qtah18
bzr revid: launchpad_translations_on_behalf_of_openerp-20130318052217-ua2ev323qlvhi8l2
2013-03-18 05:22:17 +00:00
70ce1e5eb4
[FIX] Fixed forgotten conflict when merging trunk.
...
bzr revid: tde@openerp.com-20130314085315-m4didtupt20gmkyv
2013-03-14 09:53:15 +01:00
272501d66c
[MERGE] Sync with 7.0
...
bzr revid: tde@openerp.com-20130314082535-6fdvgnernmbo1liw
2013-03-14 09:25:35 +01:00
cdb474f179
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20130314053439-q79rdq445kptn3nn
2013-03-14 05:34:39 +00:00
93d815efab
[CLEAN] crm, res_partner: added name on added filters; added oline breaks in big help of notification_email_send.
...
bzr revid: tde@openerp.com-20130313125124-wbu17isbi6cay100
2013-03-13 13:51:24 +01:00
ecd460e0d5
[IMP] email_template: improved help for email_from.
...
bzr revid: tde@openerp.com-20130313121659-pvdy814zoq9zonf2
2013-03-13 13:16:59 +01:00
3dc1a58ed5
[FIX] crm, email_template: fixed help messages talking about partners and leads instead of leads and partners... well, I think this comment is not very understandable, but at least there is a commit message. Horray.
...
bzr revid: tde@openerp.com-20130313121221-lo0kmkt2lltyr94e
2013-03-13 13:12:21 +01:00
fdf7410acf
[FIX] crm, res_partner: added separator in search views after adding not opt-out filter.
...
bzr revid: tde@openerp.com-20130313115901-s60j69qn3e3q4bpk
2013-03-13 12:59:01 +01:00
2f4a59fd06
[IMP] email_template, crm: added forgotten filters for opt-out; cleaned help of opt-out; email body is back into internal note as it has been decided that it was too much change for 7.0, especially that email content parsing is not robust enough.
...
bzr revid: tde@openerp.com-20130313112013-veqzplextey1300p
2013-03-13 12:20:13 +01:00
edc5f2fc43
[MERGE] Sync with trunk.
...
bzr revid: tde@openerp.com-20130312141047-tiga9bhz3m3wc2qr
2013-03-12 15:10:47 +01:00
a2a8c238dc
[CLEAN] email_template: removed a print statement.
...
bzr revid: tde@openerp.com-20130311124254-xzxs1r6cnqw2zxxc
2013-03-11 13:42:54 +01:00
86d71c9a52
[MERGE] Sync with trunk.
...
bzr revid: tde@openerp.com-20130308125916-s0zfujfgxme1aak1
bzr revid: tde@openerp.com-20130311090134-m022fovlmpcm6dom
2013-03-11 10:01:34 +01:00
c5319f47f7
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20130309053740-hrhdafa05mp0s6cd
bzr revid: launchpad_translations_on_behalf_of_openerp-20130310051349-azaf8kb3hdi6ux85
bzr revid: launchpad_translations_on_behalf_of_openerp-20130311054204-8yc0hga0v6pkk36x
bzr revid: launchpad_translations_on_behalf_of_openerp-20130309053843-8x3181swnc2x0rim
bzr revid: launchpad_translations_on_behalf_of_openerp-20130310051523-z6034cfpv1qbztzx
bzr revid: launchpad_translations_on_behalf_of_openerp-20130311054303-38ti3nq1h5jfbasa
bzr revid: launchpad_translations_on_behalf_of_openerp-20130309053849-8eqsc9sjxknzfha8
bzr revid: launchpad_translations_on_behalf_of_openerp-20130310051527-tajzx0x6p7mzpg43
bzr revid: launchpad_translations_on_behalf_of_openerp-20130311054307-qgl6ao1a06b9an3a
2013-03-11 05:43:07 +00:00
d130a05e8c
[FIX] crm, email_template: opt_out parameter used only for mass mailing and marketing campaigns. Updated help accordingly.
...
bzr revid: tde@openerp.com-20130308124753-dzt5e5nf7zpaq2dk
2013-03-08 13:47:53 +01:00
22bba15ccd
[FIX] email_template: on_change values for m2m can be list of ids, not necessarily commands.
...
bzr revid: tde@openerp.com-20130308124341-ih0f4us81cffer7m
2013-03-08 13:43:41 +01:00
5ebf390f96
[FIX] email_template: void value in partner_ids when generating tmeplate does not erase wizard value anymore.
...
bzr revid: tde@openerp.com-20130308091156-ytw5k4y5w321705f
2013-03-08 10:11:56 +01:00
cc87ba5db7
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20130308052354-6aerviht20qnfh26
bzr revid: launchpad_translations_on_behalf_of_openerp-20130308060553-lujyj3qxhqljssu0
bzr revid: launchpad_translations_on_behalf_of_openerp-20130308060749-69tgopwkctb0v5ei
2013-03-08 06:07:49 +00:00
2a849670f4
[IMP] email_template: from and subject are not required anymore, because they can have now defautl values using chatter.
...
bzr revid: tde@openerp.com-20130307165045-dihvsdo3whgsk05b
2013-03-07 17:50:45 +01:00
2da3ea2d62
[IMP] email_template: added _order as name.
...
bzr revid: tde@openerp.com-20130307165014-gv2gmfh9d1nvjy9h
2013-03-07 17:50:14 +01:00
1aac220ee2
[IMP] mail: tests: updated tests for attachments
...
bzr revid: tde@openerp.com-20130307110657-1cdelhyd1girmp28
2013-03-07 12:06:57 +01:00
1e5a3aa787
[I18N] *: update translation templates for latest term changes due to bug fixes
...
bzr revid: odo@openerp.com-20130307121934-jfwfl1q0jtvswe0c
2013-03-07 13:19:34 +01:00
4665d10f05
[IMP] mail, email_template: better consistence of mail.compose.message mdoel ans 0 or res_id res_id for attachments on composer; generate_email_for_composer should avoid returning keys for void values.
...
bzr revid: tde@openerp.com-20130306134612-yazwi6cgwvw8suyw
2013-03-06 14:46:12 +01:00
f789005c9a
[REV] email_template: send_mail: back to 2-steps creation, because attachments have to be garbage-collected, and not attached to the document.
...
bzr revid: tde@openerp.com-20130306134410-mw9hau809qh1nbqh
2013-03-06 14:44:10 +01:00
7999477d63
[MERGE] Sync with 7.0
...
bzr revid: tde@openerp.com-20130304092317-if7mytrydtktosif
bzr revid: tde@openerp.com-20130305080230-r5zreeqwr6sznxt4
bzr revid: tde@openerp.com-20130306112600-57feml4i8f5snad2
2013-03-06 12:26:00 +01:00
420f82ec0e
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20130305053802-13krr4lhrwrebwak
bzr revid: launchpad_translations_on_behalf_of_openerp-20130305053905-y30zk4dbbcc3qj4b
2013-03-05 05:39:05 +00:00
c7d8842b02
[IMP] mail, email_template: fixed attachment management (template does not override provided attachments anymore; fixed possible unexisting attachment ids key; fixed some duplication.
...
bzr revid: tde@openerp.com-20130304092248-mqadzmrhgdu58j8y
2013-03-04 10:22:48 +01:00
03ad9f7290
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20130302052257-0w9v71dump44rtov
bzr revid: launchpad_translations_on_behalf_of_openerp-20130303052333-9kn24ocknaagn33h
bzr revid: launchpad_translations_on_behalf_of_openerp-20130304055956-54bietn1iazrisga
2013-03-04 05:59:56 +00:00
46a5b63cad
[IMP] email_template: better management of attachments. In mass mail, we want attachments to be duplicated due to the ownership concept of attachments in OpenERP.
...
bzr revid: tde@openerp.com-20130301144827-762362bgng5m4nye
2013-03-01 15:48:27 +01:00
df6a3997c2
[MERGE] Sync with 7.0
...
bzr revid: tde@openerp.com-20130301111146-1s5ckk09wdt88vb4
2013-03-01 12:11:46 +01:00
ece4451176
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20130301053921-r8m4764fosovd9h6
bzr revid: launchpad_translations_on_behalf_of_openerp-20130301054021-crdgcw5mb7m77u0t
2013-03-01 05:40:21 +00:00
aa865c8b61
[FIX] Still fixing attachments through templates.
...
bzr revid: tde@openerp.com-20130228145513-6g30ujr3cm0j8b3u
2013-02-28 15:55:13 +01:00
d6fcee5a4f
[FIX] email-template: attachments should have correct model and res_id from template.
...
bzr revid: tde@openerp.com-20130228144630-7x6kh5jcn4w557do
2013-02-28 15:46:30 +01:00
cca0846804
[FIX] email_template: fixed attachments management in send_mail.
...
bzr revid: tde@openerp.com-20130228134901-ibtnt2zl4yne7o4n
2013-02-28 14:49:01 +01:00
afbb5816e3
[FIX] email_template: fixed previous patch, wrong var name.
...
bzr revid: tde@openerp.com-20130228133633-1ur9jbqw021yoork
2013-02-28 14:36:33 +01:00
b0eb876160
[FIX] mail: first try to fix attachment duplication.
...
bzr revid: tde@openerp.com-20130228132625-8yjggruhrvbvep21
2013-02-28 14:26:25 +01:00
be867174aa
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20130228053125-9y59zz3w45ata4c1
2013-02-28 05:31:25 +00:00
99f63ac1f8
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20130222054434-bf66ye8z35023vi5
2013-02-22 05:44:34 +00:00
5dbc1b787e
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20130215052434-vl34xg5zfo9c7wny
bzr revid: launchpad_translations_on_behalf_of_openerp-20130216054019-5mij5aoepxhf3zoy
bzr revid: launchpad_translations_on_behalf_of_openerp-20130216053913-zj2b2x6ll2ok19in
bzr revid: launchpad_translations_on_behalf_of_openerp-20130217052310-9912kfq4cxc7k7fv
bzr revid: launchpad_translations_on_behalf_of_openerp-20130218052538-tly4emi0bggrlp8h
bzr revid: launchpad_translations_on_behalf_of_openerp-20130216054015-2uthx4z6mfqwrbrt
bzr revid: launchpad_translations_on_behalf_of_openerp-20130217052400-07m6wixrfaq58l2k
bzr revid: launchpad_translations_on_behalf_of_openerp-20130218052624-0mh8rmv7upyxmpg9
2013-02-18 05:26:24 +00:00
f392f09d49
[FIX] mail: fixed tests.
...
bzr revid: tde@openerp.com-20130214111230-evgwyw9xofiq8mgn
2013-02-14 12:12:30 +01:00
9173e032ec
[IMP] email_template: updated mail-related tests.
...
bzr revid: tde@openerp.com-20130214083516-olpnt3ol7ry5vwkj
2013-02-14 09:35:16 +01:00
efedfde1bd
[FIX] email_template: template does not erase the wizard content anymore.
...
bzr revid: tde@openerp.com-20130213173940-ut3ff921aocgw2rf
2013-02-13 18:39:40 +01:00
996746634f
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20130205052331-pkjgm8c2lnxld0x6
2013-02-05 05:23:31 +00:00
688bb77d95
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20130124053511-cxfjeh7rfwridjv1
bzr revid: launchpad_translations_on_behalf_of_openerp-20130124053515-bl01lm43wsqnoenv
2013-01-24 05:35:15 +00:00
7a49719d46
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20130118071051-e8wytix67wlb17yd
2013-01-18 07:10:51 +00:00
567946664b
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20130112054058-8axv6o0qb0xnmx0w
bzr revid: launchpad_translations_on_behalf_of_openerp-20130113052752-ek3mq7hoe2mj4zyt
bzr revid: launchpad_translations_on_behalf_of_openerp-20130114051817-ltnyu6jl4nxctf8t
2013-01-14 05:18:17 +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
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
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
7d61ca8ce4
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20130323115615-krcv2a9xc7p7lee2
bzr revid: launchpad_translations_on_behalf_of_openerp-20130324051143-eb5ailcthtjlwt9u
bzr revid: launchpad_translations_on_behalf_of_openerp-20130325052408-askn9sxc1bzk1366
2013-03-25 05:24:08 +00:00
a02f54e702
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20130322053516-l2f6sdm3o3sp02t1
2013-03-22 05:35:16 +00:00
4083df915f
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20130321050259-e16287z7tx5x2hr1
bzr revid: launchpad_translations_on_behalf_of_openerp-20130321050350-7j423tm3q7n124on
bzr revid: launchpad_translations_on_behalf_of_openerp-20130321050354-6gc2gobnj24c9gso
2013-03-21 05:03:54 +00: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
5baafe992b
[REV] [IMP] email_template tests: reverted CHM changes about adding self everywhere; cleaned the new test.
...
bzr revid: tde@openerp.com-20121113131044-0z0286izrw35w6f1
2012-11-13 14:10:44 +01:00
Thibault Delavallée
Launchpad Translations on behalf of openerp
Olivier Dony
Cecile Tonglet
Raphael Collet
Vo Minh Thu
Christophe Matthieu