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 19453: Change discount label based on priceMode
Merge remote-tracking branch 'XTUPLE/quote_dev' into 19453
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
Issue 19453: Add formats for amounts
Merge pull request #129 from lynnaloo/19453

19453