Merge pull request #1983 from odoo-dev/master-pos-new-payment-screen-fva