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
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
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
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
85ca542ad0
[IMP] mail groups improvements: security
...
bzr revid: fp@openerp.com-20120814112204-hwamufqqz4qj9ptb
2012-08-14 13:22:04 +02:00
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
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
dcc24957bd
[IMP] small css improvement
...
bzr revid: fp@openerp.com-20120814103911-8l63u3bahy9w4xsj
2012-08-14 12:39:11 +02:00
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
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
c057c5ec34
[IMP] mail.group: set member_ids as deprecated.
...
bzr revid: tde@openerp.com-20120814090857-2q6a1e9ovrijetea
2012-08-14 11:08:57 +02:00
6f7b789f7a
[IMP] mail group in menu
...
bzr revid: fp@openerp.com-20120814090719-7dals8fzupv9cx4j
2012-08-14 11:07:19 +02:00
9463536724
[MERGE] Merged with addons/trunk.
...
bzr revid: tde@openerp.com-20120814090341-2qvwriaa09mwn186
2012-08-14 11:03:41 +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
8d2c35cc75
[IMP] Misc addons: product_image -> image.
...
bzr revid: tde@openerp.com-20120814081616-zb5xe06cy8r3n5ie
2012-08-14 10:16:16 +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
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
cd04752f66
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20120814044618-2edn0a32irj2dpr6
2012-08-14 04:46:18 +00: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
0c3e1607de
[MERGE] Merged with addons/trunk.
...
bzr revid: tde@openerp.com-20120813193029-jsilsux051e53van
2012-08-13 21:30:29 +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
9822629548
[MERGE] merged trunk.
...
bzr revid: vmt@openerp.com-20120813160657-ilujdek8ys4fzhp9
2012-08-13 18:06:57 +02:00
47976b0f42
[MERGE] simplify portal's jobs section
...
bzr revid: abo@openerp.com-20120813154637-2tdmpl5pgmx7a0sp
2012-08-13 17:46:37 +02:00
c06ff002b5
[MERGE] latest trunk
...
bzr revid: abo@openerp.com-20120813152604-c55hayq9h29ovzdc
2012-08-13 17:26:04 +02:00
2a84ba0160
[IMP] use registry contextmanager
...
bzr revid: al@openerp.com-20120813152045-woeg16q10xkhiqgk
2012-08-13 17:20:45 +02:00
381d97cbf2
[MERGE] latest trunk
...
bzr revid: abo@openerp.com-20120813145754-wjihljr9iyc2ll08
2012-08-13 16:57:54 +02:00
36aaaf4a32
[MERGE]
...
bzr revid: stw@openerp.com-20120813145708-botpw2f1shkhv3on
2012-08-13 16:57:08 +02:00
b79db6f0b3
[IMP] useability, hide fields on partners when not used
...
bzr revid: fp@tinyerp.com-20120813143731-8omk52y879rgbjc1
2012-08-13 16:37:31 +02:00
0f1aa3300d
[FIX] do not autocorrect location header in redirects
...
bzr revid: chs@openerp.com-20120813135927-k32eih6tg6y28ivl
2012-08-13 15:59:27 +02:00
41791f7e2f
[FIX] Fix bug in binary/image controller
...
bzr revid: fme@openerp.com-20120813135653-zvk21ch7dc9rs66w
2012-08-13 15:56:53 +02:00
b8ba2d279b
[IMP] portal's jobs are now a mail group (no more relation with hr_recruitment)
...
bzr revid: abo@openerp.com-20120813133827-ta4zh1s2gbl4a4ib
2012-08-13 15:38:27 +02:00
c356b0ea47
[MERGE] procurement: Fix a part of the code
...
bzr revid: stw@openerp.com-20120813133528-1n8sykpenpjkgi74
2012-08-13 15:35:28 +02:00
9a3deaf3da
[IMP] crm: fixed some categ_id remaining.
...
bzr revid: tde@openerp.com-20120813131207-lu1c271q5dh27vlr
2012-08-13 15:12:07 +02:00
e543552dbd
[FIX] do not mess up the headers in the DisableCacheMiddleware
...
bzr revid: chs@openerp.com-20120813130955-1fwkyahlceotln5o
2012-08-13 15:09:55 +02:00
ae6d1fe900
[FIX] crm_lead: categ_id -> now categ_ids.
...
bzr revid: tde@openerp.com-20120813125822-1knqrg2adg90xxpy
2012-08-13 14:58:22 +02:00
9db0a94280
[IMP] CRM demo data: subtype -> content_subtype. Please check your logs before merging ...
...
bzr revid: tde@openerp.com-20120813125803-sodjl70yrnk3i2v0
2012-08-13 14:58:03 +02:00
ba61f0733a
[IMP] base_calendar: removed email_from from demo data, because this field does not exist; updated used categories, because some were not defined.
...
bzr revid: tde@openerp.com-20120813124704-qa70aa3aevh4s0qv
2012-08-13 14:47:04 +02:00
fd009ce95f
[MERGE] Merged with addons/trunk.
...
bzr revid: tde@openerp.com-20120813123145-ruli48hzsfiu6g1y
2012-08-13 14:31:45 +02:00
9558419498
[IMP] base_calendar: removed annoying spaces in debug for tests.
...
bzr revid: tde@openerp.com-20120813123111-i224x123n2a1r8fx
2012-08-13 14:31:11 +02:00
2a22a88230
[FIX] mail_thread: fixed some forgotten \).
...
bzr revid: tde@openerp.com-20120813123051-5lxzx5011j2skrk8
2012-08-13 14:30:51 +02:00
b50dfe4f8f
[IMP] Adapt openerp.web.Dialog's position and maxHeight to the new jquery bootstrap theme.
...
bzr revid: fme@openerp.com-20120813103256-zhw7od30g9j406uv
2012-08-13 12:32:56 +02:00
b479fbf64a
[IMP] mail_thread: continuing to translate hasattr to something else.
...
bzr revid: tde@openerp.com-20120813103038-4o1xwtsmjnvjj0b4
2012-08-13 12:30:38 +02:00
cdc3e2b333
[MERGE] demo data
...
bzr revid: fp@tinyerp.com-20120813103024-9yn1jrk80hk59bkz
2012-08-13 12:30:24 +02:00
fd471af0d8
[IMP] mail_thread: replaced hasattr by check in columns.
...
bzr revid: tde@openerp.com-20120813090641-n8o08be2ecfxxtdz
2012-08-13 11:06:41 +02:00
5fd7ad04c1
[REM]: hr: Removed duplicate employee and department from demo
...
bzr revid: rpa@tinyerp.com-20120813072738-temucs10vhcubepv
2012-08-13 12:57:38 +05:30
98e591c2a7
[IMP]: point_of_sale: Improved remaining product name translation
...
bzr revid: rpa@tinyerp.com-20120813071720-kcsjouksbz4v0act
2012-08-13 12:47:20 +05:30
Vo Minh Thu
Antony Lesuisse
Christophe Simonis
Fabien Pinckaers
Thibault Delavallée
Fabien Pinckaers
Launchpad Translations on behalf of openerp
Antonin Bourguignon
Stephane Wirtel
Fabien Meghazi
Rucha (Open ERP)