- Replace "AND" by "&&"
- Escape $error
- Fix payment.tpl width on PS 1.6+
- Fix order state translation