Mustufa Rangwala 3e2473f7a5 [MERGE] merge from trunk addons ... bzr revid: mra@mra-laptop-20110106075212-m18yq1v5l6d7rbm0		2011-01-06 13:22:12 +05:30
..
i18n	[MERGE] merge from trunk addons	2011-01-06 13:22:12 +05:30
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	[IMP] account*,crm*,hr*,auction,delivery,event:changed static date of 2010 to current date	2011-01-05 12:59:14 +05:30
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	typo	2010-12-30 19:12:20 +05:30
hr_payroll_data.xml	merged with trunk	2010-12-30 15:28:09 +05:30
hr_payroll_demo.xml	merged with trunk	2010-12-30 15:28:09 +05:30
hr_payroll_sequence.xml	merged with trunk	2010-12-30 15:28:09 +05:30
hr_payroll_view.xml	[MERGE] branch merged with lp:~openerp-dev/openobject-addons/trunk-dev-addons3	2011-01-03 15:06:47 +05:30
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