Olivier Dony 4017c9da74 [MERGE] merged multi-company rules fix from 6.0 ... bzr revid: odo@openerp.com-20110228104936-7o281husy5j1hz8l bzr revid: odo@openerp.com-20110228140001-eo18g7ncst04v0lg		2011-02-28 15:00:01 +01:00
..
data	[REF]	2010-08-12 20:01:06 +05:30
i18n	Launchpad automatic translations update.	2011-02-25 06:05:42 +00:00
security	[IMP]: Moved reference of demo user from *_security.xml to demo file	2010-11-19 15:55:25 +05:30
test	"[IMP] security groups on act_window in product and partner objects"	2010-12-20 15:56:07 +01:00
web	[MERGE] merged multi-company rules fix from 6.0	2011-02-28 15:00:01 +01:00
wizard	[FIX] Buidbot warnings	2010-12-29 14:46:47 +05:30
__init__.py	[REM]: wiki: Reverted changes for wiki yml for merge in trunk	2010-04-19 11:26:41 +05:30
__openerp__.py	[FIX] pad, share, wiki: update import to openobject.rpc instead of openerp.utils.rpc (package moved back into core)	2011-02-10 17:10:42 +01:00
wiki.py	[MERGE] merged the numerigraphe branch related to common typo mistake 'childs' instead of children. Thanks for the contribution	2010-12-28 18:07:18 +01:00
wiki_demo.xml	[IMP]: Moved reference of demo user from *_security.xml to demo file	2010-11-19 15:55:25 +05:30
wiki_view.xml	[MERGE] merged the numerigraphe branch related to common typo mistake 'childs' instead of children. Thanks for the contribution	2010-12-28 18:07:18 +01:00