Commit Graph
55192 Commits
Author SHA1 Message Date
Thibault Delavallée d669073fc3 [MERGE] Merged with server/trunk.
bzr revid: tde@openerp.com-20120814152128-s1pstrcc38j89p4z
2012-08-14 17:21:28 +02:00
Thibault Delavallée 6de2150126 [REVIEW] res_users: removed 'date' backward compatible field; removed commented statements not used anymore.
bzr revid: tde@openerp.com-20120814150847-ifdbf92ptaad3bmd
2012-08-14 17:08:47 +02:00
Thibault Delavallée 4cd2978678 [REVIEW] res_partner: partner default image back to gray guy; renamed company_icon to company_image; added the famous gray guy.
bzr revid: tde@openerp.com-20120814150242-50ij6j875mix2idt
2012-08-14 17:02:42 +02:00
Thibault Delavallée eca1451845 [REVIEW] res_users: class renamed from users to res_users; reordered imports; added back default image for avatars.
bzr revid: tde@openerp.com-20120814150212-jc3z8bh4i372snrw
2012-08-14 17:02:12 +02:00
Thibault Delavallée b65b7844d1 [REVIEW] base: removed image from manifest.
bzr revid: tde@openerp.com-20120814145656-pj5fbdes3kq42x3y
2012-08-14 16:56:56 +02:00
niv-openerp 1885387ace [IMP] added html field
bzr revid: nicolas.vanhoren@openerp.com-20120814130656-4pa91mud8u30mqr5
2012-08-14 15:06:56 +02:00
niv-openerp 63ae87fb4c Fixed encoding problems
bzr revid: nicolas.vanhoren@openerp.com-20120814121425-jq3ieebbsa7rcds5
2012-08-14 14:14:25 +02:00
Vo Minh Thu 9341a6f791 [MERGE] merged view changes: the type is now a functional field derived from the arch.
bzr revid: vmt@openerp.com-20120814121110-0wx4w6etkzspzpbh
2012-08-14 14:11:10 +02:00
Thibault Delavallée 399119a073 [IMP] res_users form view: added partnre.
bzr revid: tde@openerp.com-20120814100829-usi8fu8auzf1c0le
2012-08-14 12:08:29 +02:00
Vo Minh Thu 1534feb8f7 [IMP] ir_ui_view: somewhat better type functional field implementation.
bzr revid: vmt@openerp.com-20120814100049-dngykdg5l21q9vvp
2012-08-14 12:00:49 +02:00
Vo Minh Thu 1182be4291 [IMP] core: removed a filter on null IDs as it hides a possible problem (the very fact they are null).
bzr revid: vmt@openerp.com-20120814100007-cppdpazde5oe0khl
2012-08-14 12:00:07 +02:00
niv-openerp f111a51f10 Fixed problem when message is false (i think)
bzr revid: nicolas.vanhoren@openerp.com-20120814094401-uv548xbylkfq8bun
2012-08-14 11:44:01 +02:00
Thibault Delavallée ed9193d4b2 [MERGE] Merged with server/trunk.
bzr revid: tde@openerp.com-20120814084801-b01f3uy5o49m2dva
2012-08-14 10:48:01 +02:00
niv-openerp bb09f83ec8 merge trunk
bzr revid: nicolas.vanhoren@openerp.com-20120814071605-wfc238jl6vi37hl3
2012-08-14 09:16:05 +02:00
niv-openerp cfaeed1581 Removed print in test
bzr revid: nicolas.vanhoren@openerp.com-20120814071457-hw8d5yp6xzporiuo
2012-08-14 09:14:57 +02: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
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 149c6f793f [MERGE] 'My Second Not-Chatter Merge of the Day': add a deprecated attribute on fields.
This revision adds a string 'deprecated' attribute on fields. If not False, the ORM makes a warning when attempting to read the read, or write on it.
Use: 'my_field': fields.char('Old field', size=64, deprecated="This field will be removed with version 42 of OpenERP. Please yse 'my_new_field' instead.")

bzr revid: tde@openerp.com-20120814111143-9qha588hah5380fx
2012-08-14 13:11:43 +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 e4185c910f [FIX] orm deprecated: added a list cast because we may receive tuples (as seen on runbot).
bzr revid: tde@openerp.com-20120814094142-b79hn5xgduhc7w15
2012-08-14 11:41:42 +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
Thibault Delavallée 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
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
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
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
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
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
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
niv-openerp 2522955ef5 Added pyquery dependency
bzr revid: nicolas.vanhoren@openerp.com-20120813161734-7akxglc5908ant25
2012-08-13 18:17:34 +02:00
niv-openerp dc170d1a9a Added protection against javascript in <a>
bzr revid: nicolas.vanhoren@openerp.com-20120813155205-uohwb39ejn66bgmv
2012-08-13 17:52:05 +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
Antonin Bourguignon c06ff002b5 [MERGE] latest trunk
bzr revid: abo@openerp.com-20120813152604-c55hayq9h29ovzdc
2012-08-13 17:26:04 +02:00
Antony Lesuisse 2a84ba0160 [IMP] use registry contextmanager
bzr revid: al@openerp.com-20120813152045-woeg16q10xkhiqgk
2012-08-13 17:20:45 +02:00
Christophe Simonis 3e251640d2 [IMP] add cursor() contextmanager on registry
bzr revid: chs@openerp.com-20120813150501-txkrphi7hyp2tgl1
2012-08-13 17:05:01 +02:00
Antonin Bourguignon 381d97cbf2 [MERGE] latest trunk
bzr revid: abo@openerp.com-20120813145754-wjihljr9iyc2ll08
2012-08-13 16:57:54 +02:00
Stephane Wirtel 36aaaf4a32 [MERGE]
bzr revid: stw@openerp.com-20120813145708-botpw2f1shkhv3on
2012-08-13 16:57:08 +02:00