Merge remote-tracking branch 'XTUPLE/4_4_x'
Merge branch 'master' of github.com:andersdd/xtuple
issue #23588: SO item copies irrelevantly
start of update sales order workflow test
style changes for filters
Merge remote-tracking branch 'XTUPLE/4_5_x' into 23588
Merge remote-tracking branch 'XTUPLE/4_5_x'
Merge remote-tracking branch 'XTUPLE/4_6_x'
Rename activityList to avoid strict naming conflict
simplify test, get it passing and move on
remove unnecessary var
Issue #23628:copy SO characteristics and email from quote to SO
Merge pull request #1526 from andersdd/fix_activitylist

Fix activitylist naming convention
Issue #23507:correctly handle non-netable
reverse smoke changes
Issue #23758:correctly calc costs and margins for kits
22128 style changes for dashboard filters
Merge branch 'xtuple45' into theme4
Merge pull request #1532 from garyhgohoos/23628

Issue #23628:copy SO characteristics and email from quote to SO
Merge pull request #1536 from garyhgohoos/23507

23507:correctly handle non-netable