Conflicts:
	htdocs/accountancy/class/bookkeeping.class.php
	htdocs/compta/facture/list.php
	htdocs/compta/paiement/class/cpaiement.class.php
	htdocs/compta/sociales/card.php
	htdocs/core/lib/functions.lib.php
	htdocs/expensereport/card.php
	htdocs/expensereport/class/expensereport.class.php
	htdocs/product/stats/facture.php

FIX : we have to check if contact doesn't already exist on add_contact

Fix some problems

New add trigger disable to updateline functions

Bad path for document file 

Better fix for future

FIX accountancy right management on setup pages

SQL Error migration 5.0 to 6.0

Fix update row on xlsx import do not work as csv import

Fix return method

Fix: check if action type is different of 'user' (external module)

Fix #7103 : No error message on validate shipment if stock movement failed

NEW: Add column with nbr suppliers prices and WAP to product list.