Merge pull request #23 from xtuple/master

Catch up.
Merge remote-tracking branch 'XTUPLE/master'
Merge branch 'master' into 19453
Merge remote-tracking branch 'XTUPLE/quote_dev' into 19453
Merge remote-tracking branch 'XTUPLE/quote_dev' into 19453
Issue 19453: Conditional showing of the Promised Date based on the UsePromiseDate setting
issue #19550: Finish writing quote model.
issue #19550: swat!
Issue 19453: Change discount label based on priceMode
Merge remote-tracking branch 'XTUPLE/quote_dev' into 19453
Merge pull request #24 from xtuple/master

Catch up.
Merge branch 'master' into 19550
Merge branch 'quote_dev' into 19550
Merge pull request #128 from jrogelstad/19453

issue #19453: Some cosmetic tweaks to views
Issue 19453: Add formats for amounts
Merge remote-tracking branch 'XTUPLE/master'
Merge branch 'master' into 19453
Merge remote-tracking branch 'XTUPLE/quote_dev' into 19453
Merge pull request #126 from jrogelstad/19550

issue #19550: Quote model is substantially finished.
Issue 19453: Add formats for amounts