problem with type of product

the column should be product_type
Merge pull request #1893 from braito4/patch-2

problem with type of product
FIX: double header
Merge pull request #1919 from GPCsolutions/fixtimespent

FIX: double header
Merge remote-tracking branch 'origin/3.6' into develop

Conflicts:
	htdocs/projet/activity/list.php