Fixed error with missing payment method on manual order. Ref #931
Merge branch 'master' of https://github.com/opencart/opencart