Fixed name overlap issue in Quote/Sales Order
Merge pull request #1329 from lynnaloo/23094

Fixed name overlap issue in Quote/Sales Order