generaBonificacion implemented
Merge conflict