ok
Merge branch 'origin/master'

Conflicts:
	Forms/Document/Sale.dfm
Merge branch 'origin/master'

Conflicts:
	Forms/Document/Sale.dfm
ok
Merge branch 'origin/master'

Conflicts:
	DATABASE/COMMON/PROCEDURE/Container/Get/lpInsertFind_Container_OLD.sql