Issue #21943:shipping by site
Issue #22456:display margin on Invoice
Issue #22456:add new function to package
Issue #22456:fix copyright date
Merge remote-tracking branch 'DATABASE/master' into 21943
due to long time lag
Issue #21943:tweaks
Merge pull request #109 from garyhgohoos/22039-2

Issue #22456:display margin on Invoice
Merge pull request #110 from garyhgohoos/21943

21943