_
Merge remote-tracking branch 'origin/master'
issue #19550: Switch to a more declaritive style of calculation that reduces number of query calls.
Merge branch 'master' into 19550
Incident #19550 - missing schema prefix in quote.json
Merge pull request #62 from mikerodonnell89/19550

fixed small orm issue
fix
issue #19550: Add more quote line calculation detail.
Merge pull request #11 from xtuple/master

catch up.
Merge branch 'master' into 19550
issue #19550: Couple fixes to init script.
Incident #19550 - added SaleType model and collection.  Commented out schedule date from quote workspace for now.
Incident #19550 - added taxCode and taxType models/collections
Incident #19550 - added ItemSiteRelation and collection
issue #19550: Add schedule date, discount and other price calculations.
issue #19550: Update init script.sql
Incident #19550 - fixed some problems
Issue #19693  Add support for column comments when adding a column.
issue #19550: Add more calculations and rounding.
issue #19550: Add profit calculation. Add calcs to orm.