Conflicts:
	htdocs/.gitignore

Update categorie.php

voir https://github.com/Dolibarr/dolibarr/pull/3540/files (je n'avais pas vu dans quelle branche j'étais)

FIX : #3530

FIX Syntax error in Debian Apache configuration

This issue prevented Apache from starting after dolibarr deb package
installation with the following error:
Syntax error on line 30 of /etc/apache2/conf.d/dolibarr.conf:
order takes one argument, 'allow,deny', 'deny,allow', or 'mutual-failure'

FIX : Must not be able to create Proposal on thridparty with "close" status  #3526

Conflicts:
	htdocs/fourn/commande/dispatch.php
	htdocs/product/class/html.formproduct.class.php
	htdocs/product/stock/index.php
	htdocs/product/stock/liste.php
	htdocs/product/stock/mouvement.php
	htdocs/product/stock/product.php
	htdocs/product/stock/valo.php

Fix #3471 3.5 Rounding issue when dispatching non-integer

Fix #3471 3.7 Rounding issue when dispatching non-integer

Fix multientity stock management (F.Henry followup)

This reverts commit 1d85529e.

3.6

rows.

Conflicts:
	ChangeLog
	htdocs/filefunc.inc.php

FIX : multientity warehouse management

Fix #3455 In advanced accounting module, button transfer to general ledger don't work

Fix: problem with pagination

FIX ref_supplier to object property on supplier ref change

fix : Typo