Conflicts:
	composer.json
	htdocs/product/ajax/products.php
	htdocs/product/class/product.class.php

Conflicts:
	.travis.yml
	htdocs/contrat/class/contrat.class.php
	htdocs/core/modules/livraison/pdf/pdf_typhon.modules.php
	htdocs/core/modules/project/pdf/pdf_baleine.modules.php

FIX: Not deleting contracts on element_element table

FIX #4242 Allow disabling dashes in documents

FIX #4242 Allow disabling dashes in documents

3.7 specific fix since document files have moved

Fix: Accountancy Add an empty field for list of parent account - This value can be null

Fix: PHP 7 - Fatal error: 'break' not in the 'loop' or 'switch' context

Conflicts:
	htdocs/product/class/product.class.php

Fix #3930 Removed executable bit

These files doesn't contain executable code and may pose a security
threat.

FIX: Not delete a product when have customer price

Conflicts:
	dev/codesniffer/ruleset.xml