Commit Graph

932 Commits

Author SHA1 Message Date
jke-openerp 6bb986a2e5 [FIX] Fix according to APR's Review
- Access Right too restrictif for user
- Bug UI between Firefox and Chrome
- Bug UI many2many_tag cursor on bullet
- Temp Fix on email_template to manage partner_to
- Manage attendee from hr_holidays 
- Manage avatar_model in sidebar_items for filter (res.partner was hard coded)
- Remove quick add from HR-holiday, because some field (as day) is calculated on event "onchange"

bzr revid: jke@openerp.com-20131220141855-mbhxtr07fn0sroe0
2013-12-20 15:18:55 +01:00
jke-openerp 4a1208b39b [IMP] Redo tuto to get api key, because Google have changed console UI during the dev
bzr revid: jke@openerp.com-20131219174536-msjd005fxhxgl9qq
2013-12-19 18:45:36 +01:00
jke-openerp a6a5278747 [FIX] Partner_to changed form template to be a python list and not a list of int separed by comma
bzr revid: jke@openerp.com-20131219152801-e70jmpfw10vf6ruy
2013-12-19 16:28:01 +01:00
jke-openerp 306dd6e397 [IMP] Add span with class for footer received in mail
[FIX] convert partner_to  from template_mail (string with comma) to recipent_ids (list of partner_id) in model mail_mail

bzr revid: jke@openerp.com-20131219133144-zbt100e8030wd927
2013-12-19 14:31:44 +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
Launchpad Translations on behalf of openerp a092227c6e Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20131207063209-2xi8ba5wu6l6ze00
bzr revid: launchpad_translations_on_behalf_of_openerp-20131208054536-mg4w4d6ljq8ji1nj
bzr revid: launchpad_translations_on_behalf_of_openerp-20131207063232-l64v1fhf1qcpxm2l
bzr revid: launchpad_translations_on_behalf_of_openerp-20131208054646-zixed7abpuze4qt1
bzr revid: launchpad_translations_on_behalf_of_openerp-20131123062625-f7inv72rtg2kel8g
bzr revid: launchpad_translations_on_behalf_of_openerp-20131124054801-1ukcpelfukkvwn60
bzr revid: launchpad_translations_on_behalf_of_openerp-20131125060120-nm8tkfbftg8c88v1
bzr revid: launchpad_translations_on_behalf_of_openerp-20131126060753-jnx5ran2accmo0lh
bzr revid: launchpad_translations_on_behalf_of_openerp-20131127054000-wtg675pf33f3bkar
bzr revid: launchpad_translations_on_behalf_of_openerp-20131129053028-abszdj4y76smnacb
bzr revid: launchpad_translations_on_behalf_of_openerp-20131201054555-3u1m1sy1f2og78nn
bzr revid: launchpad_translations_on_behalf_of_openerp-20131202055227-mm70khzdfnp4qcj9
bzr revid: launchpad_translations_on_behalf_of_openerp-20131207063237-vza5vb51xmd2ipl6
bzr revid: launchpad_translations_on_behalf_of_openerp-20131208054653-f4zth8j3iczlzcqz
2013-12-08 05:46:53 +00:00
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
Christophe Matthieu fd2821086f [MERGE] sync with trunk
bzr revid: chm@openerp.com-20131202150925-eqsi0uu0fqtwimhj
2013-12-02 16:09:25 +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
Christophe Simonis 289023d92f [MERGE] forward port of branch saas-2 up to revid 9024 chs@openerp.com-20131130130014-hi5h5a00kjx0dbvp
It’s over NINE THOUSAAAAAAAND!

bzr revid: chs@openerp.com-20131130130725-9ntxdr5r7r04uoht
2013-11-30 14:07:25 +01:00
Thibault Delavallée f2c23488c3 [FIX] email_template: fixing to have the correct report suppose to correctly fix. So, fix the fix to fix it
bzr revid: tde@openerp.com-20131126120843-gt8vdhl3yn61vd8r
2013-11-26 13:08:43 +01:00
Thibault Delavallée 6f322004cc [FIX] email_template: when generating reports
in batch, update the values for all res_ids, not only the
last one of the current template.

bzr revid: tde@openerp.com-20131126110742-aecac7r0zyappo0a
2013-11-26 12:07:42 +01:00
Christophe Simonis bb1e256f5b [MERGE] forward port of branch saas-2 up to revid 9010 dle@openerp.com-20131125143003-vjtzj1c5051pdnk3
bzr revid: chs@openerp.com-20131125150054-b135qshkx6icakgk
2013-11-25 16:00:54 +01:00
Launchpad Translations on behalf of openerp 271ed43e7b Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20131121054848-007arsnnoa8fs65e
bzr revid: launchpad_translations_on_behalf_of_openerp-20131121063838-blqn6j0yfmrlw5vp
2013-11-21 06:38:38 +00:00
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
Launchpad Translations on behalf of openerp 17fe569269 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20131119052725-2fcjekn5ouumctna
bzr revid: launchpad_translations_on_behalf_of_openerp-20131120052525-2pwf2q3wdcrbqics
2013-11-20 05:25:25 +00:00
Denis Ledoux f0ee6bac0a [FIX]email_template: render_template_batch return a dict, so we must get the right id of the dict to get the lang
bzr revid: dle@openerp.com-20131118163114-rpmyjik1dkjuipez
2013-11-18 17:31:14 +01:00
Denis Ledoux 4dfe327be5 [FIX]email_template: fixed call to render_template_batch using a list of ids instead of only one id.
bzr revid: dle@openerp.com-20131118150129-log6925i4kc3dkxq
2013-11-18 16:01:29 +01:00
Launchpad Translations on behalf of openerp 08abc4345a Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20131112054140-gta82n1b3iww6qy5
bzr revid: launchpad_translations_on_behalf_of_openerp-20131031051733-nnutbi7hidixsxsb
bzr revid: launchpad_translations_on_behalf_of_openerp-20131102055746-d0emb2aocq3sq1d1
bzr revid: launchpad_translations_on_behalf_of_openerp-20131103052149-y4usleohxatdgczx
bzr revid: launchpad_translations_on_behalf_of_openerp-20131105052928-1izkptj5zusflrvb
bzr revid: launchpad_translations_on_behalf_of_openerp-20131108054204-hrtuxxze2u1ivvez
bzr revid: launchpad_translations_on_behalf_of_openerp-20131110055420-zl5ang9w8lbcvt9d
bzr revid: launchpad_translations_on_behalf_of_openerp-20131111051738-smtttsszytn06ld4
bzr revid: launchpad_translations_on_behalf_of_openerp-20131112054158-7ewd3oxiyxg8s4zw
2013-11-12 05:41:58 +00:00
Launchpad Translations on behalf of openerp 108ccbf108 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20131114062958-ies8xa3pft7n59ms
bzr revid: launchpad_translations_on_behalf_of_openerp-20131106055135-r0xt2vr04710jh1t
bzr revid: launchpad_translations_on_behalf_of_openerp-20131107055120-r8z445ergt50erlx
bzr revid: launchpad_translations_on_behalf_of_openerp-20131108062620-bvfofx1jl1wb1csh
bzr revid: launchpad_translations_on_behalf_of_openerp-20131110064525-ioceogsmu0nmx2qj
bzr revid: launchpad_translations_on_behalf_of_openerp-20131111053908-gbrp09ast5fhr6iw
bzr revid: launchpad_translations_on_behalf_of_openerp-20131112062316-5uf2bvbzdhkq1b7k
bzr revid: launchpad_translations_on_behalf_of_openerp-20131113060841-bkjcuz4e9rtzn6f9
bzr revid: launchpad_translations_on_behalf_of_openerp-20131114063058-rrm2q5lxkyawuvpz
2013-11-14 06:30:58 +00:00
Launchpad Translations on behalf of openerp 566af6033f Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20131011052941-f4x7ued38x0siu4u
bzr revid: launchpad_translations_on_behalf_of_openerp-20131013053842-x6nja74l8by5vd1q
bzr revid: launchpad_translations_on_behalf_of_openerp-20131014053313-j22u5qen55na9js8
2013-10-14 05:33:13 +00:00
Thibault Delavallée bdd86a831f [IMP] ir_actions in email_template: template_id domain not only on view, directly on field
bzr revid: tde@openerp.com-20131003140458-ztnd9taih2rcq8ty
2013-10-03 16:04:58 +02:00
Thibault Delavallée fed1b1e91c [REF] ir_actions in email_template: strange implementation of displaying template values based on copying fields
replaced by a standard related fields + using an onchange on the template.

bzr revid: tde@openerp.com-20131003133357-hbs35e3h4mleg9v5
2013-10-03 15:33:57 +02:00
Launchpad Translations on behalf of openerp c7471d1bff Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20130919045624-x71znzpi3rpnvpcs
bzr revid: launchpad_translations_on_behalf_of_openerp-20130920060145-80h8zse3uw3jg2fx
2013-09-20 06:01:45 +00:00
Thibault Delavallée d23f15e1b2 [MERGE] Sunc with trunk
bzr revid: tde@openerp.com-20130916092213-iuzc7lu5q0rc3hjm
2013-09-16 11:22:13 +02:00
Launchpad Translations on behalf of openerp bc0d066505 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20130914054213-dq0kt273ooy6fozn
bzr revid: launchpad_translations_on_behalf_of_openerp-20130915055539-hzmy1ws1il6z8fji
bzr revid: launchpad_translations_on_behalf_of_openerp-20130915054954-zisp7huxai3ew84l
bzr revid: launchpad_translations_on_behalf_of_openerp-20130916054225-m0j262vooofcavqz
bzr revid: launchpad_translations_on_behalf_of_openerp-20130917043759-tke0eln0ca01hsm7
2013-09-17 04:37:59 +00:00
Launchpad Translations on behalf of openerp 07f41591af Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20130914055308-488d7jp6pk12s4oq
bzr revid: launchpad_translations_on_behalf_of_openerp-20130915061118-idedxdulpa7nb0s0
bzr revid: launchpad_translations_on_behalf_of_openerp-20130916061418-3r990vgrtgj1quyt
2013-09-16 06:14:18 +00:00
Thibault Delavallée 22822d994b [MERGE] Sync with trunk
bzr revid: tde@openerp.com-20130912074055-7wari7rupipuqk17
2013-09-12 09:40:55 +02:00
Launchpad Translations on behalf of openerp 9dba69ba48 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20130912064018-3vecn03jcu9fm1m8
2013-09-12 06:40:18 +00: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
Christophe Simonis 3fa90321e1 [MERGE] forward port of branch saas-1 up to revid 8772 chs@openerp.com-20130910122113-171osvcukxffxcry
bzr revid: chs@openerp.com-20130910124803-wxkb8gkz1tub5qjf
2013-09-10 14:48:03 +02:00
Thibault Delavallée c063f54691 [IMP] mail: in mass mail mode, default value is now to send emails, not to perform a mass post on documents.
bzr revid: tde@openerp.com-20130910124754-jssus6l43nil4qad
2013-09-10 14:47:54 +02:00
Thibault Delavallée 38e75127d9 [MERGE] Syn with trunk
bzr revid: tde@openerp.com-20130906081534-n273weq3h1fvfh2b
2013-09-06 10:15:34 +02:00
Launchpad Translations on behalf of openerp cb8f9c5a0d Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20130903054857-i15nhvtthlho7chm
2013-09-03 05:48:57 +00: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
Thibault Delavallée b35a44f66d [IMP] mail_mail, mail_message: various improvements to try to improve message creation time
Replaced some read by browse
Moved get_reply_to from mail_mail to mail_message
Hint: specifying email_from, reply_to help to enhance computation time

[REF] mail: cleaned some tests, renamed a file, moved mail_group tests into a dedicated file

bzr revid: tde@openerp.com-20130827133058-ko0g0ib0f0jihmdk
2013-08-27 15:30:58 +02:00
Olivier Dony 20e5751e62 [IMP] email_template: add `datetime` and `dateutil.relativedelta` in the global rendering context for templates
The `dateutil` package is not included directly in the globals because
`dateutil.relativedelta.relativedelta` is an old-style class and jinja2
does not appear to support instantiating old-style classes within an
expression, so `relativedelta` support is provided using a "lambda proxy".

bzr revid: odo@openerp.com-20130826124405-bixzwyhl65c7v75b
2013-08-26 14:44:05 +02:00
Launchpad Translations on behalf of openerp 2cec1eb045 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20130822054004-iy1tgkww8vf91e5g
bzr revid: launchpad_translations_on_behalf_of_openerp-20130823055241-t379yr3ksuppirw0
2013-08-23 05:52:41 +00: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
Launchpad Translations on behalf of openerp 0e74fd31a4 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20130815055122-qjjh1oa8122npkdt
bzr revid: launchpad_translations_on_behalf_of_openerp-20130816060311-osd5epg0pjqggizo
bzr revid: launchpad_translations_on_behalf_of_openerp-20130817061650-b596lee67z2gon1h
bzr revid: launchpad_translations_on_behalf_of_openerp-20130818050503-e1c1ferew0px4k1y
bzr revid: launchpad_translations_on_behalf_of_openerp-20130819045737-ef63g3nwk154ezyw
2013-08-19 04:57:37 +00:00
Launchpad Translations on behalf of openerp c46331a3ca Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20130729055508-7yza7v2jdny1gear
bzr revid: launchpad_translations_on_behalf_of_openerp-20130730045810-58du4wi80axs0t81
bzr revid: launchpad_translations_on_behalf_of_openerp-20130806050509-v64stuiemu934s7t
bzr revid: launchpad_translations_on_behalf_of_openerp-20130809053600-ssuy8yhd6ve9cse6
bzr revid: launchpad_translations_on_behalf_of_openerp-20130810053806-gx2uwr6zoit4zow2
bzr revid: launchpad_translations_on_behalf_of_openerp-20130811050026-l3omk3m8v7f34dnu
bzr revid: launchpad_translations_on_behalf_of_openerp-20130810053803-dm8ugwnibrznai0t
bzr revid: launchpad_translations_on_behalf_of_openerp-20130811050015-lmxdgm6fks2fyzoe
bzr revid: launchpad_translations_on_behalf_of_openerp-20130812050650-ta4kndyaxthut4tv
2013-08-12 05:06:50 +00:00
Launchpad Translations on behalf of openerp 20a0428e6f Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20130726054722-d69j4mwclp38job7
bzr revid: launchpad_translations_on_behalf_of_openerp-20130727052743-v62n9j5jvp11j2ji
bzr revid: launchpad_translations_on_behalf_of_openerp-20130728063405-ksa7gfbj9k4hajaj
bzr revid: launchpad_translations_on_behalf_of_openerp-20130729055426-094ilqmvjoocrzmm
bzr revid: launchpad_translations_on_behalf_of_openerp-20130727052813-u58hk431f664vao7
bzr revid: launchpad_translations_on_behalf_of_openerp-20130728063427-t032j0icp8pkksol
bzr revid: launchpad_translations_on_behalf_of_openerp-20130729055503-id0512tblbixh8to
2013-07-29 05:55:03 +00:00
Thibault Delavallée 3770ec073e [DOC] mail, email_template: added changelog
bzr revid: tde@openerp.com-20130726115918-5g4sfapjql4hs7zr
2013-07-26 13:59:18 +02:00
Thibault Delavallée d83c7aeccc [MERGE] Sync with trunk
bzr revid: tde@openerp.com-20130725135057-a8m4pxqjbwnxzvs3
bzr revid: tde@openerp.com-20130726102342-1luyh4sh6rbziev4
2013-07-26 12:23:42 +02:00
Thibault Delavallée d758de88f0 [IMP] email_template: server action: better management of template fields, saved but not editable
bzr revid: tde@openerp.com-20130726093335-vxniwn121djpaw32
2013-07-26 11:33:35 +02:00
Thibault Delavallée c4210aeeb0 [FIX] email_template: ir_actions: fixed email server action form view, a copy and paste introduced an error
bzr revid: tde@openerp.com-20130726091212-kzt029fechedq0yp
2013-07-26 11:12:12 +02:00
Thibault Delavallée 1dff0b7c4f [DOC] email_template: added changelod
bzr revid: tde@openerp.com-20130726081825-xmq8agjvph3trb7t
2013-07-26 10:18:25 +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
Launchpad Translations on behalf of openerp 08bf51a608 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20130719063647-ajybj58frejzmzi1
bzr revid: launchpad_translations_on_behalf_of_openerp-20130720062338-fgevfrm113ns9ohh
bzr revid: launchpad_translations_on_behalf_of_openerp-20130722055949-auzq29nv6b2f3o10
2013-07-22 05:59:49 +00: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 8aeba8a3a3 [ADD] email_template: added support for 'email' server action.
Email server action are now entirely based on templates.
Added tests.

bzr revid: tde@openerp.com-20130715152516-69gokja8u0afgfh8
2013-07-15 17:25:16 +02:00
Launchpad Translations on behalf of openerp d1a4e0aef0 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20130711062622-v4muic3uqckueux5
bzr revid: launchpad_translations_on_behalf_of_openerp-20130712063505-m63repwd0zokfibu
bzr revid: launchpad_translations_on_behalf_of_openerp-20130713063525-b30s09rh63t3zox4
bzr revid: launchpad_translations_on_behalf_of_openerp-20130714055943-xf6jvk2dpoemt6qx
bzr revid: launchpad_translations_on_behalf_of_openerp-20130715051357-59o0nkhplh3e58mi
bzr revid: launchpad_translations_on_behalf_of_openerp-20130704054706-ace1fcr1vtruoc4s
bzr revid: launchpad_translations_on_behalf_of_openerp-20130705061311-4735gtnj7xjmuprg
bzr revid: launchpad_translations_on_behalf_of_openerp-20130712063510-g2yq0kxqgrx9x1df
bzr revid: launchpad_translations_on_behalf_of_openerp-20130713063533-7mjj5a7226xhtob6
bzr revid: launchpad_translations_on_behalf_of_openerp-20130714055945-h6jn755mtdcubvei
bzr revid: launchpad_translations_on_behalf_of_openerp-20130715051400-rra06yzfd7zw4bt0
2013-07-15 05:14:00 +00:00
Launchpad Translations on behalf of openerp 89bc6e5e73 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20130622062505-fobx7ncp6bkpouyt
bzr revid: launchpad_translations_on_behalf_of_openerp-20130623055452-s77jlu7z6kvjbdlz
bzr revid: launchpad_translations_on_behalf_of_openerp-20130624052557-hsaix5c3fu6opbva
2013-06-24 05:25:57 +00:00
Launchpad Translations on behalf of openerp 3e269d1572 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20130614070428-by6oo1fc0hvfoqc8
bzr revid: launchpad_translations_on_behalf_of_openerp-20130615061319-hikvcj42kmv0fwla
bzr revid: launchpad_translations_on_behalf_of_openerp-20130616053220-l2jj1f2bfhr8s95f
bzr revid: launchpad_translations_on_behalf_of_openerp-20130617062045-ydm23y8oyqt85r6d
bzr revid: launchpad_translations_on_behalf_of_openerp-20130618065045-8n040l4nl7inbsho
bzr revid: launchpad_translations_on_behalf_of_openerp-20130619061621-p7u5tapogm5ao1o2
bzr revid: launchpad_translations_on_behalf_of_openerp-20130620063408-j244y20qpy61d6dn
bzr revid: launchpad_translations_on_behalf_of_openerp-20130615062054-6zhgccaoectf2c0d
bzr revid: launchpad_translations_on_behalf_of_openerp-20130616053235-3eimstk0anu72x9m
bzr revid: launchpad_translations_on_behalf_of_openerp-20130617062114-7wts3fyy6vgqzt8v
bzr revid: launchpad_translations_on_behalf_of_openerp-20130618065127-8w5xbiwnnza5vlo1
bzr revid: launchpad_translations_on_behalf_of_openerp-20130619061719-63jsadfrb1yoqtgz
bzr revid: launchpad_translations_on_behalf_of_openerp-20130620063509-1xk30ymo1f7nn4h0
2013-06-20 06:35:09 +00:00
Christophe Simonis aa133b4d29 [MERGE] forward port of branch saas-1 up to revid 8745 chs@openerp.com-20130613181503-82234mo34wxb0oap
bzr revid: chs@openerp.com-20130614091924-z5ta02kwhmwcrgox
2013-06-14 11:19:24 +02:00
Christophe Simonis 448e19e550 [FIX] email_template: correct creation/deletion of context action
bzr revid: chs@openerp.com-20130613143931-tpnx0diyvkovr2xe
2013-06-13 16:39:31 +02:00
Launchpad Translations on behalf of openerp 3a296f5386 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20130608070127-tu3wr0ejaojeuizk
bzr revid: launchpad_translations_on_behalf_of_openerp-20130609061554-vunz3dsqv73j8io4
bzr revid: launchpad_translations_on_behalf_of_openerp-20130608074839-suk66wcjidodrzyu
bzr revid: launchpad_translations_on_behalf_of_openerp-20130609061704-e1t9mv2alygf4g38
bzr revid: launchpad_translations_on_behalf_of_openerp-20130608075116-643xgspj93t8g1y9
bzr revid: launchpad_translations_on_behalf_of_openerp-20130609061708-y08i6exqm5v36qg7
2013-06-09 06:17:08 +00:00
Olivier Dony 8c33eb76e1 [I18N] Synchronize translation templates with latest source code
bzr revid: odo@openerp.com-20130607194309-eysyrkxpr0dukm07
2013-06-07 21:43:09 +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 b3cde8da4a [FIX] email_template: allow to define context action even without having create access on ir.values and ir.action
Hint: look for backport into 7.0

bzr revid: tde@openerp.com-20130606123415-vuelai2eh1yy3c87
2013-06-06 14:34:15 +02:00
Launchpad Translations on behalf of openerp 1f96789be6 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20130606052150-3gmo30yv2a4jrql4
2013-06-06 05:21:50 +00:00
Thibault Delavallée 8205a2d113 [MERGE] Sync with trunk
bzr revid: tde@openerp.com-20130531081018-dzm2w9p08hakm04q
2013-05-31 10:10:18 +02:00
Launchpad Translations on behalf of openerp d9a24a551f Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20130531053826-kecibs4xe8osg8kr
2013-05-31 05:38:26 +00:00
Thibault Delavallée c93c8935ad [IMP] mail: now may raise exception instead of just logging it. They are used in auth_signup to avoid having the process considering the invite/reset password email was sent when it was not.
bzr revid: tde@openerp.com-20130524114857-8wy5uob23i2d6b6p
2013-05-24 13:48:57 +02:00
Thibault Delavallée 8aa85c2523 [FORWARD] Forward port of addons until revision 8711
bzr revid: tde@openerp.com-20130521133807-5n97jep45f3lf6uq
bzr revid: tde@openerp.com-20130522083012-4yry4ht2943sjatn
2013-05-22 10:30:12 +02:00
Thibault Delavallée a05b0bebbe [FORWARD] Forward port of 7.0 branch until revision 9143.
bzr revid: tde@openerp.com-20130521122359-b5vii7gv8arluz06
2013-05-21 14:23:59 +02:00
Martin Trigaux c8c298c83c [IMP] clean permissions and shebang in files
bzr revid: mat@openerp.com-20130514103113-8idhvhokt0e8jzea
2013-05-14 12:31:13 +02:00
Launchpad Translations on behalf of openerp a7a4f33d0f Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20130427063416-maq2j295cuj0d2j4
bzr revid: launchpad_translations_on_behalf_of_openerp-20130429060435-zyumznnykvw92bfg
bzr revid: launchpad_translations_on_behalf_of_openerp-20130501051425-9uhm1n0nmvyus33i
bzr revid: launchpad_translations_on_behalf_of_openerp-20130506063526-tj5l5h3fger6llmw
bzr revid: launchpad_translations_on_behalf_of_openerp-20130501051533-veqndxlj87s13tnp
bzr revid: launchpad_translations_on_behalf_of_openerp-20130502060901-j2v1cs2l31in4q6t
bzr revid: launchpad_translations_on_behalf_of_openerp-20130503062950-h0ojr1tlzqx5nu76
bzr revid: launchpad_translations_on_behalf_of_openerp-20130504071101-jh8a9d3cb8gcz34e
bzr revid: launchpad_translations_on_behalf_of_openerp-20130505060428-4qacudpyuiez39b3
bzr revid: launchpad_translations_on_behalf_of_openerp-20130506063544-ggq3rpht7nsoinxs
bzr revid: launchpad_translations_on_behalf_of_openerp-20130504071108-g8u3u06xpp3g4sks
bzr revid: launchpad_translations_on_behalf_of_openerp-20130506063552-lwxw1ldh3mbflzqf
2013-05-06 06:35:52 +00:00
Launchpad Translations on behalf of openerp 6970e5e041 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20130430063704-q6sk7sup4c1ej18w
2013-04-30 06:37:04 +00:00
Launchpad Translations on behalf of openerp 45e303b528 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20130430052924-th3a8rf85bi2xz1t
2013-04-30 05:29:24 +00:00
Olivier Dony 9c08e12962 [MERGE] Forward-port of latest 7.0 bugfixes, up to rev. 9085
revision-id: odo@openerp.com-20130429105458-r89mnkx8okdxsdld

bzr revid: odo@openerp.com-20130429151410-54y94063gijyk16o
2013-04-29 17:14:10 +02:00
chirag patel 27686df49d [FIX] Fixed raise warning when email_from value false.
bzr revid: cpa@tinyerp.com-20130429120409-sm0c01022qm25agv
2013-04-29 17:34:09 +05:30
Launchpad Translations on behalf of openerp 3536f65967 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20130427063440-bmcyenjvm2fm94ck
bzr revid: launchpad_translations_on_behalf_of_openerp-20130428054142-1k74s6tp0zv4aeu5
bzr revid: launchpad_translations_on_behalf_of_openerp-20130429060457-72jpzgm0ky022n8u
2013-04-29 06:04:57 +00:00
Launchpad Translations on behalf of openerp 71b245598e Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20130426053411-bv2sqofceiphm7vl
bzr revid: launchpad_translations_on_behalf_of_openerp-20130427054423-i8yn2pamtsptx8sr
2013-04-27 05:44:23 +00: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 856083e2b4 [FIX] email_template: fixed wrong res_id given to attachments in send_mail (should be a mail.message res_id, not a mail.mail res_id), to use the low-level attachments unlink.
bzr revid: tde@openerp.com-20130422102114-a179ylzpgu3g6vcr
2013-04-22 12:21:14 +02:00
Olivier Dony 96dd64e31f [REVERT] mail: undo model-level change that can cause issue for stable deployments
Failing to force a manual update of the mail module would cause
all composer wizards to display html contents without the WYSIWYG
editor, making it mostly unusable for regular users. Users are
not expected to always force an update of all modules after
updating to the latest source code.

bzr revid: odo@openerp.com-20130417081410-dwc33ymizlihvbng
2013-04-17 10:14:10 +02:00
Christophe Simonis 8a7fad6b22 [FIX] email_template/tests/test_mail.py: compose.body is not htmlized anymore
bzr revid: chs@openerp.com-20130411190401-0ajvlapuyxop0zhn
2013-04-11 21:04:01 +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
Thibault Delavallée fe2ea997a2 [MERGE] Sync with trunk.
bzr revid: tde@openerp.com-20130411103645-rmr3sa8p9ropx2gc
2013-04-11 12:36:45 +02:00
Raphael Collet 894eeef8e0 [MERGE] from trunk
bzr revid: rco@openerp.com-20130411073708-gaxl2332umtedmg6
2013-04-11 09:37:08 +02:00
Launchpad Translations on behalf of openerp 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
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 becbd707cf [MERGE] Sync with trunk.
bzr revid: tde@openerp.com-20130329105546-epbmbbxd64cncj2h
2013-03-29 11:55:46 +01:00
Launchpad Translations on behalf of openerp 7a8d71be6d Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20130329050903-yuxb08q83hlvg6ok
2013-03-29 05:09:03 +00:00
Launchpad Translations on behalf of openerp fc04522286 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20130328060500-yc40z00ubsz154vw
2013-03-28 06:05:00 +00: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
Vo Minh Thu 9b0ced610f [MERGE] merged trunk.
bzr revid: vmt@openerp.com-20130322134958-jhe6m0222jq7wo41
2013-03-22 14:49:58 +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 e3ac95411a [MERGE] Sync with 7.0
bzr revid: tde@openerp.com-20130319100303-ck8q56i70faasod1
2013-03-19 11:03:03 +01:00
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 7e696dfdcb [MERGE] Sync with trunk and latest mail changes.
bzr revid: tde@openerp.com-20130318122027-l570iyzlljshz4ne
2013-03-18 13:20:27 +01:00
Launchpad Translations on behalf of openerp 4ce8d2697d Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20130316055338-ogfw01ap8fh1hlaj
bzr revid: launchpad_translations_on_behalf_of_openerp-20130317045918-zi1230lgxjbkqw3x
bzr revid: launchpad_translations_on_behalf_of_openerp-20130318044640-ts2tr31y2gl25rev
2013-03-18 04:46:40 +00:00
Launchpad Translations on behalf of openerp 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
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
Quentin (OpenERP) d0f5b28bd0 [MERGE] merge with main trunk branch to get last translations from launchpad
bzr revid: qdp-launchpad@openerp.com-20130315103116-lxj96usw3ipd11z5
2013-03-15 11:31:16 +01:00
Launchpad Translations on behalf of openerp 72f29d98b8 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20130315055412-luy9qg1pkdjnqlud
2013-03-15 05:54:12 +00:00
Quentin (OpenERP) be05b374a1 [MERGE] forwardport of bugfixes made in v7 up to revision 8854.
bzr revid: qdp-launchpad@openerp.com-20130314112740-s01t51p4m7mxcumz
2013-03-14 12:27:40 +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
Thibault Delavallée 70ce1e5eb4 [FIX] Fixed forgotten conflict when merging trunk.
bzr revid: tde@openerp.com-20130314085315-m4didtupt20gmkyv
2013-03-14 09:53:15 +01:00
Thibault Delavallée 272501d66c [MERGE] Sync with 7.0
bzr revid: tde@openerp.com-20130314082535-6fdvgnernmbo1liw
2013-03-14 09:25:35 +01:00
Launchpad Translations on behalf of openerp cdb474f179 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20130314053439-q79rdq445kptn3nn
2013-03-14 05:34:39 +00:00
Thibault Delavallée 3a95a0d6b1 [MERGE] Sync with trunk.
bzr revid: tde@openerp.com-20130313134656-o0ptoxr3lcre862d
2013-03-13 14:46:56 +01:00
Launchpad Translations on behalf of openerp 9568673e0f Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20130313043736-oqoeg5hukh6fd2gw
bzr revid: launchpad_translations_on_behalf_of_openerp-20130314044848-8m2hnsav5adqrr5k
2013-03-14 04:48:48 +00:00
Thibault Delavallée 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
Thibault Delavallée ecd460e0d5 [IMP] email_template: improved help for email_from.
bzr revid: tde@openerp.com-20130313121659-pvdy814zoq9zonf2
2013-03-13 13:16:59 +01:00
Thibault Delavallée 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
Thibault Delavallée 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
Thibault Delavallée 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
Thibault Delavallee edc5f2fc43 [MERGE] Sync with trunk.
bzr revid: tde@openerp.com-20130312141047-tiga9bhz3m3wc2qr
2013-03-12 15:10:47 +01:00
Thibault Delavallee d7e5763dcb [IMP] mail, email_template: improved mass mailing action (renamed, now using a well defined template) + improved form view of mail.compose.message wizard.
bzr revid: tde@openerp.com-20130312133817-y9xztv6gs4ut7ndj
2013-03-12 14:38:17 +01:00
Thibault Delavallée a2a8c238dc [CLEAN] email_template: removed a print statement.
bzr revid: tde@openerp.com-20130311124254-xzxs1r6cnqw2zxxc
2013-03-11 13:42:54 +01:00
Thibault Delavallée 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
Launchpad Translations on behalf of openerp 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
Thibault Delavallée 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
Thibault Delavallée 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
Turkesh Patel (Open ERP) b979204344 [IMP] give name to the wizard and improve domain
bzr revid: tpa@tinyerp.com-20130308093740-al8tywa721h3spy1
2013-03-08 15:07:40 +05:30
Thibault Delavallée 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
Launchpad Translations on behalf of openerp 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
Thibault Delavallée 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
Thibault Delavallée 2da3ea2d62 [IMP] email_template: added _order as name.
bzr revid: tde@openerp.com-20130307165014-gv2gmfh9d1nvjy9h
2013-03-07 17:50:14 +01:00
Turkesh Patel (Open ERP) 439b35d9ed [IMP] email_template:make template_id field many2one from selection and aplly domain of related model, improve view of email_template
bzr revid: tpa@tinyerp.com-20130307132446-gsb9yp32o7fnomco
2013-03-07 18:54:46 +05:30
Thibault Delavallée 1aac220ee2 [IMP] mail: tests: updated tests for attachments
bzr revid: tde@openerp.com-20130307110657-1cdelhyd1girmp28
2013-03-07 12:06:57 +01:00
Olivier Dony 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
Thibault Delavallée 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
Thibault Delavallée 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
Thibault Delavallée 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
Thibault Delavallée f8481a83d0 [IMP] email_template: cleaned a bit duplicated code.
bzr revid: tde@openerp.com-20130305151503-t99tu53x35d3ea29
2013-03-05 16:15:03 +01:00
Thibault Delavallée f7484297d9 [CLEAN] mail.compose.message: some cleaning in new fields strings, and in form vivew.
bzr revid: tde@openerp.com-20130305124259-x3vb5ds2xi9v389d
2013-03-05 13:42:59 +01:00
Thibault Delavallée c63de2c9c2 [MERGE] Sync with trunk.
bzr revid: tde@openerp.com-20130305121955-49g21indundhnca3
2013-03-05 13:19:55 +01:00
Launchpad Translations on behalf of openerp 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
Launchpad Translations on behalf of openerp b46c9dae1b Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20130302045718-19m5dowwcweyf3fy
bzr revid: launchpad_translations_on_behalf_of_openerp-20130303050056-i10g2vgmvxm9l392
bzr revid: launchpad_translations_on_behalf_of_openerp-20130305050744-svuruvv63292prwx
2013-03-05 05:07:44 +00:00
Thibault Delavallée 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
Launchpad Translations on behalf of openerp 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
Thibault Delavallée 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
Thibault Delavallée df6a3997c2 [MERGE] Sync with 7.0
bzr revid: tde@openerp.com-20130301111146-1s5ckk09wdt88vb4
2013-03-01 12:11:46 +01:00
Launchpad Translations on behalf of openerp 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
Launchpad Translations on behalf of openerp 8882eca92e Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20130301044347-0g40ffxeii67yxtr
2013-03-01 04:43:47 +00:00
Thibault Delavallée aa865c8b61 [FIX] Still fixing attachments through templates.
bzr revid: tde@openerp.com-20130228145513-6g30ujr3cm0j8b3u
2013-02-28 15:55:13 +01:00
Thibault Delavallée 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
Thibault Delavallée 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
Thibault Delavallée 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