Olivier Dony e216218f44 [FIX] res.partner.category: merge the 2 classes bearing the same name ... The name conflict causes the second class to shadow the first one, thus breaking future references to the first one, including any super() call inside it! 6.1 has 2-pass loading of models so we can simply merge the two classes now, and get rid of the issue. bzr revid: odo@openerp.com-20120112105043-ij740gptzu4gv6tw		2012-01-12 11:50:43 +01:00
..
addons	[FIX] res.partner.category: merge the 2 classes bearing the same name	2012-01-12 11:50:43 +01:00
conf	[MERGE] sync with latest trunk	2011-09-28 23:13:26 +02:00
db	[REF] openerp.modules	2011-04-20 17:27:18 +02:00
modules	[FIX] base: module sequence number removed from XML data, moved to individual module manifests	2012-01-07 05:17:45 +01:00
osv	[MERGE] merged trunk.	2012-01-10 16:43:33 +01:00
pychart	[IMP] openerp python module.	2011-02-07 13:57:23 +01:00
report	[IMP]: Improvements to format report pageSize according to company paper format(US letter/A4)	2011-12-21 14:54:46 +05:30
service	[imp] added service in object_service to be able to call a method specifying kwargs	2012-01-05 17:03:51 +01:00
test	[IMP] Added missing vim mode lines	2011-11-22 09:58:48 +01:00
tests	[IMP] tests: moved tests into openerp.tests, expose test suites.	2011-12-01 15:00:12 +01:00
tools	[FIX] translation: remove calls to trans_update_res_ids	2012-01-09 15:09:58 +01:00
wizard	[FIX] wizard: typo.	2011-12-01 13:06:43 +01:00
workflow	[FIX] workflow returning actions	2011-12-11 11:21:40 +01:00
.apidoc	API doc: move settings file from bin/ to openerp/	2011-06-23 12:08:07 +03:00
PKG-INFO	[IMP] openerp python module.	2011-02-07 13:57:23 +01:00
__init__.py	[MERGE] sync with latest trunk	2011-09-27 18:51:33 +02:00
cron.py	[FIX] cron: cleanup wakeup pointers after processing them	2011-09-29 01:54:09 +02:00
exceptions.py	[FIX] xmlrpc: handle old/new exceptions with old/new clients.	2011-09-30 10:50:12 +02:00
import_xml.rng	[IMP] rng,convert: add support for report `usage` attribute	2011-10-10 16:22:26 +02:00
loglevels.py	[IMP] tools.ustr: fix possible stack overflow for exception_to_unicode + tabs->spaces	2011-10-07 16:48:06 +02:00
netsvc.py	[FIX] abort_response typo	2011-10-01 03:32:54 +02:00
pooler.py	[IMP] registry: whene deleting a registry, also delete its cache and cron.	2011-07-13 17:35:21 +02:00
release.py	[IMP] release: add structured version_info tuple, properly comparable	2011-11-04 15:41:12 +01:00
run_tests.py	[IMP] Added missing vim mode lines	2011-11-22 09:58:48 +01:00
sql_db.py	[FIX] discard closed connections. Restart not required anymore when connection is lost.	2011-11-17 10:33:35 +01:00
tiny_socket.py	[IMP] Added missing vim mode lines	2011-11-22 09:58:48 +01:00
wsgi.py	[FIX] openerp.wsgi: missing system-wide addons loading in on_starting()	2012-01-06 14:24:18 +01:00