[pull] master from leangjia:master#1

pull[bot] wants to merge 4 commits into

odoo-china:masterodoo-china/payment:masterfrom

leangjia:masterleangjia/payment_alipay:masterCopy head branch name to clipboard