Thibault Delavallée
de5a303c4d
[MERGE] Sync with trunk
...
bzr revid: tde@openerp.com-20130318101828-6csyuhmutrvm5ld5
2013-03-18 11:18:28 +01:00
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
Thibault Delavallée
4484a3197c
[MERGE] Sync with trunk, resolved conflicts due to forward port of 7.0
...
bzr revid: tde@openerp.com-20130315114338-54scb00rkp7zwr30
2013-03-15 12:43:38 +01:00
Thibault Delavallée
4387187b8b
[IMP] mail: invite: slighty updated invite message. Updated tests accordingly.
...
bzr revid: tde@openerp.com-20130315110554-rszi5u1c9dybzq46
2013-03-15 12:05:54 +01:00
Thibault Delavallée
46101c447b
[FIX] mail.css: fixed a forgotten ';'; added a bit of style to invite people button.
...
bzr revid: tde@openerp.com-20130315110528-oggnd7iwktgag5a1
2013-03-15 12:05:28 +01:00
Thibault Delavallée
627ebc4a73
[CLEAN] mail_followers: cleaned code of get_signature_footer: same feature, but a bit less code.
...
bzr revid: tde@openerp.com-20130315110455-7ho0djpjlkbap6l1
2013-03-15 12:04:55 +01:00
Thibault Delavallée
646c83c250
[IMP] mail_mail: delegated footer modification into a dedicated method called by send_get_email_body.
...
bzr revid: tde@openerp.com-20130315110421-if39vmvov4loe5u7
2013-03-15 12:04:21 +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
Thibault Delavallée
cb6b598763
[MERGE] Sync with trunk.
...
bzr revid: tde@openerp.com-20130315093907-8kc28n669unmr1n2
2013-03-15 10:39:07 +01:00
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
53150088ad
[MERGE] Sync with trunk.
...
bzr revid: tde@openerp.com-20130314083401-6reysmzjuvnii1bz
2013-03-14 09:34:01 +01:00
Christophe Matthieu
d80d18ff1b
[IMP] mail_followers: fix invite button, hidden subtype if only one
...
bzr revid: chm@openerp.com-20130313161510-kkis63zaoc3yb6kz
2013-03-13 17:15:10 +01:00
Christophe Matthieu
46893a182a
[IMP] mail_followers: remove print in tests
...
bzr revid: chm@openerp.com-20130313160501-ywkyblx39cma9jln
2013-03-13 17:05:01 +01:00
Christophe Matthieu
07559b253a
[IMP] mail_followers: add a comment for get_signature_footer
...
bzr revid: chm@openerp.com-20130313160310-pgckns8w6gb7cqus
2013-03-13 17:03:10 +01:00
Thibault Delavallée
bce4b433cb
[FIX] mail_mail: fixed search view group_by using fields removed between 6.1 and 7.0; added group_by author_id.
...
bzr revid: tde@openerp.com-20130313151227-0ukxnu9wyxm1pe37
2013-03-13 16:12:27 +01:00
Thibault Delavallée
52e47a660a
[FIX] [IMP] Second batch of fixes and small usability fixes/improvements for CRM / mailing
...
email_template:
- fix email_template overriding recipients even when the template is void; the convention is that void values in the template are not used, meaning that they are not relevant in the template and not that they should erase existing values,
- added _order on name on email_template, in order to ease the choosing of templates,
crm:
- fix phonecall scheduling taking the lead/opportunity description as phonecall description,
- fix phonecall scheduling Chatter message: added phonecall description into it
- improved phonecall scheduling wizard form view (type is now on the left to ease reading and updating),
- fix opt_out parameter explanations; this parameter is relevant only for mass mailing and marketing campaigns,
- added 'Available for mass mailing' (opt_out = False) filter to give users the possibility of filtering leads before performing mass mailing,
res_partner:
- fix notification_email_send field missing on res_partner form view, preventing management of email reception policy for partners,
- fix opt_out parameter explanations (field added in email_template); this parameter is relevant only for mass mailing and marketing campaigns,
- added 'Available for mass mailing' (opt_out = False) filter to give users the possibility of filtering leads before performing mass mailing,
mail_message:
- fix read/unread filters on mail_message (help of both filters were the same; string of Unread becomes To Read to be clearer)
bzr revid: tde@openerp.com-20130313131341-5pwn4g0nmbaq030p
2013-03-13 14:13:41 +01: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
3b989b2c57
[FIX] mail_message: fixed strings and names for read/unread filters.
...
bzr revid: tde@openerp.com-20130313122632-bwsz0pss88z0ups2
2013-03-13 13:26:32 +01:00
Thibault Delavallée
6b2c64ff40
[IMP] mail_mail: cleaned code about reply_to format: now uses tools.email_split, cleaned a bit the code.
...
bzr revid: tde@openerp.com-20130313111926-45d9gct5nihr6f6n
2013-03-13 12:19:26 +01:00
Thibault Delavallée
d49889c9a8
[IMP] mail: res_partner: improved help for notification_email_send.
...
bzr revid: tde@openerp.com-20130313111746-xfrd8kdhntb39gwl
2013-03-13 12:17:46 +01:00
Thibault Delavallée
6ae80a98ac
[CLEAN] mail: cleaned code of modified reply_to.
...
bzr revid: tde@openerp.com-20130311124914-xcdbgmw4w7nm02rv
2013-03-11 13:49:14 +01:00
Thibault Delavallée
7310643b6b
[IMP] email: better reply_to that includes document name.
...
bzr revid: tde@openerp.com-20130311114623-ftcj8s8rbahvjupz
2013-03-11 12:46:23 +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
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
e866c2c523
[FIX] mail: fixed custom placeholder on Chatter widget that was not a link.
...
bzr revid: tde@openerp.com-20130308133659-y80bmguoic64l8no
2013-03-08 14:36:59 +01:00
Thibault Delavallée
6d78c2f234
[FIX] res_partner: mail now adds forgotten notification_email_send field; otherwise partner manager are not able to change the email reception policy for partners that are not users.
...
bzr revid: tde@openerp.com-20130308124835-sooyabgjhawjg7qr
2013-03-08 13:48:35 +01:00
Thibault Delavallée
6dbb52267f
[FIX] res_partner: notification_email_send help and selection values strings updated for cleaner explanations.
...
bzr revid: tde@openerp.com-20130308124724-6tmb4w180sf32ktb
2013-03-08 13:47:24 +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
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
dde50031e7
[MERGE] [FIX] Chatter: typo (send -> sent) + removed an extra space in 'Send a message'.
...
bzr revid: tde@openerp.com-20130307100117-j6cxt2cz54hht7c7
2013-03-07 11:01:17 +01:00
Thibault Delavallée
5e59420989
[FIX] mail_thread: fixed a list that should be a set. This has nothing to do with the previous commit. Seriously.
...
bzr revid: tde@openerp.com-20130307093414-wcdakf017sskj35l
2013-03-07 10:34:14 +01:00
Thibault Delavallée
000042ac68
[FIX] mail_thread: fixed set that should not be a set.
...
bzr revid: tde@openerp.com-20130307093115-9jmflmnf420iiz21
2013-03-07 10:31:15 +01:00
Thibault Delavallée
4d4935d551
[REM] removed duplicate method.
...
bzr revid: tde@openerp.com-20130307080616-63nuzq15jg0ijkr6
2013-03-07 09:06:16 +01:00
Thibault Delavallée
a7003b68ab
[FIX] Chatter: typo (send -> sent) + removed an extra space in 'Send a message'
...
bzr revid: tde@openerp.com-20130307075809-krc3j6ca3460qac2
2013-03-07 08:58:09 +01:00
Thibault Delavallée
e57ffc4836
[FIX] mail: added wrapper for message_Create_patners_from_emails in mail_thread and res_users; cleaned message_post signature to match the pre-merge signature. Also fixed a wrong argument name in message_post_user_api.
...
bzr revid: tde@openerp.com-20130307075216-kk0m304405ohm7ua
2013-03-07 08:52:16 +01:00
Thibault Delavallée
445c1aa412
[FIX] mail: added wrapper because of changes introduced in the API recently.
...
bzr revid: tde@openerp.com-20130306162811-t4505m08nep2jlz4
2013-03-06 17:28:11 +01:00
Thibault Delavallée
aa054ebb74
[REV] mail: reverted commit 8802. Reason: opt-out will be used only for marketing campaigns; notification_email_send for emails.
...
bzr revid: tde@openerp.com-20130306142741-ghazensh58xw3rvu
2013-03-06 15:27:41 +01:00
Thibault Delavallée
1f4002447e
[IMP] Chatter: small css cleaning about Send a message or Log a note.
...
bzr revid: tde@openerp.com-20130306140120-n6vub0d82gjr6hlh
2013-03-06 15:01:20 +01:00
Christophe Matthieu
a6f2191dc6
[FIX] mail_followers: invite tests
...
bzr revid: chm@openerp.com-20130305102644-3goqo24diirjoq0z
2013-03-05 11:26:44 +01:00
Christophe Matthieu
a57c079700
[IMP] mail_followers: invite tests
...
bzr revid: chm@openerp.com-20130305101143-6mcydxw60y18kw20
2013-03-05 11:11:43 +01:00
Christophe Matthieu
2c73e51a54
[IMP] mail_followers: invite message '<user_name> invited you to follow <model_name> document: <document_name>'
...
bzr revid: chm@openerp.com-20130305094956-93lf0ttjw02a9omb
2013-03-05 10:49:56 +01:00
Thibault Delavallée
916bde1c3a
[IMP] invite: only opt_out is taken into account when sending invite emails; added some comments to clean the code in 8.0
...
bzr revid: tde@openerp.com-20130306082445-hg2flvidtgso30dq
2013-03-06 09:24:45 +01:00
Thibault Delavallée
ade7c33f18
[FIX] invite: do not send invite notification emails to partners having 'none' or opt_out.
...
bzr revid: tde@openerp.com-20130306080306-86k0pmzqiqilknzw
2013-03-06 09:03:06 +01:00
Thibault Delavallée
b2ebd26e8c
[FIX] mail: handle opt_out parameter. Please see comment in code for more info.
...
bzr revid: tde@openerp.com-20130306075852-dyaynwq0r1otrxx1
2013-03-06 08:58:52 +01:00
9623afd500
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20130306062137-pxtoftblp1hmspp5
bzr revid: launchpad_translations_on_behalf_of_openerp-20130306062207-lac3gq4ck6k3mexw
bzr revid: launchpad_translations_on_behalf_of_openerp-20130306062221-a6s313kt0qg6rnkj
2013-03-06 06:22:21 +00: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
Olivier Dony
8453234ead
[FIX] all: change confusing labels on Cancel buttons in form views
...
bzr revid: odo@openerp.com-20130304184431-1p8byycyl0nv26qx
2013-03-04 19:44:31 +01:00
Thibault Delavallée
fc0dd0709f
[IMP] Chatter: log message better in black.
...
bzr revid: tde@openerp.com-20130304135701-4qss8jrmjk9qs4os
2013-03-04 14:57:01 +01:00
Thibault Delavallée
567b41c51e
[IMP] Cahtter: imp log message.
...
bzr revid: tde@openerp.com-20130304125443-9ua1r01r25so0qyw
2013-03-04 13:54:43 +01:00
Thibault Delavallée