Merge remote-tracking branch 'XTUPLE/master'
Merge branch 'master' into 19453
Merge remote-tracking branch 'XTUPLE/quote_dev' into 19453
Issue 19453: Change the label of the discount field to markup depending on PriceMode
Merge remote-tracking branch 'XTUPLE/quote_dev' into 19453
Issue 19453: Added Itemsite Widget to QuoteLine items
Merge pull request #141 from lynnaloo/19453

19453 - Added Itemsite Widget to QuoteLine Editor and Added Discount/Markup label change.