odoo/openerp
Thibault Delavallée a1d6ac520c [MERGE] Sync with trunk.
Pleave avoid merging with other branches like saas branch, this causes criss-cross issues.
Do things completely instead of tryign to gain 3 minuts.

bzr revid: chm@openerp.com-20131003151612-bmaylm7v3ywqwaux
bzr revid: tde@openerp.com-20131004084936-8xdvfjm2dhtyq07p
2013-10-04 10:49:36 +02:00
..
addons [MERGE] Sync with trunk. 2013-10-04 10:49:36 +02:00
cli [FIX] watch parent when run in evented mode 2013-06-10 18:07:11 +02:00
conf [MERGE] openerp.pooler is deprecated. 2013-03-27 17:40:45 +01:00
modules [MERGE] Forward-port of latest 7.0 bugfixes, up to rev. 5098 rev-id: odo@openerp.com-20131011123914-7zuvd9mch21yxgj8 2013-10-11 15:44:33 +02:00
osv [MERGE] Sync with trunk. 2013-10-04 10:49:36 +02:00
report [ADD] report: support for dynamic fonts in report 2013-10-03 16:13:07 +02:00
service [FIX] workerst: revert commit 4930, remove useless loop and if condition always validated 2013-08-06 11:42:22 +02:00
tests [MERGE] Sync with trunk. 2013-10-04 10:49:36 +02:00
tools [MERGE] Sync with trunk until revision 4957. 2013-10-02 15:38:20 +02:00
workflow [FIX] workflows: fixed a regression in transition check, group attribute on transaction is group_id, not groups_id 2013-08-09 12:51:22 +02:00
PKG-INFO [REM] netrpc: KILL EVERYBODY 2013-02-21 13:18:25 +01:00
__init__.py [MERGE] forward port of branch saas-1 up to revid 4887 chs@openerp.com-20130612153934-qyp6pb3bc4za4taf 2013-06-13 19:39:00 +02:00
exceptions.py [REF] code review 2013-02-15 15:35:03 +01:00
http.py [DOC] openerp.http: use sphinx domains. 2013-02-01 16:13:54 +01:00
import_xml.rng [IMP] priority on views 2013-09-29 10:50:00 +02: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