Xavier Morel 7353e02e2e [MERGE] from trunk ...

bzr revid: xmo@openerp.com-20120322143331-iajlifomw1hohbht

2012-03-22 15:33:31 +01:00

..

common

[FIX] if a connector was setup in the configuration object, don't re-set one instead

2012-02-23 13:32:13 +01:00

controllers

[MERGE] from trunk

2012-03-22 15:33:31 +01:00

i18n

Launchpad automatic translations update.

2012-03-26 05:34:12 +00:00

static

[MERGE] from trunk

2012-03-22 15:33:31 +01:00

test

[FIX] dependencies handling in modules listing of web client

2012-03-06 15:20:10 +01:00

test_support

[ADD] nonliterals in dataset tests

2012-02-27 09:51:28 +01:00

__init__.py

[FIX] imports to handle conflicts with e.g. web.py in embedded mode

2012-02-10 11:34:26 +01:00

__openerp__.py

[MERGE] 6.1 fixes into trunk

2012-03-22 12:31:42 +01:00