General soft terms from Supergravity including D-terms