Factorization into prime and invertible ideals II