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
New: Added hook "formConfirm" and "doActions" for fichinter card
Fix: duplicate field
Merge pull request #1922 from fmarcet/develop

New: Added hook "formConfirm" and "doActions" for fichinter card
Fix: var not initialized
Fix: Missing closing tr
Fix: add generic doc and uniformize code
Fix: add generic doc and use doc dir instead pdf
Fix: uniformize code
Fix: add possibility to use element id
New: add possibility to define a custom error message
Assignation of event to several users is on a very good way for 3.7
Add FIXME
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
Fix: form must not be into a closing and opening tr tag.
Merge remote-tracking branch 'origin/3.6' into develop

Conflicts:
	htdocs/projet/activity/list.php
Prepare 3.6.1