mtr f989fe70f8 [MERGE] branch merged with lp:~openerp-dev/openobject-addons/trunk-payroll ... bzr revid: mtr@mtr-20110318114852-29h76togtrdlx053		2011-03-18 17:18:52 +05:30
..
faces	merged with trunk	2010-12-30 15:28:09 +05:30
i18n	Launchpad automatic translations update.	2011-02-13 04:38:32 +00:00
security	merged with trunk	2010-12-30 15:28:09 +05:30
__init__.py	merged with trunk	2010-12-30 15:28:09 +05:30
__openerp__.py	[MERGE] branch merged with lp:~openerp-dev/openobject-addons/trunk-payroll	2011-03-18 17:18:52 +05:30
resource.py	[FIX] project_long_term: Corrected Resource not found error. Corrected error when switching the views on project phases.	2011-03-21 18:36:45 +05:30
resource_demo.xml	merged with trunk	2010-12-30 15:28:09 +05:30
resource_view.xml	[MERGE] merge from trunk addons	2011-01-11 10:14:15 +05:30