Merge odoo with vat_on_payment and account_storno