Merge proposals dependent on lp:~openerp-dev/openerp-india/payroll-india-python-code-improvements-kbh

1. payroll-india-python-code-improvements-kbh
2. Dependent merge proposals