Denis Ledoux
20be322c45
[MERGE] Forward-port of latest 7.0 bugfixes, up to rev. 9684 rev-id: dle@openerp.com-20131209145652-3g9rgnfz1w8k0whw
...
bzr revid: chs@openerp.com-20131202105848-33gcz1715w370rve
bzr revid: dle@openerp.com-20131204150643-is3y0b9n8enh3yql
bzr revid: chs@openerp.com-20131206152726-pirikn7v8pev90ic
bzr revid: dle@openerp.com-20131206162437-b9niay99mirk44qm
bzr revid: tde@openerp.com-20131209102019-kjeg0rx2au1d5e5v
bzr revid: dle@openerp.com-20131209155721-589zihxx8jmvlpvp
2013-12-09 16:57:21 +01:00
Thibault Delavallée
4b96e85a30
[MERGE] [FORWARD] Forward port of saas-2 branch until revision 9036 (revid tde@openerp.com-20131209102019-kjeg0rx2au1d5e5v)
...
bzr revid: tde@openerp.com-20131209105031-17920wsidpqrwmxj
2013-12-09 11:50:31 +01:00
Thibault Delavallée
fcd5f7d960
[MERGE] Sync with 7.0
...
bzr revid: tde@openerp.com-20131209090903-al4o6uhrhhw4cqcl
2013-12-09 10:09:03 +01:00
Thibault Delavallée
2382710f6f
[REV] mail: removed some changes to be done in trunk, not in 7.0
...
bzr revid: tde@openerp.com-20131209090802-q8fzn88ia9w6o5pq
2013-12-09 10:08:02 +01:00
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
d10f471019
[FIX] [TESTS] mail, portal: fixed tests, because the error raised by the OROM has changed in some cases.
...
bzr revid: tde@openerp.com-20131206121432-mz2jpj535tmcmftl
2013-12-06 13:14:32 +01: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
Thibault Delavallée
1e5432edec
[FIX] mail: fixed subtype check broken by get_object refactoring, should be fixed now + updated other call to get_object
...
bzr revid: tde@openerp.com-20131206101117-atlch4ea102a4gx0
2013-12-06 11:11:17 +01:00
Thibault Delavallée
4eec5e416c
[IMP] mail: update: call to get_object updated
...
bzr revid: tde@openerp.com-20131206100230-n4xxvskdbf3m0h1f
2013-12-06 11:02:30 +01:00
Thibault Delavallée
5b74bbe712
[CLEAN] mail_group: removed mail_post_access modification because it is
...
not necessary anymore. It was probably added with the first implementation
of the blog.
bzr revid: tde@openerp.com-20131206100131-smjfud6f8dv5dy5l
2013-12-06 11:01:31 +01:00
Thibault Delavallée
896fab1b44
[IMP] [FIX] mail: mail_thread: routing: check for exact message_id.
...
When processing an incoming email, we try to find a parent for the email based on references. Before this merge, it was done using openerp-<model-<res_id> pattern. However it is buggy. Indeed having two OpenERP sending emails to each other leads to messages being inserted in a wrong thread (model and res_id of the first OpenERP for both instances).
Now we search for an exact match between the references and the stored message_ids. As each message_id can be considered as unique the number of collisions is lessened. This won't cause any issues with OpenERP >= 7.0.
A compatibility mode is implemented for <= 6.1: as in those versions the message_id is not stored, we fall back on the previous behavior for records having messages without message_id. This indicates that the record was created before 7.0.
Tests have been updated accordingly, and a test added for the compatibility mode.
bzr revid: tde@openerp.com-20131205100534-2rlyun8wqng3qa6f
2013-12-05 11:05:34 +01:00
Thibault Delavallée
4f5d36a464
[IMP] [CLEAN] mail: mail_thread: routing
...
- removed a debug print statement
- now searching all references once instead of each reference one at a time
to lessen the number of queries; as the newest message will be the first
in the search result, it's ok.
bzr revid: tde@openerp.com-20131205093921-h7sits57vqc51c8p
2013-12-05 10:39:21 +01:00
Thibault Delavallée
0624beb6af
[MERGE] Sync with trunk
...
bzr revid: tde@openerp.com-20131205093609-3lj3hsxz2vsudhw3
2013-12-05 10:36:09 +01:00
Christophe Simonis
4ab77759cc
[MERGE] forward port of branch saas-2 up to revid 9029 chs@openerp.com-20131204125051-dexejzwigpu0z1yy
...
bzr revid: chs@openerp.com-20131204130023-lgravuoxwlt39pek
2013-12-04 14:00:23 +01:00
Christophe Simonis
08ec6a3805
[FIX] mail: reset alias when copying users
...
bzr revid: chs@openerp.com-20131204112734-2h569udrxgsgw9kr
2013-12-04 12:27:34 +01:00
Launchpad Translations on behalf of openerp
4fd98907ce
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20131130053134-6u83vcd1133xs8yf
bzr revid: launchpad_translations_on_behalf_of_openerp-20131201054550-w0k8alfqs2bigurx
bzr revid: launchpad_translations_on_behalf_of_openerp-20131202055222-2u7o99e48254dceu
bzr revid: launchpad_translations_on_behalf_of_openerp-20131203061621-hyqqh11jt7g0ilqh
2013-12-03 06:16:21 +00:00
Launchpad Translations on behalf of openerp
3e94f7ab1b
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20131203054049-9sioco00f1s4dxvt
bzr revid: launchpad_translations_on_behalf_of_openerp-20131203054124-0db72b59pfm46z0f
2013-12-03 05:41:24 +00:00
Christophe Matthieu
fd2821086f
[MERGE] sync with trunk
...
bzr revid: chm@openerp.com-20131202150925-eqsi0uu0fqtwimhj
2013-12-02 16:09:25 +01:00
jke-openerp
c66444b2b1
[Merge] Mergie with trunk
...
bzr revid: jke@openerp.com-20131202144019-f6zu5ciyirorsjp6
2013-12-02 15:40:19 +01:00
Antony Lesuisse
57ef91409a
[MERGE] bootstrap3
...
bzr revid: al@openerp.com-20131202132445-oux9j63auh4om284
2013-12-02 14:24:45 +01:00
Christophe Simonis
eba79e46a5
[FIX] mail: correct announcement bar
...
bzr revid: chs@openerp.com-20131202114516-u0u44l3xbkk1zcbx
2013-12-02 12:45:16 +01:00
Fabien Pinckaers
ed7623fc45
[IMP] Performance improvement: improved cache with context, better get_object
...
bzr revid: fp@tinyerp.com-20131130154659-uqis34x2cemmocly
2013-11-30 16:46:59 +01:00
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
Christophe Simonis
0ac4a8f696
[MERGE] forward port of branch 7.0 up to revid 9668 launchpad_translations_on_behalf_of_openerp-20131130053134-6u83vcd1133xs8yf
...
bzr revid: chs@openerp.com-20131130130014-hi5h5a00kjx0dbvp
2013-11-30 14:00:14 +01:00
Thibault Delavallée
5859d84dc1
[MERGE] Sync with saas-2
...
bzr revid: tde@openerp.com-20131128094037-j59xo6sbj7k00fbf
bzr revid: tde@openerp.com-20131129092306-t0nb7tgyoqovx101
2013-11-29 10:23:06 +01:00
Thibault Delavallée
8253453d64
[IMP] mail: mail_thread: routing: implement compat-mode routing
...
It now accepts <111...222..openerp-res_id-model@mydomain.com > partial matching
only if the target record has messages without message_id, aka <= 6.1 record.
Updated and added tests
bzr revid: tde@openerp.com-20131128133226-ce1qyeswi9n83q8v
2013-11-28 14:32:26 +01:00
Thibault Delavallée
c553167ff8
[FIX] mail_message: do not overwrite 'False' message_id when creating a new mail message
...
bzr revid: tde@openerp.com-20131128133132-8oevlk1wyoqytebo
2013-11-28 14:31:32 +01:00
Martin Trigaux
11a81298e9
[MERGE] [FIX] mail: css improvement, no overflow when too long words, line break instead
...
lp bug: https://launchpad.net/bugs/1167323 fixed
bzr revid: mat@openerp.com-20131128113520-s0i7cri632n7a01g
2013-11-28 12:35:20 +01:00
Thibault Delavallée
4f2e951cde
[IMP] mail: mail_thread: routing: check for exact message_id.
...
WIP: will be improved, notably about what to do for partial match.
bzr revid: tde@openerp.com-20131128103921-q1a36otv9ptazehd
2013-11-28 11:39:21 +01:00
jke-openerp
74d698f42f
[MERGE] Merge with trunk
...
bzr revid: jke@openerp.com-20131127175136-3qvs367ud509462n
2013-11-27 18:51:36 +01:00
Denis Ledoux
2a9de8ba6f
[MERGE] Forward-port of latest 7.0 bugfixes, up to rev. 9654 rev-id: dle@openerp.com-20131127151815-gzk9py9wtzmndziw
...
bzr revid: dle@openerp.com-20131127152136-5p0lkz4vpfn9qxxx
2013-11-27 16:21:36 +01:00
Martin Trigaux
7c1bf0dd29
[FIX] mail: decode filename at email reception (if non-ascii characters) (opw 591729)
...
bzr revid: mat@openerp.com-20131127124021-bliapaggdjd1xnuz
2013-11-27 13:40:21 +01:00
Christophe Simonis
0521d1aab3
[MERGE] forward port of branch saas-2 up to revid 9017 chs@openerp.com-20131127110552-3u2nxwu01gxj9i7m
...
bzr revid: chs@openerp.com-20131127111208-iclt7a9ib7oucumh
2013-11-27 12:12:08 +01:00
Christophe Simonis
6b05beecc1
[MERGE] forward port of branch 7.0 up to revid 9651 chs@openerp.com-20131127104459-jb77x7quwcvtifm7
...
bzr revid: dle@openerp.com-20131126171210-jovr7e7efehuq3s2
bzr revid: chs@openerp.com-20131127110046-4ow36dkuuyzgf1pl
2013-11-27 12:00:46 +01:00
Thibault Delavallée
ae7fcfb564
[IMP] [FIX] mail: mail_thread :
...
- avoid having to browse the record in message_subscribe: refactored message_subscribe
to work on ids without browsing, try to lessen the number of queries to do
- update _set_followers, method of the function field message_follower_ids, to use
message_subscribe and message_unsibscribe
- in create: add author as follower in creation values, not after create, allowing
create access rules based on followers
- updated message_unsubscribe to be the lower method, not calling _set_followers anymore
bzr revid: tde@openerp.com-20131126171752-1irizm7mhv2y1wrn
2013-11-26 18:17:52 +01:00
Thibault Delavallée
a6ae52affa
[FIX] mail_followers widget: fixed a traceback appearing
...
when quickly changing the displayed record in a form view when the
followers widget is displayed. This was due to variables not correctly
set because of a concurrence issue.
However there is no need to hse this.view.datarecord or dataset as
the function already receives its id as argument.
bzr revid: tde@openerp.com-20131126124630-2m5wjwr008ys1e9e
2013-11-26 13:46:30 +01:00
Thibault Delavallée
4468d52283
[DOC] mail: cleaned a comment
...
bzr revid: tde@openerp.com-20131126121649-nywrh4hc1mcpwleh
2013-11-26 13:16:49 +01:00
Thibault Delavallée
974675bcbf
[FIX] mail: attachments encoding issue: posting process
...
waits not encoded attachments: email_template encodes them. So de-encoding
is necessary.
bzr revid: tde@openerp.com-20131126120336-5lcp9ii7z9lru5vr
2013-11-26 13:03:36 +01:00
Thibault Delavallée
cf214ed724
[FIX] mail: when generating pure email mass mailing
...
we have to process attachments as well as attachment_ids in the values generated
by the composer and the optional template.
As this behavior is the same as the one already implemented for message_post, this
feature has been moved into its dedicated method to be called by message_post
or before calling mail_mail.create().
This also allows to have attachments in pure email mass mailing that are attached
to mail.message, not to mail.compose.message model. When unlinking those emails,
the attachments will be also removed, and not lost in the database anymore.
bzr revid: tde@openerp.com-20131126110942-h8p0d9sbjtk0hwlu
2013-11-26 12:09:42 +01:00
Thibault Delavallée
41ca7536e0
[FIX] mail: when performing pure email mass mailing
...
attachments were not formatted as a m2m command but a list
of ids. This is now fixed.
bzr revid: tde@openerp.com-20131126095632-txuy00xc1cmqjqcn
2013-11-26 10:56:32 +01:00
Launchpad Translations on behalf of openerp
d95ef220d5
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20131126060746-ta374lckemq8t257
2013-11-26 06:07:46 +00:00
Thibault Delavallée
4be6ac800b
[FIX] mail: in some cases tracking is called
...
without the context (some workflows for example). In that case use the
current user lang when generating the automatic message. This is done
by adding it in the context if not present.
lp bug: https://launchpad.net/bugs/1219163 fixed
bzr revid: tde@openerp.com-20131125163808-bbbqwvx22my38zdj
2013-11-25 17:38:08 +01:00
Thibault Delavallée
1284c5c0d4
[FIX] mail: fixed reply button in mail_mail form view, should reply
...
to a mail.message, not a mail.mail.
lp bug: https://launchpad.net/bugs/1212190 fixed
bzr revid: tde@openerp.com-20131125155857-m04233fbyan7mglt
2013-11-25 16:58:57 +01:00
Thibault Delavallée
6bfcee2cb7
[FIX] mail: fixed replying to the first message in Inbox that was crashing
...
lp bug: https://launchpad.net/bugs/1212109 fixed
bzr revid: tde@openerp.com-20131125155349-4wfvjxuffnxyumkd
2013-11-25 16:53:49 +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
Thibault Delavallée
f148061b94
[MERGE] [IMP] chatter: improved 'Log a note'
...
- the button is now only displayed for employee users. This is done
by overriding the fields_view_get in mail.thread and adding options
to the widget according to the groups the user belongs to. Indeed
it is currently not possible to set widget options specific to
some groups. Therefore an override of fields view get was
necessary.
- small layout improvements: Log a note -> Log an internal note,
background color of notes updated.
bzr revid: tde@openerp.com-20131125130455-u8517iyr4jgdgoqn
2013-11-25 14:04:55 +01:00
Thibault Delavallée
38f3c1c1f2
[MERGE] [IMP] mail: invite wizard: the option of sending an email when inviting someone
...
is now checked by default.
bzr revid: tde@openerp.com-20131125111253-926t4d8brmd90el9
2013-11-25 12:12:53 +01:00
Thibault Delavallée
000c38816d
[MERGE] [IMP] Addons: updated some field labels to avoid duplicates to ease
...
the import / export process
Aso includes
- project: deprecated priority field: use sequence instead
- base_calendar: calendar.event: deprecated organizer field: use organize_id instead
bzr revid: tde@openerp.com-20131125093741-hx9hpj85xqfalvqw
2013-11-25 10:37:41 +01:00
ajay javiya (OpenERP)
748253929f
[IMP]: set default 'sendmail' check box true
...
bzr revid: aja@tinyerp.com-20131125092349-jpgsilprpag4a2bq
2013-11-25 14:53:49 +05:30
Launchpad Translations on behalf of openerp
5f21b4bff9
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20131123062620-6obt60lwob64hi98
bzr revid: launchpad_translations_on_behalf_of_openerp-20131124054757-4w9nik6wieeqf0yg
bzr revid: launchpad_translations_on_behalf_of_openerp-20131125060111-rf445xxiinvazinv
2013-11-25 06:01:11 +00:00