Lokomotivler

I'm having the same problem. For other pokemon (rotom for example) I was able to circumvent this bug by selling the pokemon and then cancelling the order. But for cherrim it doesn't work (I suspect it goes back to its original form immediately after battle / doesn't save its form changes after battle). Is there any way to get the pokedex entry? Did you find a solution?