Thibault Delavallée
aac03b547d
[MERGE] Merged with addons/trunk.
...
bzr revid: tde@openerp.com-20120814152634-ix63oxwcyrfkku4t
2012-08-14 17:26:34 +02:00
Thibault Delavallée
a381c0adce
[REVIEW] res_users in mail_thread: no Chatter-compatible anymore ! Some cleaning will follow. Also reidented some code.
...
bzr revid: tde@openerp.com-20120814152053-edu3i87uzd8ev0u0
2012-08-14 17:20:53 +02:00
niv-openerp
caa053c252
[IMP] Removed usage of OldWidget in edi
...
bzr revid: nicolas.vanhoren@openerp.com-20120814135414-5kdjbmf9www5u24q
2012-08-14 15:54:14 +02:00
niv-openerp
ba5314947b
[IMP] added html field, removed text_html widget
...
bzr revid: nicolas.vanhoren@openerp.com-20120814131030-yrs7wlc53zn8omor
2012-08-14 15:10:30 +02:00
niv-openerp
91c6cb6d8d
[IMP] replaced text_html widget by html field
...
bzr revid: nicolas.vanhoren@openerp.com-20120814131003-5iquqrl8g85v2otc
2012-08-14 15:10:03 +02:00
Olivier Dony
11bdbfd183
[MERGE] Next batch of improvements/fixes for mail.alias
...
bzr revid: odo@openerp.com-20120814123050-xw3ltthoc9nld76r
2012-08-14 14:30:50 +02:00
Vo Minh Thu
2376fe0add
[MERGE] merged view changes: the `type` is now a functional field derived from the arch.
...
bzr revid: vmt@openerp.com-20120814121117-dent4ctz89kdcabi
2012-08-14 14:11:17 +02:00
Olivier Dony
0a22166f88
[FIX] mail.alias: fix constraint creation warnings + properly hide alias on creation form for inhering classes
...
bzr revid: odo@openerp.com-20120814105114-ei0qbgy71fyc8jtb
2012-08-14 12:51:14 +02:00
Olivier Dony
0b2118c10d
[FIX] project.issue: duplicate method, probably bad merge
...
bzr revid: odo@openerp.com-20120814102425-50sbp71muozamm61
2012-08-14 12:24:25 +02:00
Thibault Delavallée
15d997d37b
[RM] [CLEAN] auth_signup: removed unique constraint on email, because what is important is the login; added licence header in files.
...
bzr revid: tde@openerp.com-20120814101535-3fxb1w88qh33srbi
2012-08-14 12:15:35 +02:00
Olivier Dony
d7a2131fd2
[FIX] mail.group: fix broken form view - still needs work!
...
bzr revid: odo@openerp.com-20120814100521-0dac576zzdfhi1mg
2012-08-14 12:05:21 +02:00
Olivier Dony
fcdd930396
[IMP] mail.alias: use hyphen instead of underscore for replacing invalid chars, looks better for mail aliases
...
bzr revid: odo@openerp.com-20120814100354-2sn0505046wv27ot
2012-08-14 12:03:54 +02:00
Olivier Dony
8fac3ae62e
[MERGE] Sync with trunk
...
bzr revid: odo@openerp.com-20120814100217-33qe1dyc3w6vfs0g
2012-08-14 12:02:17 +02:00
Thibault Delavallée
988e04188a
[RM] Portal: removed res_users override, because partner_id is now in base. Removed view and update init and openerp files accordingly.
...
bzr revid: tde@openerp.com-20120814093202-7do78o1h9z44aj53
2012-08-14 11:32:02 +02:00
Thibault Delavallée
bc7ad9c405
[MERGE] Merged with addons/trunk.
...
bzr revid: tde@openerp.com-20120814084936-04v0hywe2drc9qum
2012-08-14 10:49:36 +02:00
Thibault Delavallée
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
Olivier Dony
ac4e5d746b
[MERGE] Sync with trunk
...
bzr revid: odo@openerp.com-20120814082029-i1b7d4l5cqgs434g
2012-08-14 10:20:29 +02:00
Thibault Delavallée
8d2c35cc75
[IMP] Misc addons: product_image -> image.
...
bzr revid: tde@openerp.com-20120814081616-zb5xe06cy8r3n5ie
2012-08-14 10:16:16 +02:00
Olivier Dony
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
Thibault Delavallée
936a2efa46
[MERGE] Merged with addons/trunk.
...
bzr revid: tde@openerp.com-20120814075258-52pwvh03fl5fjkqg
2012-08-14 09:52:58 +02:00
Thibault Delavallée
0c45b4763c
[FIX] mail_thread: added forgotten brackets in hasattr.
...
bzr revid: tde@openerp.com-20120814075234-t9v53dtfefg70zmt
2012-08-14 09:52:34 +02:00
niv-openerp
39691fd0b5
merge trunk
...
bzr revid: nicolas.vanhoren@openerp.com-20120814071749-1ol2c4ruip6bqsu6
2012-08-14 09:17:49 +02:00
niv-openerp
3052a5fa1a
merge trunk
...
bzr revid: nicolas.vanhoren@openerp.com-20120814071632-jifvgwkj6lawrqo7
2012-08-14 09:16:32 +02:00
Launchpad Translations on behalf of openerp
cd04752f66
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20120814044618-2edn0a32irj2dpr6
2012-08-14 04:46:18 +00:00
Antony Lesuisse
e51d72422c
[IMP] move session_context above wsgi app
...
bzr revid: al@openerp.com-20120813232405-qna3d48h6j8tfks1
2012-08-14 01:24:05 +02:00
Antony Lesuisse
01d89b15b7
[IMP] rename session cookie into httpsession_cookie
...
bzr revid: al@openerp.com-20120813231123-wodv8vkof9dvi1gh
2012-08-14 01:11:23 +02:00
Thibault Delavallée
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
Thibault Delavallée
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
Thibault Delavallée
0c3e1607de
[MERGE] Merged with addons/trunk.
...
bzr revid: tde@openerp.com-20120813193029-jsilsux051e53van
2012-08-13 21:30:29 +02:00
Christophe Simonis
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
Antony Lesuisse
5fe34edd38
[IMP] update backbone
...
bzr revid: al@openerp.com-20120813170739-kxm4s289mbm2tty4
2012-08-13 19:07:39 +02:00
Christophe Simonis
3e797902fc
[FIX] /login route
...
bzr revid: chs@openerp.com-20120814120335-6lc0u21r0mhd9bl2
2012-08-14 14:03:35 +02:00
Fabien Pinckaers
ff9cbe0673
[MERGE] mail groups improvements
...
better form view
security on groups: public, private, selected groups (for employees)
menu automatically created/filtered
action to open a specific group inline
small fix in composition: new msg not linked to current user
bzr revid: fp@openerp.com-20120814112942-8wo9owa14hk5xqbj
2012-08-14 13:29:42 +02:00
Fabien Pinckaers
85ca542ad0
[IMP] mail groups improvements: security
...
bzr revid: fp@openerp.com-20120814112204-hwamufqqz4qj9ptb
2012-08-14 13:22:04 +02:00
Thibault Delavallée
2edf42928b
[MERGE] 'My Second Not-Chatter Merge of the Day': add a deprecated attribute on fields.
...
This revision adds a string 'deprecated' attribute on fields. This addons-side merge is a small addition to be used as an example. The 'member_ids' field of mail.group is set as deprecated, as it will disappear when merging openchater-3-5-followers task, putting a real follower_ids fields on mail.thread objects.
bzr revid: tde@openerp.com-20120814111111-xq9ddv5w3favht93
2012-08-14 13:11:11 +02:00
Thibault Delavallée
65f589dda5
[IMP] mail.gorup: added deprecated attribute on field that will trigger a warning.
...
bzr revid: tde@openerp.com-20120814104233-91qvv2bqc0d3mtc1
2012-08-14 12:42:33 +02:00
Fabien Pinckaers
dcc24957bd
[IMP] small css improvement
...
bzr revid: fp@openerp.com-20120814103911-8l63u3bahy9w4xsj
2012-08-14 12:39:11 +02:00
Christophe Simonis
747374f98f
[FIX] hide/show topbar and leftbar on login page and db manager
...
bzr revid: chs@openerp.com-20120814103815-ajdku32ngf5eidrf
2012-08-14 12:38:15 +02:00
Christophe Simonis
a1d68fb739
[IMP] execute original action after login. also pass the current state to login (so the Widget can handle it)
...
bzr revid: chs@openerp.com-20120814094654-fmimm145mrgvznb0
2012-08-14 11:46:54 +02:00
Thibault Delavallée
c057c5ec34
[IMP] mail.group: set member_ids as deprecated.
...
bzr revid: tde@openerp.com-20120814090857-2q6a1e9ovrijetea
2012-08-14 11:08:57 +02:00
Fabien Pinckaers
6f7b789f7a
[IMP] mail group in menu
...
bzr revid: fp@openerp.com-20120814090719-7dals8fzupv9cx4j
2012-08-14 11:07:19 +02:00
Thibault Delavallée
9463536724
[MERGE] Merged with addons/trunk.
...
bzr revid: tde@openerp.com-20120814090341-2qvwriaa09mwn186
2012-08-14 11:03:41 +02:00
Fabien Pinckaers
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
Vo Minh Thu
9822629548
[MERGE] merged trunk.
...
bzr revid: vmt@openerp.com-20120813160657-ilujdek8ys4fzhp9
2012-08-13 18:06:57 +02:00
niv-openerp
1ea43c0a23
Changed necessary fields
...
bzr revid: nicolas.vanhoren@openerp.com-20120813160654-kdebwwds8eysxtar
2012-08-13 18:06:54 +02:00
Antonin Bourguignon
47976b0f42
[MERGE] simplify portal's jobs section
...
bzr revid: abo@openerp.com-20120813154637-2tdmpl5pgmx7a0sp
2012-08-13 17:46:37 +02:00
niv-openerp
1ea62dd94c
Added protection
...
bzr revid: nicolas.vanhoren@openerp.com-20120813154555-rw4kh1jxdbmg8xab
2012-08-13 17:45:55 +02:00
niv-openerp
235f8996bf
Implemented read only mode
...
bzr revid: nicolas.vanhoren@openerp.com-20120813154011-hgq3vxxdps5s9w91
2012-08-13 17:40:11 +02:00
Antonin Bourguignon
c06ff002b5
[MERGE] latest trunk
...
bzr revid: abo@openerp.com-20120813152604-c55hayq9h29ovzdc
2012-08-13 17:26:04 +02:00
niv-openerp
8c7b192ab7
Removed useless dependency between fieldtexthtml and fieldtext
...
bzr revid: nicolas.vanhoren@openerp.com-20120813152227-29l173q31tcwc9tq
2012-08-13 17:22:27 +02:00