[MERGE]merge with project branch and resolve conflicts
authorKhushboo Bhatt (Open ERP) <kbh@tinyerp.com>
Thu, 19 Jul 2012 11:56:38 +0000 (17:26 +0530)
committerKhushboo Bhatt (Open ERP) <kbh@tinyerp.com>
Thu, 19 Jul 2012 11:56:38 +0000 (17:26 +0530)
commit4a87389f3189c86d99df317c4cd236afb013b5df
tree112ceaae233c76a3924fb7f0245a37b95b129cad
parentb0508a59a8367c97957f41ede9b1f0443d6b2909
parent06d731ebd2d20e8e58c3ec0e2242f9e27219f38d
[MERGE]merge with project branch and resolve conflicts

bzr revid: kbh@tinyerp.com-20120719115638-yd622zv6okdtaxfa
addons/l10n_in_hr_payroll/__openerp__.py
addons/l10n_in_hr_payroll/report/__init__.py
addons/l10n_in_hr_payroll/report/report_payroll_advice.rml