Your slightly modified patch is in trunk at revision: 1746290
I moved the party field line to have the lookup show. Note: in case of error the message is still awful, not a big deal
FYI: when the patches are "the same" you don't need to provide a patch for releases branches, we can easily backport. Anyway we normally don't backport improvements (because of possible regressions) and I'll not backport this one. Also please create your patch based on trunk HEAD, there was a small fuzz factor to be applied for QuoteServices.xml.