Bug 4310 Map orders to new budget structure