mifosx-318

fix issue mifosx-318
also issue316 for edit screen