Launchpad Translations on behalf of openerp [Wed, 15 Aug 2012 04:51:04 +0000 (04:51 +0000)]
Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-
20120815044025-2nutgrzzxyqb60on
bzr revid: launchpad_translations_on_behalf_of_openerp-
20120815045104-n4a0t10m25fegodp
Quentin (OpenERP) [Tue, 14 Aug 2012 19:21:23 +0000 (21:21 +0200)]
[MERGE] staging branch with lp bug and new settings for decimal precision (Courtesy of Akretion)
bzr revid: qdp-launchpad@openerp.com-
20120814192123-lr3ru44x900owv2n
Fabien Pinckaers [Tue, 14 Aug 2012 16:57:50 +0000 (18:57 +0200)]
fix
bzr revid: fp@openerp.com-
20120814165750-k2mmj30200jaee3m
Fabien Pinckaers [Tue, 14 Aug 2012 16:39:01 +0000 (18:39 +0200)]
merge
bzr revid: fp@openerp.com-
20120814163901-chassx588kktn17y
Christophe Simonis [Tue, 14 Aug 2012 15:30:53 +0000 (17:30 +0200)]
[IMP] sed -i '' -e 's/connection/session/g'
bzr revid: chs@openerp.com-
20120814153053-3bznfj7woq2xi1f1
Christophe Simonis [Tue, 14 Aug 2012 15:29:00 +0000 (17:29 +0200)]
[IMP] sed -i '' -e 's/connection/session/g'
bzr revid: chs@openerp.com-
20120814152900-8r84kyz0qy1hwkvz
Quentin (OpenERP) [Tue, 14 Aug 2012 14:43:36 +0000 (16:43 +0200)]
[MERGE] trunk + lp bug branch
bzr revid: qdp-launchpad@openerp.com-
20120814144336-93vym1dfc4i6j0dy
Quentin (OpenERP) [Tue, 14 Aug 2012 14:37:51 +0000 (16:37 +0200)]
[MERGE] lp: 932059 (removal of dead state in PO)
bzr revid: qdp-launchpad@openerp.com-
20120814143751-e14dqq9ofcf69jgb
Quentin (OpenERP) [Tue, 14 Aug 2012 14:10:40 +0000 (16:10 +0200)]
[MERGE] merged branch that corrects the decimal precision on fields. Courtesy of Akretion
bzr revid: qdp-launchpad@openerp.com-
20120814141040-oaf7d56thhi2s9rm
niv-openerp [Tue, 14 Aug 2012 13:54:14 +0000 (15:54 +0200)]
[IMP] Removed usage of OldWidget in edi
bzr revid: nicolas.vanhoren@openerp.com-
20120814135414-5kdjbmf9www5u24q
Fabien Pinckaers [Tue, 14 Aug 2012 13:29:52 +0000 (15:29 +0200)]
[IMP] removed categories in tags , fix
bzr revid: fp@openerp.com-
20120814132952-1t9pocyaxlsoxwt3
Christophe Simonis [Tue, 14 Aug 2012 13:11:59 +0000 (15:11 +0200)]
[FIX] unknow route must return 404 not 500
bzr revid: chs@openerp.com-
20120814131159-0ie5h6tnxdgebpva
Xavier Morel [Tue, 14 Aug 2012 14:30:03 +0000 (16:30 +0200)]
[FIX] invocation of import and export dialogs
bzr revid: xmo@openerp.com-
20120814143003-ss974ub0yym09gyt
niv-openerp [Tue, 14 Aug 2012 13:54:39 +0000 (15:54 +0200)]
[IMP] removed remaining usages of OldWidget (sorry)
bzr revid: nicolas.vanhoren@openerp.com-
20120814135439-mslx2buf8pdpidkk
niv-openerp [Tue, 14 Aug 2012 13:53:24 +0000 (15:53 +0200)]
Removed remaining usages
bzr revid: nicolas.vanhoren@openerp.com-
20120814135324-7s3nmywqyikgvvui
niv-openerp [Tue, 14 Aug 2012 13:42:46 +0000 (15:42 +0200)]
[IMP] removed a lot of OldWidget usage
bzr revid: nicolas.vanhoren@openerp.com-
20120814134246-y2awqbt2i1hcan61
niv-openerp [Tue, 14 Aug 2012 13:31:07 +0000 (15:31 +0200)]
[IMP] Removed OldWidget in data.js
bzr revid: nicolas.vanhoren@openerp.com-
20120814133107-prmdonwh6f7gu276
niv-openerp [Tue, 14 Aug 2012 13:10:30 +0000 (15:10 +0200)]
[IMP] added html field, removed text_html widget
bzr revid: nicolas.vanhoren@openerp.com-
20120814131030-yrs7wlc53zn8omor
niv-openerp [Tue, 14 Aug 2012 13:10:03 +0000 (15:10 +0200)]
[IMP] replaced text_html widget by html field
bzr revid: nicolas.vanhoren@openerp.com-
20120814131003-5iquqrl8g85v2otc
niv-openerp [Tue, 14 Aug 2012 13:06:56 +0000 (15:06 +0200)]
[IMP] added html field
bzr revid: nicolas.vanhoren@openerp.com-
20120814130656-4pa91mud8u30mqr5
Fabien Pinckaers [Tue, 14 Aug 2012 12:56:11 +0000 (14:56 +0200)]
[IMP] removing structure in partner tags
bzr revid: fp@openerp.com-
20120814125611-16zayxxzha9213re
Olivier Dony [Tue, 14 Aug 2012 12:30:50 +0000 (14:30 +0200)]
[MERGE] Next batch of improvements/fixes for mail.alias
bzr revid: odo@openerp.com-
20120814123050-xw3ltthoc9nld76r
niv-openerp [Tue, 14 Aug 2012 12:14:25 +0000 (14:14 +0200)]
Fixed encoding problems
bzr revid: nicolas.vanhoren@openerp.com-
20120814121425-jq3ieebbsa7rcds5
Vo Minh Thu [Tue, 14 Aug 2012 12:11:17 +0000 (14:11 +0200)]
[MERGE] merged view changes: the `type` is now a functional field derived from the arch.
bzr revid: vmt@openerp.com-
20120814121117-dent4ctz89kdcabi
Vo Minh Thu [Tue, 14 Aug 2012 12:11:10 +0000 (14:11 +0200)]
[MERGE] merged view changes: the `type` is now a functional field derived from the arch.
bzr revid: vmt@openerp.com-
20120814121110-0wx4w6etkzspzpbh
Olivier Dony [Tue, 14 Aug 2012 10:51:14 +0000 (12:51 +0200)]
[FIX] mail.alias: fix constraint creation warnings + properly hide alias on creation form for inhering classes
bzr revid: odo@openerp.com-
20120814105114-ei0qbgy71fyc8jtb
Olivier Dony [Tue, 14 Aug 2012 10:24:25 +0000 (12:24 +0200)]
[FIX] project.issue: duplicate method, probably bad merge
bzr revid: odo@openerp.com-
20120814102425-50sbp71muozamm61
Olivier Dony [Tue, 14 Aug 2012 10:05:21 +0000 (12:05 +0200)]
[FIX] mail.group: fix broken form view - still needs work!
bzr revid: odo@openerp.com-
20120814100521-0dac576zzdfhi1mg
Olivier Dony [Tue, 14 Aug 2012 10:03:54 +0000 (12:03 +0200)]
[IMP] mail.alias: use hyphen instead of underscore for replacing invalid chars, looks better for mail aliases
bzr revid: odo@openerp.com-
20120814100354-2sn0505046wv27ot
Olivier Dony [Tue, 14 Aug 2012 10:02:17 +0000 (12:02 +0200)]
[MERGE] Sync with trunk
bzr revid: odo@openerp.com-
20120814100217-33qe1dyc3w6vfs0g
Vo Minh Thu [Tue, 14 Aug 2012 10:00:49 +0000 (12:00 +0200)]
[IMP] ir_ui_view: somewhat better `type` functional field implementation.
bzr revid: vmt@openerp.com-
20120814100049-dngykdg5l21q9vvp
Vo Minh Thu [Tue, 14 Aug 2012 10:00:07 +0000 (12:00 +0200)]
[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
niv-openerp [Tue, 14 Aug 2012 09:44:01 +0000 (11:44 +0200)]
Fixed problem when message is false (i think)
bzr revid: nicolas.vanhoren@openerp.com-
20120814094401-uv548xbylkfq8bun
Thibault Delavallée [Tue, 14 Aug 2012 08:45:10 +0000 (10:45 +0200)]
[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
Olivier Dony [Tue, 14 Aug 2012 08:20:29 +0000 (10:20 +0200)]
[MERGE] Sync with trunk
bzr revid: odo@openerp.com-
20120814082029-i1b7d4l5cqgs434g
Thibault Delavallée [Tue, 14 Aug 2012 08:16:16 +0000 (10:16 +0200)]
[IMP] Misc addons: product_image -> image.
bzr revid: tde@openerp.com-
20120814081616-zb5xe06cy8r3n5ie
Olivier Dony [Tue, 14 Aug 2012 08:04:21 +0000 (10:04 +0200)]
[IMP] mail.alias: start writing tests, fix detected errors
bzr revid: odo@openerp.com-
20120814080421-nn6h3z4v54dl949c
Thibault Delavallée [Tue, 14 Aug 2012 07:52:58 +0000 (09:52 +0200)]
[MERGE] Merged with addons/trunk.
bzr revid: tde@openerp.com-
20120814075258-52pwvh03fl5fjkqg
Thibault Delavallée [Tue, 14 Aug 2012 07:52:34 +0000 (09:52 +0200)]
[FIX] mail_thread: added forgotten brackets in hasattr.
bzr revid: tde@openerp.com-
20120814075234-t9v53dtfefg70zmt
niv-openerp [Tue, 14 Aug 2012 07:17:49 +0000 (09:17 +0200)]
merge trunk
bzr revid: nicolas.vanhoren@openerp.com-
20120814071749-1ol2c4ruip6bqsu6
niv-openerp [Tue, 14 Aug 2012 07:16:32 +0000 (09:16 +0200)]
merge trunk
bzr revid: nicolas.vanhoren@openerp.com-
20120814071632-jifvgwkj6lawrqo7
niv-openerp [Tue, 14 Aug 2012 07:16:05 +0000 (09:16 +0200)]
merge trunk
bzr revid: nicolas.vanhoren@openerp.com-
20120814071605-wfc238jl6vi37hl3
niv-openerp [Tue, 14 Aug 2012 07:14:57 +0000 (09:14 +0200)]
Removed print in test
bzr revid: nicolas.vanhoren@openerp.com-
20120814071457-hw8d5yp6xzporiuo
Launchpad Translations on behalf of openerp [Tue, 14 Aug 2012 04:46:18 +0000 (04:46 +0000)]
Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-
20120814044618-2edn0a32irj2dpr6
Antony Lesuisse [Mon, 13 Aug 2012 23:24:05 +0000 (01:24 +0200)]
[IMP] move session_context above wsgi app
bzr revid: al@openerp.com-
20120813232405-qna3d48h6j8tfks1
Antony Lesuisse [Mon, 13 Aug 2012 23:11:23 +0000 (01:11 +0200)]
[IMP] rename session cookie into httpsession_cookie
bzr revid: al@openerp.com-
20120813231123-wodv8vkof9dvi1gh
Thibault Delavallée [Mon, 13 Aug 2012 19:52:10 +0000 (21:52 +0200)]
[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
Thibault Delavallée [Mon, 13 Aug 2012 19:50:23 +0000 (21:50 +0200)]
[FIX] mail_thread: protection for needaction_user_ids: check if has the method.
bzr revid: tde@openerp.com-
20120813195023-jv4pi1ct6tj30n4r
Thibault Delavallée [Mon, 13 Aug 2012 19:30:29 +0000 (21:30 +0200)]
[MERGE] Merged with addons/trunk.
bzr revid: tde@openerp.com-
20120813193029-jsilsux051e53van
Christophe Simonis [Mon, 13 Aug 2012 17:13:01 +0000 (19:13 +0200)]
[IMP] split login_and_redirect() into login_and_redirect() and set_cookie_and_redirect()
bzr revid: chs@openerp.com-
20120813171301-w1ynjqhosrt68ppa
Antony Lesuisse [Mon, 13 Aug 2012 17:07:39 +0000 (19:07 +0200)]
[IMP] update backbone
bzr revid: al@openerp.com-
20120813170739-kxm4s289mbm2tty4
Christophe Simonis [Tue, 14 Aug 2012 12:03:35 +0000 (14:03 +0200)]
[FIX] /login route
bzr revid: chs@openerp.com-
20120814120335-6lc0u21r0mhd9bl2
Fabien Pinckaers [Tue, 14 Aug 2012 11:29:42 +0000 (13:29 +0200)]
[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
Fabien Pinckaers [Tue, 14 Aug 2012 11:22:04 +0000 (13:22 +0200)]
[IMP] mail groups improvements: security
bzr revid: fp@openerp.com-
20120814112204-hwamufqqz4qj9ptb
Thibault Delavallée [Tue, 14 Aug 2012 11:11:43 +0000 (13:11 +0200)]
[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
Thibault Delavallée [Tue, 14 Aug 2012 11:11:11 +0000 (13:11 +0200)]
[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
Thibault Delavallée [Tue, 14 Aug 2012 10:42:33 +0000 (12:42 +0200)]
[IMP] mail.gorup: added deprecated attribute on field that will trigger a warning.
bzr revid: tde@openerp.com-
20120814104233-91qvv2bqc0d3mtc1
Fabien Pinckaers [Tue, 14 Aug 2012 10:39:11 +0000 (12:39 +0200)]
[IMP] small css improvement
bzr revid: fp@openerp.com-
20120814103911-8l63u3bahy9w4xsj
Christophe Simonis [Tue, 14 Aug 2012 10:38:15 +0000 (12:38 +0200)]
[FIX] hide/show topbar and leftbar on login page and db manager
bzr revid: chs@openerp.com-
20120814103815-ajdku32ngf5eidrf
Christophe Simonis [Tue, 14 Aug 2012 09:46:54 +0000 (11:46 +0200)]
[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
Thibault Delavallée [Tue, 14 Aug 2012 09:41:42 +0000 (11:41 +0200)]
[FIX] orm deprecated: added a list cast because we may receive tuples (as seen on runbot).
bzr revid: tde@openerp.com-
20120814094142-b79hn5xgduhc7w15
Thibault Delavallée [Tue, 14 Aug 2012 09:08:57 +0000 (11:08 +0200)]
[IMP] mail.group: set member_ids as deprecated.
bzr revid: tde@openerp.com-
20120814090857-2q6a1e9ovrijetea
Fabien Pinckaers [Tue, 14 Aug 2012 09:07:19 +0000 (11:07 +0200)]
[IMP] mail group in menu
bzr revid: fp@openerp.com-
20120814090719-7dals8fzupv9cx4j
Thibault Delavallée [Tue, 14 Aug 2012 09:03:41 +0000 (11:03 +0200)]
[MERGE] Merged with addons/trunk.
bzr revid: tde@openerp.com-
20120814090341-2qvwriaa09mwn186
Thibault Delavallée [Tue, 14 Aug 2012 09:03:28 +0000 (11:03 +0200)]
[MERGE] Merged with server/trunk.
bzr revid: tde@openerp.com-
20120810073318-gcgnj16e02qvg0y3
bzr revid: tde@openerp.com-
20120814090328-seyvug8zdagbdm0o
Fabien Pinckaers [Tue, 14 Aug 2012 06:51:36 +0000 (08:51 +0200)]
[ADD] mail: mail groups
extract groups and add new features to them?
bzr revid: fp@tinyerp.com-
20120814065136-nlwh14rwbgj57tqx
niv-openerp [Mon, 13 Aug 2012 16:17:34 +0000 (18:17 +0200)]
Added pyquery dependency
bzr revid: nicolas.vanhoren@openerp.com-
20120813161734-7akxglc5908ant25
Vo Minh Thu [Mon, 13 Aug 2012 16:06:57 +0000 (18:06 +0200)]
[MERGE] merged trunk.
bzr revid: vmt@openerp.com-
20120813160657-ilujdek8ys4fzhp9
niv-openerp [Mon, 13 Aug 2012 16:06:54 +0000 (18:06 +0200)]
Changed necessary fields
bzr revid: nicolas.vanhoren@openerp.com-
20120813160654-kdebwwds8eysxtar
niv-openerp [Mon, 13 Aug 2012 15:52:05 +0000 (17:52 +0200)]
Added protection against javascript in <a>
bzr revid: nicolas.vanhoren@openerp.com-
20120813155205-uohwb39ejn66bgmv
Antonin Bourguignon [Mon, 13 Aug 2012 15:46:37 +0000 (17:46 +0200)]
[MERGE] simplify portal's jobs section
bzr revid: abo@openerp.com-
20120813154637-2tdmpl5pgmx7a0sp
niv-openerp [Mon, 13 Aug 2012 15:45:55 +0000 (17:45 +0200)]
Added protection
bzr revid: nicolas.vanhoren@openerp.com-
20120813154555-rw4kh1jxdbmg8xab
niv-openerp [Mon, 13 Aug 2012 15:40:11 +0000 (17:40 +0200)]
Implemented read only mode
bzr revid: nicolas.vanhoren@openerp.com-
20120813154011-hgq3vxxdps5s9w91
Antonin Bourguignon [Mon, 13 Aug 2012 15:26:04 +0000 (17:26 +0200)]
[MERGE] latest trunk
bzr revid: abo@openerp.com-
20120813152604-c55hayq9h29ovzdc
niv-openerp [Mon, 13 Aug 2012 15:22:27 +0000 (17:22 +0200)]
Removed useless dependency between fieldtexthtml and fieldtext
bzr revid: nicolas.vanhoren@openerp.com-
20120813152227-29l173q31tcwc9tq
Antony Lesuisse [Mon, 13 Aug 2012 15:20:45 +0000 (17:20 +0200)]
[IMP] use registry contextmanager
bzr revid: al@openerp.com-
20120813152045-woeg16q10xkhiqgk
Christophe Simonis [Mon, 13 Aug 2012 15:05:01 +0000 (17:05 +0200)]
[IMP] add cursor() contextmanager on registry
bzr revid: chs@openerp.com-
20120813150501-txkrphi7hyp2tgl1
Antonin Bourguignon [Mon, 13 Aug 2012 14:57:54 +0000 (16:57 +0200)]
[MERGE] latest trunk
bzr revid: abo@openerp.com-
20120813145754-wjihljr9iyc2ll08
Stephane Wirtel [Mon, 13 Aug 2012 14:57:08 +0000 (16:57 +0200)]
[MERGE]
bzr revid: stw@openerp.com-
20120813145708-botpw2f1shkhv3on
niv-openerp [Mon, 13 Aug 2012 14:51:11 +0000 (16:51 +0200)]
Some tuning in text html
bzr revid: nicolas.vanhoren@openerp.com-
20120813145111-s8uw1x4fc26xe6xl
niv-openerp [Mon, 13 Aug 2012 14:44:01 +0000 (16:44 +0200)]
removed images
bzr revid: nicolas.vanhoren@openerp.com-
20120813144401-cll0enjblqkh8ina
niv-openerp [Mon, 13 Aug 2012 14:37:55 +0000 (16:37 +0200)]
Did better stuff
bzr revid: nicolas.vanhoren@openerp.com-
20120813143755-g9ccs0iubcwvm02i
Fabien Pinckaers [Mon, 13 Aug 2012 14:37:31 +0000 (16:37 +0200)]
[IMP] useability, hide fields on partners when not used
bzr revid: fp@tinyerp.com-
20120813143731-8omk52y879rgbjc1
Vo Minh Thu [Mon, 13 Aug 2012 14:24:43 +0000 (16:24 +0200)]
[MERGE] merged trunk.
bzr revid: vmt@openerp.com-
20120813142443-73d6zm10bqhm17mp
niv-openerp [Mon, 13 Aug 2012 14:22:32 +0000 (16:22 +0200)]
First working version of the html sanitizer
bzr revid: nicolas.vanhoren@openerp.com-
20120813142232-xn7h0ov7mb3pls4o
Fabien Pinckaers [Mon, 13 Aug 2012 14:11:01 +0000 (16:11 +0200)]
[IMP] uncommit hyearchical categories
bzr revid: fp@tinyerp.com-
20120813141101-sd95pzkc1qsy9lox
Christophe Simonis [Mon, 13 Aug 2012 14:04:02 +0000 (16:04 +0200)]
[IMP] this is version 7
bzr revid: chs@openerp.com-
20120813140402-x67r7rk7tr6718jb
Christophe Simonis [Mon, 13 Aug 2012 13:59:27 +0000 (15:59 +0200)]
[FIX] do not autocorrect location header in redirects
bzr revid: chs@openerp.com-
20120813135927-k32eih6tg6y28ivl
Fabien Meghazi [Mon, 13 Aug 2012 13:56:53 +0000 (15:56 +0200)]
[FIX] Fix bug in binary/image controller
bzr revid: fme@openerp.com-
20120813135653-zvk21ch7dc9rs66w
Antonin Bourguignon [Mon, 13 Aug 2012 13:38:27 +0000 (15:38 +0200)]
[IMP] portal's jobs are now a mail group (no more relation with hr_recruitment)
bzr revid: abo@openerp.com-
20120813133827-ta4zh1s2gbl4a4ib
Stephane Wirtel [Mon, 13 Aug 2012 13:35:28 +0000 (15:35 +0200)]
[MERGE] procurement: Fix a part of the code
bzr revid: stw@openerp.com-
20120813133528-1n8sykpenpjkgi74
Thibault Delavallée [Mon, 13 Aug 2012 13:12:07 +0000 (15:12 +0200)]
[IMP] crm: fixed some categ_id remaining.
bzr revid: tde@openerp.com-
20120813131207-lu1c271q5dh27vlr
Christophe Simonis [Mon, 13 Aug 2012 13:09:55 +0000 (15:09 +0200)]
[FIX] do not mess up the headers in the DisableCacheMiddleware
bzr revid: chs@openerp.com-
20120813130955-1fwkyahlceotln5o
Thibault Delavallée [Mon, 13 Aug 2012 12:58:22 +0000 (14:58 +0200)]
[FIX] crm_lead: categ_id -> now categ_ids.
bzr revid: tde@openerp.com-
20120813125822-1knqrg2adg90xxpy
Thibault Delavallée [Mon, 13 Aug 2012 12:58:03 +0000 (14:58 +0200)]
[IMP] CRM demo data: subtype -> content_subtype. Please check your logs before merging ...
bzr revid: tde@openerp.com-
20120813125803-sodjl70yrnk3i2v0
niv-openerp [Mon, 13 Aug 2012 12:53:07 +0000 (14:53 +0200)]
Added some code to sanitize html
bzr revid: nicolas.vanhoren@openerp.com-
20120813125307-d8cycdvtd7ad0f8e
Thibault Delavallée [Mon, 13 Aug 2012 12:47:04 +0000 (14:47 +0200)]
[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
Thibault Delavallée [Mon, 13 Aug 2012 12:31:45 +0000 (14:31 +0200)]
[MERGE] Merged with addons/trunk.
bzr revid: tde@openerp.com-
20120813123145-ruli48hzsfiu6g1y
Thibault Delavallée [Mon, 13 Aug 2012 12:31:11 +0000 (14:31 +0200)]
[IMP] base_calendar: removed annoying spaces in debug for tests.
bzr revid: tde@openerp.com-
20120813123111-i224x123n2a1r8fx
Thibault Delavallée [Mon, 13 Aug 2012 12:30:51 +0000 (14:30 +0200)]
[FIX] mail_thread: fixed some forgotten \).
bzr revid: tde@openerp.com-
20120813123051-5lxzx5011j2skrk8