354 Commits

Author	SHA1	Message	Date
Olivier Dony	2621b707e0	[MERGE] merged latest fixes from 6.0 branch up to rev 3348 ... Rev 3348 is odo@openerp.com-20110221101549-vp0ha2g91yl30cmk. bzr revid: odo@openerp.com-20110221103235-6tdy5tpb6zvkbzs3	2011-02-21 11:32:35 +01:00
Olivier Dony	cfc6d831df	[MERGE] merged latest 6.0 fixes up to rev 3339 ... Revision 3339 = odo@openerp.com-20110208140924-0bgxqgt1oyrxwz3z bzr revid: odo@openerp.com-20110208164923-u7mzknc0b3avb9i0	2011-02-08 17:49:23 +01:00
Vo Minh Thu	6713d57ab1	[MERGE] merge of the openerp python module branch. ... bzr revid: vmt@openerp.com-20110208150149-x4vu09aj42ezma5a	2011-02-08 16:01:49 +01:00
Vo Minh Thu	f8572e5c60	[IMP] openerp python module. ... - Some logging code moved from netsvc.py to loglevels.py - Changed imports to use the new openerp module - config and netsvc initialization calls move to openerp-server.py - Moved openerp-server.py outside the old bin directory - Some imports in tools moved inside the methods to break mutual-dependencies bzr revid: vmt@openerp.com-20110207125723-ooee7d7ng5elmkso	2011-02-07 13:57:23 +01:00