Fix: [ bug #991 ] Error when adding a product in POS when no Tax is
associated to the country of the company
Trans: Upgrade language file
Merge branch '3.4' of git@github.com:Dolibarr/dolibarr.git into 3.4
Fix: Permissions on files
Fix: Tons of regression after renaming note field into note_private.
Fix: Param must be a regex string

Conflicts:
	htdocs/core/class/html.formfile.class.php
Fix: Do not load class like it should
Fix: Pb with predefined invoices
Fix: Found a dozen of bugs into sub module delivery of module shipment.

Conflicts:
	htdocs/core/modules/expedition/doc/pdf_rouget.modules.php
	htdocs/expedition/class/expedition.class.php
	htdocs/expedition/fiche.php
Fix: [ bug #1029 ] Tulip numbering mask
Fix: Supplier invoice and supplier order are not displayed into object
link into agenda event card
Merge pull request #1174 from FHenry/3.4

Fix: Supplier invoice and supplier order are not displayed into object
Merge remote-tracking branch 'origin/3.3' into 3.4
Exclude conf.php file from git
Fix update extrafield do not display immediatly
Fix: [ bug #1033 ] SUPPLIER REF disappeared


Change-Id: I3d7bc928bf2428e4a96c61fd9d22e8235792dfe7
Fix Bug with canvas
Fix canvas feature broken
Merge branch '3.4' of https://github.com/Dolibarr/dolibarr.git into 3.4

Conflicts:
	ChangeLog