Gery Debongnie bb88a5205f [MERGE] merge from trunk ... bzr revid: ged@openerp.com-20140113081142-4wix6shl7zl3d3r9		2014-01-13 09:11:42 +01:00
..
addons	[IMP] Backport one feature from website: this feature allows to specify a file	2014-01-09 16:43:38 +01:00
cli	[REF] Use the contextlib.closing function instead of a couple of try/catch for	2014-01-09 10:32:58 +01:00
conf	[MERGE] openerp.pooler is deprecated.	2013-03-27 17:40:45 +01:00
modules	[MERGE] forward port of branch saas-2 up to revid 4992 chs@openerp.com-20131202105848-33gcz1715w370rve	2013-12-02 12:00:30 +01:00
osv	[IMP] changes the readgroup method to allow better control in the groupby field when it is a date/datetime (for example, it is now possible to group by week/quarter) (orm.py)	2014-01-07 09:58:00 +01:00
report	[MERGE] [FIX] res_font: make it works in multiworker environment	2013-12-09 18:13:38 +01:00
service	[REF] Use the contextlib.closing function instead of a couple of try/catch for	2014-01-09 10:32:58 +01:00
tests	[MERGE] forward port of branch saas-2 up to revid 4992 chs@openerp.com-20131202105848-33gcz1715w370rve	2013-12-02 12:00:30 +01:00
tools	[IMP] Backport one feature from website: this feature allows to specify a file	2014-01-09 16:43:38 +01:00
workflow	[REF] Merge a refactoring of the workflow (lp:~openerp-dev/openobject-server/trunk-refactor-workflow-stw)	2014-01-09 10:50:17 +01:00
PKG-INFO	[REM] netrpc: KILL EVERYBODY	2013-02-21 13:18:25 +01:00
__init__.py	restore the original gevent detection	2013-09-10 01:19:46 +02:00
exceptions.py	[REF] code review	2013-02-15 15:35:03 +01:00
http.py	[FIX] http: correctly handle the rollback when an exception is raised. Indeed dispathc serializes the exception, leading to the error being catched before we check and rollback the transaction. This commit fixes this.	2013-12-11 12:23:04 +01:00
import_xml.rng	[IMP] Backport one feature from website: this feature allows to specify a file	2014-01-09 16:43:38 +01:00
loglevels.py	[REF] logging: removed pseudo log-level TEST.	2013-03-26 16:58:44 +01:00
netsvc.py	[FORWARD] Forward port of server 7.0 until revision 4988	2013-05-28 12:27:33 +02:00
pooler.py	[REF] pooler: mark the functions as deprecated.	2013-03-27 15:16:53 +01:00
release.py	[REL] saas-2	2013-09-23 12:44:53 +02:00
sql_db.py	[MERGE] forward merge 7.0 until revision 4919.	2013-04-04 15:07:04 +02:00