Thibault Delavallée
594f5a4ffe
[MERGE] Merged with server/trunk.
...
bzr revid: tde@openerp.com-20120814183324-d2eza8ffbud1ewvn
2012-08-14 20:33:24 +02:00
Fabien Pinckaers
7290d5880d
fix
...
bzr revid: fp@openerp.com-20120814165750-k2mmj30200jaee3m
2012-08-14 18:57:50 +02:00
Fabien Pinckaers
d6a6522c34
merge
...
bzr revid: fp@openerp.com-20120814163901-chassx588kktn17y
2012-08-14 18:39:01 +02:00
Thibault Delavallée
c8560f6029
[ADD] base: added partner image.
...
bzr revid: tde@openerp.com-20120814162050-dnmnwx0v0jz3x0og
2012-08-14 18:20:50 +02:00
Thibault Delavallée
290a4318f1
[FIX] res_users: updated class name in super.
...
bzr revid: tde@openerp.com-20120814155414-r5xbj1qmb4w0obya
2012-08-14 17:54:14 +02:00
Christophe Simonis
c5dc5cef00
[IMP] sed -i '' -e 's/connection/session/g'
...
bzr revid: chs@openerp.com-20120814153053-3bznfj7woq2xi1f1
2012-08-14 17:30:53 +02:00
Christophe Simonis
63e4d9b572
[IMP] sed -i '' -e 's/connection/session/g'
...
bzr revid: chs@openerp.com-20120814152900-8r84kyz0qy1hwkvz
2012-08-14 17:29:00 +02:00
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
Christophe Simonis
8c43267c4a
[FIX] unknow route must return 404 not 500
...
bzr revid: chs@openerp.com-20120814131159-0ie5h6tnxdgebpva
2012-08-14 15:11:59 +02:00
Xavier Morel
b7a5629052
[FIX] invocation of import and export dialogs
...
bzr revid: xmo@openerp.com-20120814143003-ss974ub0yym09gyt
2012-08-14 16:30:03 +02:00
niv-openerp
824a0568c6
[IMP] removed remaining usages of OldWidget (sorry)
...
bzr revid: nicolas.vanhoren@openerp.com-20120814135439-mslx2buf8pdpidkk
2012-08-14 15:54:39 +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
6229869bc1
Removed remaining usages
...
bzr revid: nicolas.vanhoren@openerp.com-20120814135324-7s3nmywqyikgvvui
2012-08-14 15:53:24 +02:00
niv-openerp
3ebfaedd64
[IMP] removed a lot of OldWidget usage
...
bzr revid: nicolas.vanhoren@openerp.com-20120814134246-y2awqbt2i1hcan61
2012-08-14 15:42:46 +02:00
niv-openerp
183b85f750
[IMP] Removed OldWidget in data.js
...
bzr revid: nicolas.vanhoren@openerp.com-20120814133107-prmdonwh6f7gu276
2012-08-14 15:31:07 +02:00
Fabien Pinckaers
cf59ee6f43
[IMP] removed categories in tags , fix
...
bzr revid: fp@openerp.com-20120814132952-1t9pocyaxlsoxwt3
2012-08-14 15:29:52 +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
niv-openerp
1885387ace
[IMP] added html field
...
bzr revid: nicolas.vanhoren@openerp.com-20120814130656-4pa91mud8u30mqr5
2012-08-14 15:06:56 +02:00
Fabien Pinckaers
b60c51dc2d
[IMP] removing structure in partner tags
...
bzr revid: fp@openerp.com-20120814125611-16zayxxzha9213re
2012-08-14 14:56:11 +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
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
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
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
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
399119a073
[IMP] res_users form view: added partnre.
...
bzr revid: tde@openerp.com-20120814100829-usi8fu8auzf1c0le
2012-08-14 12:08:29 +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
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
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
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
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