[MERGE] branch merged with trunk-payroll-india-mra
authorDigvijay Singh <dsi@tinyerp.com>
Mon, 16 Jul 2012 06:43:39 +0000 (12:13 +0530)
committerDigvijay Singh <dsi@tinyerp.com>
Mon, 16 Jul 2012 06:43:39 +0000 (12:13 +0530)
commitaad36699283b9756c58bb46ffe53b949c4eb736e
tree9bfcfd2c889bba1a3fde35e01b3514dcc0ff7281
parent037b2d30b62c934e0e25669bcf151751c367fed8
parent1e1644010b834f06a94473f1b3b1f0c80b0d8d0b
[MERGE] branch merged with trunk-payroll-india-mra

bzr revid: dsi@tinyerp.com-20120716064339-cpl2uf48nc49yj6m
addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py
addons/l10n_in_hr_payroll/l10n_in_hr_payroll_view.xml