fixes for PO
Merge https://github.com/GrandMasterX/new_echarter
fixed plus and minus on forms