Merge pull request #33 from xtuple/master

Catch up.
issue #18764: Fix empty record problem caused by combo box changes.
Merge pull request #427 from jrogelstad/master

issue #18764: Merge to master.