fix Layout / Alert
fix error merge
invoice error merge
Merge branch 'master' of https://github.com/echr/pj