Conflicts:
	htdocs/admin/tools/eaccelerator.php
	htdocs/fourn/class/fournisseur.commande.class.php
	htdocs/fourn/commande/dispatch.php

Conflicts:
	ChangeLog
	htdocs/comm/propal/list.php
	htdocs/compta/bank/ligne.php
	htdocs/compta/resultat/clientfourn.php
	htdocs/compta/salaries/fiche.php
	htdocs/core/lib/functions.lib.php
	htdocs/fourn/facture/paiement.php

Refactored dashboard indicator

Fix mssql

Fix inconsistent data

FIXED All constants COMPTA_* was renamed in ACCOUNTING_*

atm-gauthier-3.7

Conflicts:
	htdocs/install/mysql/migration/3.6.0-3.7.0.sql

fetch must contain an left join on c_actioncom for correct function

fix typo in createOrder

marcosgdf-misc

Conflicts:
	htdocs/barcode/codeinit.php

marcosgdf-bug-1830

Conflicts:
	ChangeLog

FIXED Correct typo on Changelog

3.6

Conflicts:
	ChangeLog

fourn/facture/paiement.php

marcosgdf-bug-1832

Conflicts:
	ChangeLog

FIXED: #1829 POS not compatible with batch products

FIXED : product webservice can now save barcode

review product stats list and add filter by period

Fix: [ bug #1822 ] SQL error in clientfourn.php report with PostgreSQL

FIX : Link to user was wrong on bank transaction card

FIX: select DISTINCT for natural search on proposal list (in the same way it's done in invoices list)

New: Add php-iban lib 1.4.6 to check iban information.

Conflicts:
	htdocs/core/modules/DolibarrModules.class.php