Merge branch 'dev' into 'master' Dev See merge request quiqqer/erp-accounting-templates!2