mtr 5f84f53e4f [MERGE] branch merged with lp:~openerp-dev/openobject-addons/trunk-payroll ... bzr revid: mtr@mtr-20110322134046-ei3f3twp4y37egf8		2011-03-22 19:10:46 +05:30
..
i18n	[MERGE] branch merged with lp:~openerp-dev/openobject-addons/trunk-payroll	2011-03-22 19:10:46 +05:30
security	merged with trunk	2010-12-30 15:28:09 +05:30
wizard	[MERGE] merged with main addons branch	2011-03-09 14:14:25 +01:00
__init__.py	merged with trunk	2010-12-30 15:28:09 +05:30
__openerp__.py	[MERGE] Resynchronized with trunk.	2011-03-25 11:24:13 +01:00
base_synchro_obj.py	[Fix] Fix buildbot warning	2011-01-17 15:06:23 +05:30
base_synchro_view.xml	[IMP] access rights for warehouse user group	2010-12-21 11:04:23 +01:00