accepting all html tags from templates.

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

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

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)

STOCK_WAREHOUSE_NOT_REQUIRED_FOR_SHIPMENTS to solve, with no risk, a
missing control on missing warehouse.

This reverts commit bb2c33e2.

making data lost.