4679680dba
manual merge of multicorn
...
bzr revid: al@openerp.com-20120922105107-q02ogtsfudphzkl6
2012-09-22 12:51:07 +02:00
f1a46cff59
[IMP] better algo for image thumbnails
...
bzr revid: fp@openerp.com-20120916212139-2qnvuwk6sppxnp99
2012-09-16 23:21:39 +02:00
fd4b83e8d1
[FIX] tools.image: added an image conversion before sharpening; otherwise the filter could crash.
...
bzr revid: tde@openerp.com-20120913113655-t5o3wk3r0tkp203m
2012-09-13 13:36:55 +02:00
4da5c9ef63
[MERGE] use the postgres db instead of template1 for the creation of a database
...
bzr revid: stw@openerp.com-20120912111910-b092erlzv2g7wh1u
2012-09-12 13:19:10 +02:00
3d2355df04
[MERGE] improve the tools.misc.scan_languages function
...
bzr revid: stw@openerp.com-20120912104713-jhvkxp9egpchs2ti
2012-09-12 12:47:13 +02:00
ff438c8eb7
[FIX] openerp.tools.misc.file_open: Very little fix to display coherent error message when file not found occurs.
...
bzr revid: stw@openerp.com-20120912095946-chjiq2y4bltisfw9
2012-09-12 11:59:46 +02:00
5bd3b4f0a2
[MERGE] base: fix typo of some languages
...
bzr revid: stw@openerp.com-20120911152531-h5naowr08c3lqva0
2012-09-11 17:25:31 +02:00
97278d6ed5
[MERGE] base: fix some address formats and some English
...
bzr revid: stw@openerp.com-20120911150724-yh4kvtstv8fehaj1
2012-09-11 17:07:24 +02:00
30e59f95c9
[MERGE] raise an exception if it can't evaluate a string
...
bzr revid: stw@openerp.com-20120911145325-oay33de4o7h83k4t
2012-09-11 16:53:25 +02:00
02c14543da
[IMP] tools: image: added the option to choose whether to upsize or not images when resizing them. Also cleaned a bit the comments and overall code. small and medium images are nos 64x64 ans 128x128, to be closer to iamge sized used through OpenERP.
...
bzr revid: tde@openerp.com-20120907094957-clozwgu5qd3jh42h
2012-09-07 11:49:57 +02:00
171533d8dc
[IMP] res_partner: moved the avatar colorize part of the image code to tools/image.py, where it should have been placed at revs 4373-4375.
...
bzr revid: tde@openerp.com-20120907092206-1pgbcvt8tn23m114
2012-09-07 11:22:06 +02:00
8c0cf0ae9a
[MERGE] Merged with server/trunk.
...
bzr revid: tde@openerp.com-20120907075922-kqd5q0u0couhbnas
2012-09-07 09:59:22 +02:00
efa0f9b263
[IMP] html_sanitize: attempt to make slightly more pythonic/readable + re-enable test. Proper review + test still needed.
...
bzr revid: odo@openerp.com-20120905225746-npjjzy1w00k05vtc
2012-09-06 00:57:46 +02:00
8e96d71bf3
[MERGE] sync with trunk
...
bzr revid: odo@openerp.com-20120905072646-m4269m97ej1oicoq
bzr revid: odo@openerp.com-20120905220158-ulg8jy5alny97ff3
2012-09-06 00:01:58 +02:00
8d1e3d06ab
[IMP] removed dependency to pyquery
...
bzr revid: nicolas.vanhoren@openerp.com-20120905153212-0gi1wjhf9m4xtnml
2012-09-05 17:32:12 +02:00
29a9316566
[REVERT] 4394, because Thu is stupid
...
bzr revid: nicolas.vanhoren@openerp.com-20120905145703-7t8uiyqur0l16n2b
2012-09-05 16:57:03 +02:00
29b437766f
[FIX] amount_to_text: avoid to have a none in the concat
...
bzr revid: stw@openerp.com-20120904100250-utk61q7ik41lameo
2012-09-04 12:02:50 +02:00
1f84036086
[MERGE] Merged with server/trunk.
...
bzr revid: tde@openerp.com-20120904075105-ljg3lgn6tf958kvd
2012-09-04 09:51:05 +02:00
f9be81cb20
[MERGE] file_open: give precedence to directory before zip, courtesy of Florent Xicluna
...
bzr revid: odo@openerp.com-20120904074105-ql796z5c8b6o4cyf
2012-09-04 09:41:05 +02:00
869564ce28
[MERGE] file_open: give precedence to directory before zip, courtesy of Florent Xicluna
...
lp bug: https://launchpad.net/bugs/928376 fixed
lp bug: https://launchpad.net/bugs/928507 fixed
bzr revid: odo@openerp.com-20120903130536-5sqwp9tnhk1ntee3
2012-09-03 15:05:36 +02:00
b5c60844da
[FIX] yaml_import: really raise YamlImportExceptions.
...
bzr revid: vmt@openerp.com-20120903122902-djhju2raxkmaspik
2012-09-03 14:29:02 +02:00
12294252d4
[MERGE] Merged with server/trunk.
...
bzr revid: tde@openerp.com-20120903081949-ucy4e1kpbb30dhko
2012-09-03 10:19:49 +02:00
6803862711
[IMP] res.partner: simplified+corrected parsing of partner name and email in name_create, added tests, made this internal method private
...
bzr revid: odo@openerp.com-20120831225205-04l4udn95cz3n72o
2012-09-01 00:52:05 +02:00
b3988436cb
[REF] Replace the user id 1 by openerp.SUPERUSER_ID
...
bzr revid: stw@openerp.com-20120831135309-o4plzf5wp0kyuzgf
2012-08-31 15:53:09 +02:00
d37745559e
[ADD] tools.misc: new function append_to_html, can be used to inject blocks (html or plaintext) to existing HTML snippets
...
bzr revid: odo@openerp.com-20120831132337-of2p1wlh5l4lpvez
2012-08-31 15:23:37 +02:00
ec85db8e83
[REVIEW] tools: removed duplicate email_split in tools.
...
bzr revid: tde@openerp.com-20120828080939-5bt3klbep49gjw47
2012-08-28 10:09:39 +02:00
bc5da1a02b
[REVIEW] tools: moved email_split function in emails section, instead of 'somwhere in the file'.
...
bzr revid: tde@openerp.com-20120828073414-lt4bpubxtv3235b6
2012-08-28 09:34:14 +02:00
1fc94ed5ca
[MERGE] Merged with server/trunk.
...
bzr revid: tde@openerp.com-20120827083724-237j1jgf3b3g3uy8
2012-08-27 10:37:24 +02:00
7ddc6a2cd9
[FIX] convert: fix previous partial patch for removing redundant @type for <menuitem>
...
bzr revid: odo@openerp.com-20120823100504-q8w91ga5wbot20o5
2012-08-23 12:05:04 +02:00
ebb3df4f8c
[FIX] convert: fix previous partial fix for removing redundant @type for <menuitem>
...
bzr revid: odo@openerp.com-20120823100252-zmhpaocb2bb11c99
2012-08-23 12:02:52 +02:00
7b36f6a7bd
[MRG] merge with lp:openobject-server.
...
bzr revid: tpa@tinyerp.com-20120823050804-nrpewpzqtcqgl6fq
2012-08-23 10:38:04 +05:30
93f676d9cd
[MERGE] convert,rng: forbid redundant @type for menuitem, now inferred from the action type
...
bzr revid: odo@openerp.com-20120822171932-xz6i6k5nxurqfac9
2012-08-22 19:19:32 +02:00
a337ca201d
[IMP] rng: forbid redundant @type for menuitem, now inferred from the action type + minor cleanup
...
bzr revid: odo@openerp.com-20120822144946-fdsw9ee1ia3nfe86
2012-08-22 16:49:46 +02:00
3c8c168f85
merge_trunk
...
bzr revid: fp@tinyerp.com-20120822133509-v4irlqdjjba0wxxn
2012-08-22 15:35:09 +02:00
4eafc023b3
[IMP] tools.misc.mute_logger can now be used as decorator
...
bzr revid: chs@openerp.com-20120822122013-9uxjwr9oqohseton
2012-08-22 14:20:13 +02:00
f7a5eb5d6c
[MERGE] latest trunk
...
bzr revid: abo@openerp.com-20120821172259-su6vqvxecwb5zra2
bzr revid: abo@openerp.com-20120822121220-yl5e9lhd7v4ap75a
2012-08-22 14:12:20 +02:00
568288c3e1
[MRG] merge with main branch.
...
bzr revid: tpa@tinyerp.com-20120822115641-3l3yla4kji6xaxm6
2012-08-22 17:26:41 +05:30
89f1693653
[IMP] remove unwanted log in test
...
bzr revid: chs@openerp.com-20120822110604-il0sxlvf592wasur
2012-08-22 13:06:04 +02:00
610c8d8078
[IMP] yaml import: log as TEST only for test files
...
bzr revid: chs@openerp.com-20120822101156-v5w2kljumas2cyq0
2012-08-22 12:11:56 +02:00
8dd80d5dcf
[FIX] handling of the action's module xml id.
...
also don't use the attribute anymore
bzr revid: abo@openerp.com-20120821172224-9unwry0p27tn7d82
2012-08-21 19:22:24 +02:00
a2db8022d3
[FIX] xml import: when using a menuitem tag, properly determine the type of action that is referenced
...
the attribute for the element should now be useless
bzr revid: abo@openerp.com-20120821164054-6zzad2k6nmebqe35
2012-08-21 18:40:54 +02:00
b772da168f
[FIX] tools: emails_split -> email-split.
...
bzr revid: tde@openerp.com-20120821151413-9hxmsyp51q3ny32f
2012-08-21 17:14:13 +02:00
1a4f68554d
[IMP] needaciton + mail
...
bzr revid: fp@openerp.com-20120819150038-u6519dee90enzui4
2012-08-19 17:00:38 +02:00
b9bdf2c29a
[IMP] tools.email_split
...
bzr revid: fp@tinyerp.com-20120816164239-yl1vzp83w6z5xi5i
2012-08-16 18:42:39 +02:00
7dc9b6087c
[IMP] handle menuitems with "server" and "client" type + ensure menu has a name
...
bzr revid: chs@openerp.com-20120816130406-bsselo97f8tyzcit
2012-08-16 15:04:06 +02:00
ae4852f597
[IMP] html_sanitize: remove dependency on pyquery.
...
Relying on pyquery is unnecessary (using etree alone is enough). This patch
reimplements the html_sanitize() function without pyquery. The new
implementation still goes through the provided test suite with success.
bzr revid: vmt@openerp.com-20120816104540-9374llhzde54h2vz
2012-08-16 12:45:40 +02:00
1885387ace
[IMP] added html field
...
bzr revid: nicolas.vanhoren@openerp.com-20120814130656-4pa91mud8u30mqr5
2012-08-14 15:06:56 +02:00
63ae87fb4c
Fixed encoding problems
...
bzr revid: nicolas.vanhoren@openerp.com-20120814121425-jq3ieebbsa7rcds5
2012-08-14 14:14:25 +02:00
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
dc170d1a9a
Added protection against javascript in <a>
...
bzr revid: nicolas.vanhoren@openerp.com-20120813155205-uohwb39ejn66bgmv
2012-08-13 17:52:05 +02:00
Antony Lesuisse
Fabien Pinckaers
Thibault Delavallée
Stephane Wirtel
Olivier Dony
niv-openerp
Vo Minh Thu
Turkesh Patel (Open ERP)
Fabien Pinckaers
Christophe Simonis
Antonin Bourguignon