Merge pull request #1 from credativUK/bug_fix_order_prefix

[addons-7.0][FIX] Orders using wrong order prefix when duplicated
Merge branch 'master' into addons-7.0
Merge branch 'addons-7.0'