7c0a0a0158
[MERGE] Merged with server/trunk.
...
bzr revid: tde@openerp.com-20120810073318-gcgnj16e02qvg0y3
bzr revid: tde@openerp.com-20120814090328-seyvug8zdagbdm0o
2012-08-14 11:03:28 +02:00
bc7ad9c405
[MERGE] Merged with addons/trunk.
...
bzr revid: tde@openerp.com-20120814084936-04v0hywe2drc9qum
2012-08-14 10:49:36 +02:00
ed9193d4b2
[MERGE] Merged with server/trunk.
...
bzr revid: tde@openerp.com-20120814084801-b01f3uy5o49m2dva
2012-08-14 10:48:01 +02:00
54cce9916e
[MERGE] This 'A Brand New Not-Chatter Branch for Bender' branch fixes some of the warnings / issues :
...
- mail_thread warnings about hasattr(user_id) -> now checks if user_id in columns
- this has trigerred a bug about needaction_user_ids -> called in mail_thread only if defined, all mail_thread objects are not inheriting from need action
- base_calendar: xml files holding values for fields that does not exist
- crm: fixed some warning due to categ_id that became categ_ids; it could have been interesting to check the categ_id(s) behavior before merging
- crm lead demo data: message subtype is now content_subtype since one of the Chatter merge
- misc addons: product.product does not have any 'product_image' field anymore, but an 'image' field
bzr revid: tde@openerp.com-20120814084510-ay2ul0ceru12nkyh
2012-08-14 10:45:10 +02:00
ac4e5d746b
[MERGE] Sync with trunk
...
bzr revid: odo@openerp.com-20120814082029-i1b7d4l5cqgs434g
2012-08-14 10:20:29 +02:00
8d2c35cc75
[IMP] Misc addons: product_image -> image.
...
bzr revid: tde@openerp.com-20120814081616-zb5xe06cy8r3n5ie
2012-08-14 10:16:16 +02:00
28148809a1
[IMP] mail.alias: start writing tests, fix detected errors
...
bzr revid: odo@openerp.com-20120814080421-nn6h3z4v54dl949c
2012-08-14 10:04:21 +02:00
936a2efa46
[MERGE] Merged with addons/trunk.
...
bzr revid: tde@openerp.com-20120814075258-52pwvh03fl5fjkqg
2012-08-14 09:52:58 +02:00
0c45b4763c
[FIX] mail_thread: added forgotten brackets in hasattr.
...
bzr revid: tde@openerp.com-20120814075234-t9v53dtfefg70zmt
2012-08-14 09:52:34 +02:00
39691fd0b5
merge trunk
...
bzr revid: nicolas.vanhoren@openerp.com-20120814071749-1ol2c4ruip6bqsu6
2012-08-14 09:17:49 +02:00
3052a5fa1a
merge trunk
...
bzr revid: nicolas.vanhoren@openerp.com-20120814071632-jifvgwkj6lawrqo7
2012-08-14 09:16:32 +02:00
bb09f83ec8
merge trunk
...
bzr revid: nicolas.vanhoren@openerp.com-20120814071605-wfc238jl6vi37hl3
2012-08-14 09:16:05 +02:00
cfaeed1581
Removed print in test
...
bzr revid: nicolas.vanhoren@openerp.com-20120814071457-hw8d5yp6xzporiuo
2012-08-14 09:14:57 +02:00
48f2640283
[FIX]hr_expense :put an onchange in the currency field that fill the force journal field with a purhcase journal that has the same currency
...
bzr revid: mma@tinyerp.com-20120814065201-57472t4o0wma1232
2012-08-14 12:22:01 +05:30
29eb174ce5
[ADD] mail: mail groups
...
extract groups and add new features to them?
bzr revid: fp@tinyerp.com-20120814065136-nlwh14rwbgj57tqx
2012-08-14 08:51:36 +02:00
25367f13bb
[FIX]hr_expense :improve fource journal if fource journal have currency convert the expense to that currency
...
bzr revid: mma@tinyerp.com-20120814054348-6ofe8r0fcksbhp85
2012-08-14 11:13:48 +05:30
cd04752f66
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20120814044618-2edn0a32irj2dpr6
2012-08-14 04:46:18 +00:00
e51d72422c
[IMP] move session_context above wsgi app
...
bzr revid: al@openerp.com-20120813232405-qna3d48h6j8tfks1
2012-08-14 01:24:05 +02:00
01d89b15b7
[IMP] rename session cookie into httpsession_cookie
...
bzr revid: al@openerp.com-20120813231123-wodv8vkof9dvi1gh
2012-08-14 01:11:23 +02:00
f397e44b2f
[FIX] portal: mail_subscription -> mail_followers.
...
bzr revid: tde@openerp.com-20120813195419-c1j3r95wyj7fb0hj
2012-08-13 21:54:19 +02:00
3d3f17c465
[FIX] crm_opp_to_phonecall: I was quite too fast for last rev, phonecall has categ_id, not categ_ids.
...
bzr revid: tde@openerp.com-20120813195210-lj58w2hc1r0yxj1u
2012-08-13 21:52:10 +02:00
634a68a0ff
[FIX] mail_thread: protection for needaction_user_ids: check if has the method.
...
bzr revid: tde@openerp.com-20120813195023-jv4pi1ct6tj30n4r
2012-08-13 21:50:23 +02:00
2ae73a7615
[REF] mail_thread: updated message_ids and message_summary computation due to changes in followers.
...
bzr revid: tde@openerp.com-20120813194115-j125ubffz7alghzv
2012-08-13 21:41:15 +02:00
882eff5556
[REF] mail.group: continuing the refactoring. member_ids field deleted, because this is now a standard field on mail.thread. Updated view and methods accordingly.
...
bzr revid: tde@openerp.com-20120813194037-qm2xamhgnos3gqpt
2012-08-13 21:40:37 +02:00
f6155e6fa0
[FIX] mail_followers_view: deleted read field from view, because was deleted from modele.
...
bzr revid: tde@openerp.com-20120813193910-5rnsgm0wf3hikkss
2012-08-13 21:39:10 +02:00
a52b57acf4
[REF] Still refactoring of names: propagated to security files.
...
bzr revid: tde@openerp.com-20120813193841-yavky2odabj5li70
2012-08-13 21:38:41 +02:00
0c3e1607de
[MERGE] Merged with addons/trunk.
...
bzr revid: tde@openerp.com-20120813193029-jsilsux051e53van
2012-08-13 21:30:29 +02:00
c14a28fd93
[MISC] mail_thread: updated one comment.
...
bzr revid: tde@openerp.com-20120813192427-vw2id9wtd1hil9as
2012-08-13 21:24:27 +02:00
9a3680e7f5
[REF] mail: init and openerp files updated with followers instead of subscription.
...
bzr revid: tde@openerp.com-20120813191501-tapi42znpz9bckiy
2012-08-13 21:15:01 +02:00
838e63a429
[REF] mail_thread: refactoring of followers continuing. Updated reference to subscription to followers. Also removed message_read_subscribers and message_is_subscriber, not used anymore.
...
bzr revid: tde@openerp.com-20120813191346-cpn09u4xqiesvpwb
2012-08-13 21:13:46 +02:00
ff0a280a7e
[REF] mail.subscription: renamed to mail.followers. Also renamed files accordingly. Views and menu entries have been updated. Also removed an ununsed read field on mail.notification.
...
bzr revid: tde@openerp.com-20120813191006-jf7vygdyb93k7nxf
2012-08-13 21:10:06 +02:00
59d8cb124c
[IMP] mail_thread: do not subscribe followers already subscribed.
...
bzr revid: tde@openerp.com-20120813183312-qpuksy9ku7z5zemx
2012-08-13 20:33:12 +02:00
45660bff5c
Brand new status breadcrum! (TODO: update js for clickable buttons)
...
bzr revid: mit@openerp.com-20120813182946-ep9231bf7bksyvev
2012-08-13 20:29:46 +02:00
ceff2d6110
[MERGE] Merged with addons/trunk.
...
bzr revid: tde@openerp.com-20120813181421-tul284j7ybvrevjd
2012-08-13 20:14:21 +02:00
98b17f6e96
[IMP] mail_thread: many2many_reference: now overrides the 6 command.
...
bzr revid: tde@openerp.com-20120813180941-n0u1xq0dx2cf8rsf
2012-08-13 20:09:41 +02:00
f2c059312b
[IMP] split login_and_redirect() into login_and_redirect() and set_cookie_and_redirect()
...
bzr revid: chs@openerp.com-20120813171301-w1ynjqhosrt68ppa
2012-08-13 19:13:01 +02:00
5fe34edd38
[IMP] update backbone
...
bzr revid: al@openerp.com-20120813170739-kxm4s289mbm2tty4
2012-08-13 19:07:39 +02:00
3e797902fc
[FIX] /login route
...
bzr revid: chs@openerp.com-20120814120335-6lc0u21r0mhd9bl2
2012-08-14 14:03:35 +02:00
2522955ef5
Added pyquery dependency
...
bzr revid: nicolas.vanhoren@openerp.com-20120813161734-7akxglc5908ant25
2012-08-13 18:17:34 +02:00
9822629548
[MERGE] merged trunk.
...
bzr revid: vmt@openerp.com-20120813160657-ilujdek8ys4fzhp9
2012-08-13 18:06:57 +02:00
1ea43c0a23
Changed necessary fields
...
bzr revid: nicolas.vanhoren@openerp.com-20120813160654-kdebwwds8eysxtar
2012-08-13 18:06:54 +02:00
a4e674a913
[IMP] mail: cleaned (un)follow process. Methods now return the new field value, the widget calls set_value to update the displayed value. More consistent with OpenERP web behavior (I think). Misc improvements in code, more general.
...
bzr revid: tde@openerp.com-20120813160027-tx4p80kvxwbkg66c
2012-08-13 18:00:27 +02:00
dc170d1a9a
Added protection against javascript in <a>
...
bzr revid: nicolas.vanhoren@openerp.com-20120813155205-uohwb39ejn66bgmv
2012-08-13 17:52:05 +02:00
47976b0f42
[MERGE] simplify portal's jobs section
...
bzr revid: abo@openerp.com-20120813154637-2tdmpl5pgmx7a0sp
2012-08-13 17:46:37 +02:00
1ea62dd94c
Added protection
...
bzr revid: nicolas.vanhoren@openerp.com-20120813154555-rw4kh1jxdbmg8xab
2012-08-13 17:45:55 +02:00
6a33cfa71a
[IMP] auth_openid: use registry.cursor() instead of utils.cursor()
...
bzr revid: chs@openerp.com-20120813154419-4rwe6d4w6w0irl37
2012-08-13 17:44:19 +02:00
f25ad66a8f
[FIX] auth_openid: correct Login template overwrite
...
bzr revid: chs@openerp.com-20120813154309-ka8cfp777ktglfr6
2012-08-13 17:43:09 +02:00
6b2738dc13
[FIX] added password to auth process
...
bzr revid: vta@openerp.com-20120814101337-b3ucei2tdyyinsbd
2012-08-14 12:13:37 +02:00
acd84e72c6
[FIX] res_user check method partial fix.
...
bzr revid: vta@openerp.com-20120814063413-kymp5dq5sbz2iih8
2012-08-14 08:34:13 +02:00
235f8996bf
Implemented read only mode
...
bzr revid: nicolas.vanhoren@openerp.com-20120813154011-hgq3vxxdps5s9w91
2012-08-13 17:40:11 +02:00
Thibault Delavallée
Olivier Dony
niv-openerp
Mayur Maheshwari (OpenERP)
Fabien Pinckaers
Launchpad Translations on behalf of openerp
Antony Lesuisse
Minh Tran
Christophe Simonis
Vo Minh Thu
Antonin Bourguignon