Hi,
Yes the patch is included in the Nicolas file.
I submitted my modification in the HikaShop repository so Nicolas have it in his side.
When you want to re-import order, you have to clean your order table and the table "hikashop_vm_orders" which is used to make the link between the vm orders and the hikashop one.
Regards,
Jerome - Obsidev.com
HikaMarket & HikaSerial developer / HikaShop core dev team.
Also helping the HikaShop support team when having some time or couldn't sleep.
By the way, do not send me private message, use the "contact us" form instead.