Commit Graph

494 Commits

Author SHA1 Message Date
niv-openerp 6e6108e9b6 [FIX] Problem with exports that make them crash
lp bug: https://launchpad.net/bugs/1205238 fixed

bzr revid: nicolas.vanhoren@openerp.com-20130726084640-lz11kdlsk27mrjec
2013-07-26 10:46:40 +02:00
niv-openerp b105770bbc [IMP] removed hack to force disable the browser's cache and use http headers instead
bzr revid: nicolas.vanhoren@openerp.com-20130724151929-8j1bo1ae64lwkxdw
2013-07-24 17:19:29 +02:00
niv-openerp 2205c3021f Some more correction to always have the db in the url
bzr revid: nicolas.vanhoren@openerp.com-20130724122328-kbnwq2uois37q74n
2013-07-24 14:23:28 +02:00
niv-openerp 3b384da858 [IMP] Removed http param 'db' handling from http.py and put it in the main controller in main.py
bzr revid: nicolas.vanhoren@openerp.com-20130724100030-yxbpntlz58kohy1n
2013-07-24 12:00:30 +02:00
niv-openerp 761ba75055 [IMP] Cleaned some more http.py, removed 'debug' handling and put it in the controller serving the home page
bzr revid: nicolas.vanhoren@openerp.com-20130724073624-uhshc0cn2m3rs7iq
2013-07-24 09:36:24 +02:00
niv-openerp 3885ee3330 [FIX] some more problems with werkzeug 0.9.1
bzr revid: nicolas.vanhoren@openerp.com-20130716131548-aa60tcfn3zwchqd0
2013-07-16 15:15:48 +02:00
niv-openerp 788071f34f [FIX] some more problems with werkzeug 0.9.1
bzr revid: nicolas.vanhoren@openerp.com-20130716131401-abj3i020a8831l98
2013-07-16 15:14:01 +02:00
niv-openerp b00689306c [FIX] problem with werkzeug 0.9.1 that makes the code crash when we generate a report
bzr revid: nicolas.vanhoren@openerp.com-20130715122835-4gtyu2xle8y7fls1
2013-07-15 14:28:35 +02:00
niv-openerp d42d50df57 [FIX] problem with werkzeug 0.9.1 that crashes when we generate a report
bzr revid: nicolas.vanhoren@openerp.com-20130715122648-a926d3tov4efbyrk
2013-07-15 14:26:48 +02:00
niv-openerp e6fc23d980 Forgot some refactoring
bzr revid: nicolas.vanhoren@openerp.com-20130711141832-8y5yj3lj7h4gb94q
2013-07-11 16:18:32 +02:00
niv-openerp 47b5a82ae8 Completely removed all ways to specify session identifiers and reduced them to 2 possibilities:
* The http argument 'session_id' (higher priority)
* The cookie 'session_id' (lower priority)

bzr revid: nicolas.vanhoren@openerp.com-20130711122034-3nvmkw4q5z4io4tm
2013-07-11 14:20:34 +02:00
niv-openerp a7adac1189 Now OpenERPSession is a subclass of werkzeug's session
bzr revid: nicolas.vanhoren@openerp.com-20130711103422-w7y05ox7tq0hz0og
2013-07-11 12:34:22 +02:00
Christophe Matthieu e4aad29beb [FIX] web report: use get to find active_ids inside the context. Check if report_ids is defined
bzr revid: chm@openerp.com-20130708105425-p8279f00xa7925xh
2013-07-08 12:54:25 +02:00
chs f15f706313 [FIX] monodb: correct behaviour in no-db-list mode (manual forward port of 7.0 rev 3991 mat@openerp.com-20130702122014-6l79a748lb946hkq)
bzr revid: mat@openerp.com-20130702122404-sngh0g283tuvj8ll
2013-07-02 14:24:04 +02:00
niv-openerp c433395b4f Put json-rpc controller in http.py
bzr revid: nicolas.vanhoren@openerp.com-20130621145455-n933uz1dcdmsv9t7
2013-06-21 16:54:55 +02:00
niv-openerp 770751c7d7 removed some useless code
bzr revid: nicolas.vanhoren@openerp.com-20130621143648-fh7vnyt3o6a7swqj
2013-06-21 16:36:48 +02:00
niv-openerp d57bbfd2ff merge trunk
bzr revid: nicolas.vanhoren@openerp.com-20130621135207-7oq7v2ubzfdrkrbr
2013-06-21 15:52:07 +02:00
niv-openerp 52d1b26b2f Put db_monodb() method in http.py
bzr revid: nicolas.vanhoren@openerp.com-20130621124143-pe5hgwj81j2degg6
2013-06-21 14:41:43 +02:00
niv-openerp 95f9491252 Rewrite db_monodb
bzr revid: nicolas.vanhoren@openerp.com-20130621123149-ukxjzz9jyckf9a4r
2013-06-21 14:31:49 +02:00
niv-openerp 2fd53a468c multiple refactoring with authentication
bzr revid: nicolas.vanhoren@openerp.com-20130621121510-gx22b6j9pwsfe352
2013-06-21 14:15:10 +02:00
niv-openerp 4119d7ce99 Added werkzeug's arguments
bzr revid: nicolas.vanhoren@openerp.com-20130620121026-btc06m36x9jg1ok0
2013-06-20 14:10:26 +02:00
niv-openerp 5a2c7af297 Refactored main.py
bzr revid: nicolas.vanhoren@openerp.com-20130619165957-nw7eb80c7gqqcj7v
2013-06-19 18:59:57 +02:00
niv-openerp 69ae9cc0b5 Big refactoring to prepare even more refactoring
bzr revid: nicolas.vanhoren@openerp.com-20130619161627-543e0brldclvvw98
2013-06-19 18:16:27 +02:00
chs 4039900383 [FIX] monodb: correct behaviour in no-db-list mode (again)
bzr revid: mat@openerp.com-20130702122014-6l79a748lb946hkq
2013-07-02 14:20:14 +02:00
niv-openerp c44888527b Added werkzeug route building, not yet switched
bzr revid: nicolas.vanhoren@openerp.com-20130614152621-t8jv4474gt9k6yib
2013-06-14 17:26:21 +02:00
Christophe Simonis a61e7cb0c8 [MERGE] forward port of branch saas-1 up to revid 4887 chs@openerp.com-20130612153934-qyp6pb3bc4za4taf
bzr revid: chs@openerp.com-20130613172414-dln3g4j0ykcwaa02
bzr revid: chs@openerp.com-20130613173900-xl7rh321nnw2b04b
2013-06-13 19:39:00 +02:00
niv-openerp d6c89cdb7c Implemented jsonrpc method
bzr revid: nicolas.vanhoren@openerp.com-20130613140418-2i1qsb6jykhx5jaz
2013-06-13 16:04:18 +02:00
niv-openerp 20c0e6fbb7 fixed get_lang_list
bzr revid: nicolas.vanhoren@openerp.com-20130613114421-hv3rgj0rxghpwlgp
2013-06-13 13:44:21 +02:00
niv-openerp 1c0282d09d fixed lot of problem with nodb
bzr revid: nicolas.vanhoren@openerp.com-20130613112027-1fps4v7h6zx5omo0
2013-06-13 13:20:27 +02:00
niv-openerp 50a5a612da Now uses request.cr for Model
bzr revid: nicolas.vanhoren@openerp.com-20130613110005-idverfbs9xe6l32w
2013-06-13 13:00:05 +02:00
niv-openerp c6b4e77df4 Put @nodb on all methods where it is required in main.py
bzr revid: nicolas.vanhoren@openerp.com-20130611165901-l1pyzpvpniq41a29
2013-06-11 18:59:01 +02:00
Christophe Simonis 22a8e5266e [FIX] web: calls to openerp methods do not raises xmlrpc Fault anymore
bzr revid: chs@openerp.com-20130611163527-k6yzb604c36n2wha
2013-06-11 18:35:27 +02:00
Christophe Simonis 6263673720 [MERGE] forward port of branch 7.0 up to revid 3973 chs@openerp.com-20130611145028-f98x6inytlr3ijjg
bzr revid: chs@openerp.com-20130611155251-zk0qkk70z30n81vl
2013-06-11 17:52:51 +02:00
Christophe Simonis ce68573126 [FIX] web: handle monodb correctly when server started with "--no-database-list" option
bzr revid: chs@openerp.com-20130611145028-f98x6inytlr3ijjg
2013-06-11 16:50:28 +02:00
Christophe Simonis 36e113e6bd [FIX] web: handle monodb correctly when server started with "--no-database-list" option
bzr revid: chs@openerp.com-20130611110327-sipc2er6z1ch7leb
2013-06-11 13:03:27 +02:00
niv-openerp a94bbf8e5e [FIX] Merge fix in saas1 for the problem that made the server crash when install a db
bzr revid: nicolas.vanhoren@openerp.com-20130610144915-0nj8vpk7n84ocj3f
bzr revid: nicolas.vanhoren@openerp.com-20130610150657-3xddn91gm0iq0ubp
bzr revid: nicolas.vanhoren@openerp.com-20130610154514-oee6s4f9g17bx63z
2013-06-10 17:45:14 +02:00
Olivier Dony 6901c4f981 [FIX] export: allow excluding special virtual fields from exportable data
For example the virtual "Access Rights" fields on
res.users cannot be browsed and cannot currently
by exported.

bzr revid: odo@openerp.com-20130607093044-y3bct44ralu8yf0o
2013-06-07 11:30:44 +02:00
niv-openerp 956a05e0f2 Replaced main
bzr revid: nicolas.vanhoren@openerp.com-20130607091856-mnjnllza9oafqxb7
2013-06-07 11:18:56 +02:00
niv-openerp 6afbca24f9 [REV] revert of previous improvement
bzr revid: nicolas.vanhoren@openerp.com-20130605092926-dhoumh76dwtl211t
2013-06-05 11:29:26 +02:00
niv-openerp 97b22323aa Refactored main.py
bzr revid: nicolas.vanhoren@openerp.com-20130604153037-h4kzan18r2wlkb62
2013-06-04 17:30:37 +02:00
Thibault Delavallée c4c17fc3d2 [FIX] image controller: all reads (event __last_update) should be encapsulated into a try/catch to avoid having sometimes a placeholder, sometimes a broken image + traceback.
bzr revid: tde@openerp.com-20130528130526-iwzw5jjttr4nevc4
2013-05-28 15:05:26 +02:00
niv-openerp 97110c0a48 [FIX] problem in database manager when db list is desactivated
lp bug: https://launchpad.net/bugs/1166856 fixed

bzr revid: nicolas.vanhoren@openerp.com-20130527122415-pk8i2uqfrgyiac83
2013-05-27 14:24:15 +02:00
Christophe Simonis d086a71131 [IMP] web: allow manifest files to contain remote js/css/qweb files
bzr revid: chs@openerp.com-20130528104352-b1qf79d6bdm8x2ec
2013-05-28 12:43:52 +02:00
Vidhin Mehta d6024fa36b [FIX]add callback function to fetch_lang and in *drop db* which is not created,after drop it shows 'db succesfully droped'.
bzr revid: vme@tinyerp.com-20130516170403-7oil1k6em99a1hmp
2013-05-16 22:34:03 +05:30
Xavier Morel ae1ea1ac58 [FIX] incorrect company logo on databases with uppercase letters
bzr revid: xmo@openerp.com-20130516132200-t4h6gtoplkqzuh1w
2013-05-16 15:22:00 +02:00
niv-openerp f77cf1b603 wip
bzr revid: nicolas.vanhoren@openerp.com-20130515090231-pj7q042poo2183sp
2013-05-15 11:02:31 +02:00
niv-openerp b1338a1c8f fix
bzr revid: nicolas.vanhoren@openerp.com-20130515085618-m72mahjie4iguwhy
2013-05-15 10:56:18 +02:00
Ravi Gohil (OpenERP) 408f17a884 [FIX] Company Logo not shown if database name contains capitals(Courtesy: Karel Marissens). (Maintenance Case: 592257)
lp bug: https://launchpad.net/bugs/1172679 fixed

bzr revid: rgo@tinyerp.com-20130506092751-9zutbjsc5e5mnnvh
2013-05-06 14:57:51 +05:30
Olivier Dony ba5710962e [MERGE] Forward-port of 7.0 bugfixes, up to rev. 3912
revision-id: nicolas.vanhoren@openerp.com-20130430094843-9m1629m517vjtm1o

bzr revid: xmo@openerp.com-20130424102025-w33zyopm96r7q09p
bzr revid: odo@openerp.com-20130430103337-i9wuj8zf3h41h1ay
2013-04-30 12:33:37 +02:00
Antony Lesuisse 44569c06a2 [FIX] http controllers inheritance
minimalist and backward compatible implementation

bzr revid: al@openerp.com-20130423210644-hmvglhh10zlrwp9q
2013-04-23 23:06:44 +02:00
Christophe Simonis e5736828f9 [REVERT] revert commit fme@openerp.com-20130418171750-7oldgiewo1eewxk7: do not break stable API !!!
bzr revid: chs@openerp.com-20130423124151-h025b891xp77flg3
2013-04-23 14:41:51 +02:00
Vidhin Mehta 2d07136d6f [FIX]Remove extra duplicate method,show valid error msg when invalid db to drop, do_render method call after resolving fetch_langs and call always after fetch_db.
lp bug: https://launchpad.net/bugs/1166856 fixed

bzr revid: vme@tinyerp.com-20130423104647-8xvrthahdzk42r08
2013-04-23 16:16:47 +05:30
Fabien Meghazi d94936132a [MERGE] Fixed http controllers inheritance
bzr revid: fme@openerp.com-20130418171750-7oldgiewo1eewxk7
2013-04-18 19:17:50 +02:00
Christophe Simonis ecdc3b1873 [FIX] web: company_logo does not try to load the pool + failback correctly if the database does not exists or is not an openerp database
bzr revid: chs@openerp.com-20130405134747-7rkmz5d4r0buhhxj
2013-04-05 15:47:47 +02:00
Olivier Dony f0320d4258 [FIX] web: company_logo route may be accessed with uid = False in some cases, it should still work
bzr revid: odo@openerp.com-20130404143144-3o2j0xbwh4m84tu8
2013-04-04 16:31:44 +02:00
Xavier Morel bc07cab28c [IMP] export formats have no need to inherit from the export controller
bzr revid: xmo@openerp.com-20130403091025-wjb23mzbmdyjnahm
2013-04-03 11:10:25 +02:00
Xavier Morel 41784d0aec [FIX] Export and Reports controllers have no need to extend View
bzr revid: xmo@openerp.com-20130403082635-9dmdi4cco3kawiib
2013-04-03 10:26:35 +02:00
Xavier Morel 94c2c42be6 [MERGE] from 7.0
bzr revid: xmo@openerp.com-20130313094909-u21ee88l2lak9p2x
2013-03-13 10:49:09 +01:00
Antony Lesuisse cb9106d99f [FIX] IE9 db creation, better monodb
bzr revid: al@openerp.com-20130312230344-uasy5dx2e8n5ytlr
2013-03-13 00:03:44 +01:00
Fabien Meghazi 9223cd6e33 [FIX] Add redirect helper for IE<10 (looses hash on redirects)
bzr revid: fme@openerp.com-20130307095923-nh1s5uvzl68455cg
2013-03-07 10:59:23 +01:00
Fabien Meghazi c41aa09d92 [FIX] Restore cookie_db check
bzr revid: fme@openerp.com-20130306152129-945co8a1gljz95eu
2013-03-06 16:21:29 +01:00
Fabien Meghazi 182eb325fe [MERGE] Remove url timestamps in debug mode
bzr revid: fme@openerp.com-20130306100701-bwli4fkwv7xlfpf8
2013-03-06 11:07:01 +01:00
Fabien Meghazi 28aa304d44 [FIX] db_monodb: cookie not used. keep same behavior as previous
bzr revid: fme@openerp.com-20130306085936-3mcyorwtgbb0uk0u
2013-03-06 09:59:36 +01:00
Antony Lesuisse 88e0e2933c db_monodb better version and naming
bzr revid: al@openerp.com-20130306005755-bgyl65f03st6mn6x
2013-03-06 01:57:55 +01:00
Antony Lesuisse b5b625932a db_monodb use the new implementation
bzr revid: al@openerp.com-20130305211433-cz7jopkmehxbbbsh
2013-03-05 22:14:33 +01:00
Fabien Meghazi 7b154aa8e0 [REM] Removed database check, this is not the role of the controller to reject a bad database name
bzr revid: fme@openerp.com-20130305165144-1nzgf3urk4ke20ty
2013-03-05 17:51:44 +01:00
Fabien Meghazi 0f03ed38f0 [IMP] forgot a change in previous commit
bzr revid: fme@openerp.com-20130305111932-lytw8pax3bjihg9d
2013-03-05 12:19:32 +01:00
Fabien Meghazi 1a00c29538 [FIX] unbreak api
bzr revid: fme@openerp.com-20130305111703-5l6iw2s970j76f43
2013-03-05 12:17:03 +01:00
Fabien Meghazi fc74aaf760 [FIX] Fixed for --no-database-list option
bzr revid: fme@openerp.com-20130305092426-48h757qc62taugpl
2013-03-05 10:24:26 +01:00
Fabien Meghazi 02d4ab6597 [FIX] Make credential autocomplete per database
bzr revid: fme@openerp.com-20130228173444-th4grlsz70lewf9h
2013-02-28 18:34:44 +01:00
Fabien Meghazi d6e460d9e7 [FIX] Correctly handles db param in url. Home controller redirects on db if more than one db
bzr revid: fme@openerp.com-20130228161537-cen2lyknfifqtyu0
2013-02-28 17:15:37 +01:00
Fabien Meghazi 301d63b8c9 [WIP] wip , lots of troubles !
bzr revid: fme@openerp.com-20130228101614-zn4prwhi6zk0h13d
2013-02-28 11:16:14 +01:00
Christophe Simonis dd6a60e2bc [FIX] web: saved_action must start at index 1
bzr revid: chs@openerp.com-20130227172829-zxksmvky3hwltt7l
2013-02-27 18:28:29 +01:00
Fabien Meghazi d6975ff37f [FIX] Remove url timestamps in debug mode
The chrome cache bug seems to be gone with newer versions.
Moreover, the cutting edge features of the webkit developper tools
won't work if url changes upon reload.

bzr revid: fme@openerp.com-20130227114134-nlv7g5jjvvd037p2
2013-02-27 12:41:34 +01:00
niv-openerp 9f6451c2ac [FIX] typo in attachment server-side methods
lp bug: https://launchpad.net/bugs/1132770 fixed

bzr revid: nicolas.vanhoren@openerp.com-20130225172446-gfuhhg0dqetiz51m
2013-02-25 18:24:46 +01:00
Thibault Delavallée 5e09c5c361 [FWD] [MERGE] Foward port of web-7.0 until rev 3771.
bzr revid: tde@openerp.com-20130221110355-p00935eqn4tstkx9
2013-02-21 12:03:55 +01:00
Raphael Collet 11051d4a08 [FIX] web: rewrite reference to removed module openerp.service.web_services
bzr revid: rco@openerp.com-20130213082035-9ajx7jlzim1qunv4
2013-02-13 09:20:35 +01:00
Olivier Dony d0c4cca10e [FIX] web: properly encode db and addons URL parameters
Passing the values unescaped could be a source of errors
and a XSS vector.

lp bug: https://launchpad.net/bugs/1118365 fixed

bzr revid: odo@openerp.com-20130207173439-ud5fos61d4pcoe2d
2013-02-07 18:34:39 +01:00
niv-openerp 79f7eaf08c Changed exception handling in jsonrpc
bzr revid: nicolas.vanhoren@openerp.com-20130130143049-hofmnixydlf42dds
2013-01-30 15:30:49 +01:00
Olivier Dony 02a6c638a9 [MERGE] Latest bugfixes from 7.0, up to rev 3731
rev 3731 = revision-id: fme@openerp.com-20130129142638-81uffjq3aiopr8ta

bzr revid: odo@openerp.com-20130129163725-feesf1n2xf0wbpro
2013-01-29 17:37:25 +01:00
Fabien Meghazi 337faa6829 [FIX] Use relative protocol in scripts url in order to avoid mixed content warnings in IE
bzr revid: fme@openerp.com-20130129142638-81uffjq3aiopr8ta
2013-01-29 15:26:38 +01:00
niv-openerp 454c3cd23a [IMP] Added method to make the client lib work with jsonrpc.
bzr revid: nicolas.vanhoren@openerp.com-20130115104423-mb8f2ec3o1jhz8ut
2013-01-15 11:44:23 +01:00
vta vta@openerp.com 39e5509e6c [FIX] Fix not working code, and some cleaning proposed by AL
bzr revid: vta@openerp.com-20121226181833-kih09glellxisl9p
2012-12-26 19:18:33 +01:00
vta vta@openerp.com 78f36a2fce [IMP] Browser's language as default language for anonymous user
bzr revid: vta@openerp.com-20121226074539-i5d2bqmmnqm3i8d6
2012-12-26 08:45:39 +01:00
Christophe Simonis 43f2dff179 [FIX] web: correct the concatenation of css files: @charset and @import rules must be before any other rules
bzr revid: chs@openerp.com-20130319154433-zizwv4irfvh93swe
2013-03-19 16:44:33 +01:00
Antony Lesuisse f14a8b9aac [IMP] version_info more info
bzr revid: al@openerp.com-20121219154505-lcartslny586t07n
2012-12-19 16:45:05 +01:00
Fabien Pinckaers 27a1ee5232 [IMP] image if no logo
bzr revid: fp@tinyerp.com-20121215215559-kq14di3z8juyv61r
2012-12-15 22:55:59 +01:00
Antony Lesuisse 3e914abf80 [MERGE] customizable web logo by chs
bzr revid: al@openerp.com-20121215192659-g5psibisxvyl8adw
2012-12-15 20:26:59 +01:00
Xavier Morel d6087e208f [FIX] flow control annoyances
bzr revid: xmo@openerp.com-20121214152957-izvuo2u0uvpuv2ho
2012-12-14 16:29:57 +01:00
Xavier Morel 7acadc00c6 [FIX] unwarranted assumption that name_get(ids) and read(ids) will return the same records in the same order
There is actually no such guarantee, neither name_get nor read
guarantee they'll return records in input order, let alone in the same
order as one another, and both are free to skip records as they see
fit (kinda).

=> convert the name_get result to a dict, and then fill in the
display_name for each record returned by read() using get()

bzr revid: xmo@openerp.com-20121213130548-x1h6czyru5nc6wwm
2012-12-13 14:05:48 +01:00
Olivier Dony 55419f063c [IMP] menu loading: simplify/optimize menu loading mechanism and de-duplicate need_action load, use child_of, skip useless calls, update tests
bzr revid: odo@openerp.com-20121212205120-qa8gq86hh6f26bdk
2012-12-12 21:51:20 +01:00
Christophe Matthieu 389b865d54 [MERGE] catch and display error when there are an error in an attachment. Add title with creator and date for attachments on the sidebar.
bzr revid: chm@openerp.com-20121211152455-nrx74yqs0ui1hsmr
2012-12-11 16:24:55 +01:00
Christophe Matthieu f817cd3f38 [IMP] web: move controler download_attachment into mail. change render into _t
bzr revid: chm@openerp.com-20121211144551-9uryi1z1sxe9daxv
2012-12-11 15:45:51 +01:00
Christophe Simonis 27ae24eed2 [IMP] remove debug logging
bzr revid: chs@openerp.com-20121211122119-mhl5383vsgacxsz5
2012-12-11 13:21:19 +01:00
Christophe Simonis 060ef93268 [IMP] show company logo in chrome
bzr revid: chs@openerp.com-20121211111824-dj2ienybj2rxwhjj
2012-12-11 12:18:24 +01:00
Fabien Meghazi c124fc3281 [FIX] Roundtrips binary field value if not bin size
lp bug: https://launchpad.net/bugs/1082616 fixed

bzr revid: fme@openerp.com-20121211103357-csqirmhxehmszyu4
2012-12-11 11:33:57 +01:00
Antony Lesuisse f83bfeff0b [IMP] cleanup menu method mess
do_* were introduce for testing this is not needed anymore

bzr revid: al@openerp.com-20121211021338-8s3jqpfraku1tmsj
2012-12-11 03:13:38 +01:00
niv-openerp aee4b7fb92 [IMP] modified chrome frame message to display better in IE8
bzr revid: nicolas.vanhoren@openerp.com-20121210155021-5b7j4626p52uz1ei
2012-12-10 16:50:21 +01:00
Thibault Delavallée 5d2d4dea2c [MERGE] Needaction loading update.
This web revision modifies the way needaction are loaded. Now they are loaded independently of the menus. After having loaded and displayed the various menus, a call to the server is done to avoid a long latency between the login and the display of menus. Needaction counter will be displayed as soon as they are available.

bzr revid: tde@openerp.com-20121210131658-pgy3t9t71f0z2yd5
2012-12-10 14:16:58 +01:00
Thibault Delavallée 1ca5e68b1f [MERGE] Sync with trunk.
bzr revid: tde@openerp.com-20121130093732-i8y10ayjqiaq5t7p
bzr revid: tde@openerp.com-20121204142854-pauouyapnw7z8zwj
bzr revid: tde@openerp.com-20121205101544-k4ui6thr0ibzw0vx
bzr revid: tde@openerp.com-20121210125423-81wbh4af9sxdqjki
2012-12-10 13:54:23 +01:00