mtr eb0459c432 [MERGE] branch merged with lp:~openerp-dev/openobject-addons/trunk-dev-addons3 ... bzr revid: mtr@mtr-20100706091037-bfhj9vjfc63le5hg		2010-07-06 14:40:37 +05:30
..
i18n	Launchpad automatic translations update.	2010-06-26 04:58:31 +01:00
report	[MERGE] hr_payroll: branch merge for sbh => osv memory conversion and search view	2010-07-01 13:01:46 +05:30
test	[IMP] hr_payroll:Added yaml for hr_payroll	2010-07-06 14:37:09 +05:30
wizard	[MERGE] hr_payroll: branch merge for sbh => osv memory conversion and search view	2010-07-01 13:01:46 +05:30
__init__.py	[MERGE] hr_payroll: branch merge for sbh => osv memory conversion and search view	2010-07-01 13:01:46 +05:30
__openerp__.py	[MERGE] branch merged with lp:~openerp-dev/openobject-addons/trunk-dev-addons3	2010-07-06 14:40:37 +05:30
hr_paroll_report.xml	[ADD]: add other files to the hr_payroll module	2010-06-06 22:00:23 +05:30
hr_payroll.py	[FIX]: reviwe payroll and recall lost changes during the merge	2010-07-02 16:07:15 +05:30
hr_payroll_data.xml	[ADD]: add demo data	2010-06-22 02:15:23 +05:30
hr_payroll_demo.xml	[ADD]: add demo date to payroll module	2010-07-01 09:47:12 +05:30
hr_payroll_sequence.xml	[ADD]: add other files to the hr_payroll module	2010-06-06 22:00:23 +05:30
hr_payroll_view.xml	[FIX]: reviwe payroll and recall lost changes during the merge	2010-07-02 16:07:15 +05:30
hr_payroll_wizard.xml	[FIX]: fix a problems in payroll module	2010-06-29 22:52:04 +05:30
hr_payroll_workflow.xml	[FIX]: reviwe payroll and recall lost changes during the merge	2010-07-02 16:07:15 +05:30