Christophe Matthieu
22c6b69b50
[FIX] portal: "Portal Access Managment" can't create or edit portal access for a contact when they are already an user with the same login. The wizard don't display all the list of contacts related to the selection.
...
The wrong contact must be replace by the contact who have the login equal to the contact email. Get all child contacts and do not filtered by active user.
bzr revid: chm@openerp.com-20130516091600-20ukr9vbe5qa3lv8
2013-05-16 11:16:00 +02:00
b5b6dfbbf0
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20130515051525-6h06w6secz3p61fv
bzr revid: launchpad_translations_on_behalf_of_openerp-20130516051214-e3v0iwa7lh573r9b
2013-05-16 05:12:14 +00:00
Martin Trigaux
23b50c8da1
[MERGE] sync with latest trunk
...
bzr revid: mat@openerp.com-20130515111755-af33z1frq6jc6hpo
2013-05-15 13:17:55 +02:00
Thibault Delavallée
16ea25646e
[MERGE] Sync with trunk
...
bzr revid: tde@openerp.com-20130515083000-3b033tyihxmubykh
2013-05-15 10:30:00 +02:00
b4bc1a38bf
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20130515060747-d8cgvt2npsgcihpk
2013-05-15 06:07:47 +00:00
Thibault Delavallée
18ad74bef3
[FIX] portal: mail_message: fixed wrong condition for check_access_rule introduced at revision 9117. Added tests by the way.
...
bzr revid: tde@openerp.com-20130514113859-3yucygu3pkav7qbt
2013-05-14 13:38:59 +02:00
389f491114
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20130510060814-p5dqz6jx70vyj3h2
bzr revid: launchpad_translations_on_behalf_of_openerp-20130506054018-5fi2sd0fxqneyv2p
bzr revid: launchpad_translations_on_behalf_of_openerp-20130512052818-cdxzcubppixczhl3
bzr revid: launchpad_translations_on_behalf_of_openerp-20130513051744-ykvvn8a82rsew0ki
bzr revid: launchpad_translations_on_behalf_of_openerp-20130514053036-l4i85pmwsn1qspgl
2013-05-14 05:30:36 +00:00
Thibault Delavallée
259345ba58
[FIX] portal: mail_message: override of _search and check_access_rule of mail_message in order to remove all internal notes if uid is not an employee.
...
bzr revid: tde@openerp.com-20130514111848-2yktt685f6nhn1r7
2013-05-14 13:18:48 +02:00
Thibault Delavallée
8beab22311
[IMP] mail_message for portal users: actually only comment without subtype are not shown (internal notes).
...
bzr revid: tde@openerp.com-20130514104521-e8pbgvgn2xtmyr5o
2013-05-14 12:45:21 +02:00
Christophe Matthieu
77e51ba1e2
[FIX] portal mail: Override of _search and check_access_rule of mail_message to add specific access rights of mail.message, to remove all no discussion message if uid is a portal user.
...
bzr revid: chm@openerp.com-20130513144024-m1o4q8in62fe123b
2013-05-13 16:40:24 +02:00
955d3af504
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20130514062545-amio4juyvdyzilre
2013-05-14 06:25:45 +00:00
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
Thibault Delavallée
c08b877370
[FIX] mail: fixed redirection action that was not redirecting to the discussion when failing to open the document.
...
bzr revid: tde@openerp.com-20130429093329-w0qxiiipx1mkz6qt
2013-04-29 11:33:29 +02:00
ggh-openerp
e8ef63e0c0
[IMP] Improve warning title
...
bzr revid: ggh@tinyerp.com-20130429092924-2qgaxvkfb801q4dl
2013-04-29 14:59:24 +05:30
Thibault Delavallée
10176982c4
[CLEAN] Remove dead code left when merging 7.0 branch inside trunk branch
...
bzr revid: tde@openerp.com-20130426134656-hruyetp4x10g1t0h
2013-04-26 15:46:56 +02:00
Thibault Delavallée
b61c12d28e
[MERGE] Revisions 9000 ... 9002 of 7.0 branch
...
bzr revid: tde@openerp.com-20130426132847-mr8e0yuxao582bs6
2013-04-26 15:28:47 +02:00
Thibault Delavallée
0dada27fcd
[MERGE] Revisions 8997 ... 8999 of 7.0 branch.
...
bzr revid: tde@openerp.com-20130426132721-02lkoc41fms9ve1k
2013-04-26 15:27:21 +02:00
Thibault Delavallée
a75cc23573
[REF] mail: refactored system to generate links in signatures. A new server action is used that choose to redirect to the document or to the Inbox (Portal or Classic Inbox, depending on the user).
...
bzr revid: tde@openerp.com-20130417122225-faf0bb5vyhbcx7ys
2013-04-17 14:22:25 +02:00
Turkesh Patel (Open ERP)
9ea1b238bf
[MRG] merge with lp:openobject-addons
...
bzr revid: tpa@tinyerp.com-20130417062640-0b8at1f087grtiu3
2013-04-17 11:56:40 +05:30
Christophe Matthieu
ca03b6de1c
[MERGE] from trunk
...
bzr revid: chm@openerp.com-20130415133727-btc4a6qolfnxs3du
2013-04-15 15:37:27 +02:00
Christophe Matthieu
ed4b70dfe3
[MERGE] from trunk
...
bzr revid: chm@openerp.com-20130415103431-y96fhba0502b6aqc
2013-04-15 12:34:31 +02:00
Vo Minh Thu
e69326ee3b
[REF] removed explicit model instanciations.
...
bzr revid: vmt@openerp.com-20130415102349-vgcrfok2k5y10cwz
2013-04-15 12:23:49 +02:00
c13ceba6b9
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20130412060536-q07q8ed9v8ldi2kv
bzr revid: launchpad_translations_on_behalf_of_openerp-20130414055031-dgknuaf8a4dhgt16
bzr revid: launchpad_translations_on_behalf_of_openerp-20130413063110-rtd3r7hxe54yb8eq
bzr revid: launchpad_translations_on_behalf_of_openerp-20130414054933-k6o13mitp3dl62xq
bzr revid: launchpad_translations_on_behalf_of_openerp-20130415060648-klbxmc1afr5jq4vb
bzr revid: launchpad_translations_on_behalf_of_openerp-20130412060533-fq4nwi1i6h39y7pl
bzr revid: launchpad_translations_on_behalf_of_openerp-20130413063146-745583mwivnzgjqj
bzr revid: launchpad_translations_on_behalf_of_openerp-20130414055028-v2dnk713g9ydbvpo
bzr revid: launchpad_translations_on_behalf_of_openerp-20130415060722-gvarcrrppfcq777a
2013-04-15 06:07:22 +00:00
Raphael Collet
894eeef8e0
[MERGE] from trunk
...
bzr revid: rco@openerp.com-20130411073708-gaxl2332umtedmg6
2013-04-11 09:37:08 +02:00
Christophe Matthieu
177f51cb54
[IMP] auth_signup: change reset_password to no_reset_password context value
...
bzr revid: chm@openerp.com-20130410130244-3ef6mpw6s09xjn75
2013-04-10 15:02:44 +02:00
eb3ffc52ed
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20130406063640-151b9f95w2tgiifb
bzr revid: launchpad_translations_on_behalf_of_openerp-20130407060111-hobhqctome9qtz6c
bzr revid: launchpad_translations_on_behalf_of_openerp-20130408062055-hzgkrbw8lvkfphxe
2013-04-08 06:20:55 +00:00
Quentin (OpenERP)
3bb51ac696
[MERGE] forward port of bugfixes made in 7.0, up to revision 8969.
...
bzr revid: qdp-launchpad@openerp.com-20130404095257-oek77sijuxjyi0aj
2013-04-04 11:52:57 +02:00
828edbb276
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20130405062313-k2ucjzk7xhm084or
2013-04-05 06:23:13 +00: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
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
97bba88a53
[MERGE] [REV] Partial revert of change introduced at rev 8926. Portal menu name is now Portal again, Billing and Support will be only used for sub-menus.
...
bzr revid: tde@openerp.com-20130329104956-y9uck7pam32vlnld
2013-03-29 11:49:56 +01:00
7a8d71be6d
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20130329050903-yuxb08q83hlvg6ok
2013-03-29 05:09:03 +00:00
Thibault Delavallée
6d696a65f0
[REV] Portal is back
...
bzr revid: tde@openerp.com-20130328085140-wscr6uk8loydelpm
2013-03-28 09:51:40 +01:00
fc04522286
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20130328060500-yc40z00ubsz154vw
2013-03-28 06:05:00 +00:00
Turkesh Patel (Open ERP)
34a4255885
[FIX] fix some usability issues
...
bzr revid: tpa@tinyerp.com-20130326085212-05wtuqzf8g8t98p2
2013-03-26 14:22:12 +05:30
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
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
f053d2fb5b
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20130312051930-f0frlcd04x9qau0w
2013-03-12 05:19:30 +00: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
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
Christophe Matthieu
aaf7949b42
[FIX] portal: mail_fallowers invite
...
bzr revid: chm@openerp.com-20130305130228-0ebmc26lbd9s6c4t
2013-03-05 14:02:28 +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
Christophe Matthieu