ok
Merge branch 'origin/master'

Conflicts:
	Forms/Document/Sale.dfm
	Forms/Document/Sale.pas
	Forms/Document/Sale_PartnerJournal.dfm
	TEST/DPR/ProjectTest.dpr
	TEST/DPR/ProjectTest.dproj