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
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
Prepare 3.6.1
Merge branch '3.6' of git@github.com:Dolibarr/dolibarr.git into 3.6
Fix: packager
Fix: doxygen
Fix: phpcheckstyle from phpcs 1.5.5 (closing tags and & char on
parameter).
Merge remote-tracking branch 'origin/3.6' into develop

Conflicts:
	htdocs/admin/stock.php
	htdocs/admin/system/index.php
	htdocs/comm/fiche.php
	htdocs/core/lib/admin.lib.php
	htdocs/core/lib/holiday.lib.php
	htdocs/core/lib/pdf.lib.php
	htdocs/core/login/functions_forceuser.php
	htdocs/core/login/functions_http.php
	htdocs/core/menus/standard/auguria.lib.php
	htdocs/core/modules/livraison/pdf/pdf_typhon.modules.php
	htdocs/filefunc.inc.php
	htdocs/holiday/define_holiday.php
	htdocs/opensurvey/fonctions.php
	htdocs/societe/canvas/actions_card_common.class.php
	test/phpunit/CompanyBankAccountTest.php
	test/phpunit/ExportTest.php
	test/phpunit/FactureTest.php
	test/phpunit/FunctionsLibTest.php
	test/phpunit/PropalTest.php
	test/phpunit/SocieteTest.php
	test/phpunit/WebservicesInvoicesTest.php
	test/phpunit/WebservicesThirdpartyTest.php