Thibault Delavallée ab5c23079a [MERGE] Sync with trunk, solved conflicts. ... bzr revid: tde@openerp.com-20140116091716-zk1n5ots94i65io5		2014-01-16 10:17:16 +01:00
..
__init__.py	[REM] Deleted .apidoc lines.	2013-02-12 15:24:10 +01:00
expression.py	[MERGE] forward port of branch 7.0 up to revid 5224 chs@openerp.com-20140206105141-7e8bv8ordqqsswh7	2014-02-06 12:02:20 +01:00
fields.py	[MERGE] Sync with trunk, solved conflicts.	2014-01-16 10:17:16 +01:00
orm.py	[MERGE] Sync with trunk, solved conflicts.	2014-01-16 10:17:16 +01:00
osv.py	[IMP] osv: display full traceback in terminal (not client side) when a check fails instead of minimal error	2014-01-08 15:05:54 +01:00
query.py	[REM] Deleted .apidoc lines.	2013-02-12 15:24:10 +01:00