qdp-launchpad@tinyerp.com 2df4a68377 [MERGE] merged the dev3 branch ... bzr revid: qdp-launchpad@tinyerp.com-20110114001101-wk77opsrvslh7pak		2011-01-14 01:11:01 +01:00
..
i18n	[MERGE] merged the dev3 branch	2011-01-14 01:11:01 +01:00
report	[MERGE] merge from trunk addons	2011-01-03 14:38:25 +05:30
security	merged with trunk	2010-12-30 15:28:09 +05:30
test	[MERGE] merged the dev3 branch	2011-01-14 01:11:01 +01:00
wizard	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	merged with trunk	2010-12-30 15:28:09 +05:30
hr_paroll_report.xml	merged with trunk	2010-12-30 15:28:09 +05:30
hr_payroll.py	[MERGE] merged the dev3 branch	2011-01-14 01:11:01 +01:00
hr_payroll_data.xml	[MERGE] merged the dev3 branch	2011-01-14 01:11:01 +01:00
hr_payroll_demo.xml	[MERGE] merged the dev3 branch	2011-01-14 01:11:01 +01:00
hr_payroll_sequence.xml	merged with trunk	2010-12-30 15:28:09 +05:30
hr_payroll_view.xml	[MERGE] merged the dev3 branch	2011-01-14 01:11:01 +01:00
hr_payroll_wizard.xml	merged with trunk	2010-12-30 15:28:09 +05:30
hr_payroll_workflow.xml	merged with trunk	2010-12-30 15:28:09 +05:30