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.
T948-develop :Classify Billed when the price of bill is greater than command

		-In the workflow i've added on bouton which permitted
		to classify billed when the price of bills is greater
 		than command,if her status is delivered

		/htdocs/admin/workflow.php
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
T966-develop : Put the poste of the contact in the list

In the list of contact when we send a mail,i added the post of person in () after the name
htdocs/commande/fiche.php?id=481&action=presend&mode=init
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
Update fiche.php
Comment code of a deprecated variable.
Merge pull request #1171 from braito4/patch-1

Update fiche.php
Fix: Use reserved word None when we don't want thousand separator.
Merge pull request #1161 from PaulPoulain/948-develop

T948-develop :Classify Billed when the price of bill is greater than command
Merge pull request #1164 from PaulPoulain/966-develop

T966-develop : Put the poste of the contact in the list
Update societe.class.php

Add missing space
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
Fix: [ bug #1029 ] Tulip numbering mask