Conflicts:
	htdocs/.gitignore
	htdocs/core/lib/functions2.lib.php
	htdocs/install/mysql/migration/repair.sql
	htdocs/langs/en_US/errors.lang

Conflicts:
	htdocs/core/lib/functions2.lib.php
	htdocs/langs/en_US/errors.lang
	htdocs/product/class/product.class.php

Fix: Warning message not translated

on.

PHP 5.6 compatibility

bug fix of dolibarr bug.

PDF like MAIN_GENERATE_PROPOSALS_WITH_PICTURE dir for proposals.

llx_c_email_template, then translation key.

$HTTP_RAW_POST_DATA is now DEPRECATED
Replaced all usages by the recommended file_get_contents("php://input")

add refext into fecth product

Conflicts:
	build/debian/get-orig-source.sh
	htdocs/product/class/product.class.php
	htdocs/societe/soc.php

Conflicts:
	build/debian/control
	htdocs/compta/bank/account.php
	htdocs/fourn/paiement/fiche.php
	htdocs/product/class/product.class.php
	htdocs/product/fiche.php

AGENDA_DEFAULT_FILTER_TYPE.