https://github.com/atm-alexis/dolibarr into
atm-alexis-feature_Product_stock_subproduct_stock_independent

Conflicts:
	htdocs/langs/en_US/products.lang

FIXED: Module Expense Report - Correct init

Module Expense Report: reactivate conflict with modDeplacement

Move new module Expense Report in hrm

NEW: added fields and relative filters in contracts list page

NEW: Add button to purge search criteria into list of expense report

FIXED: Correct field note - Add note_private & use wysiwyg editor

mrsof-develop

Conflicts:
	htdocs/comm/card.php

FIXED: Update licence to GPLv3

dolibarr does not contains same files. We must first find a solution
before making this feature public.

Conflicts:
	htdocs/fourn/commande/dispatch.php

Fix import failed to find type of companny from source file.
Fix import date of creation has wrong check rule.

Edit in place not working for field "Outstanding Limit" in view mode for third party :
- Field type 'amount' do not work in "Edit in place" mode.
- Update returns an error "Unknown field 'OutstandingBill' in field list" when in "Edit in place" mode.

Fix no input outside tr-td

Files Integrity Checker

Conflicts:
	htdocs/compta/prelevement/class/bonprelevement.class.php
	htdocs/index.php
	htdocs/projet/class/project.class.php
	test/phpunit/BankAccountTest.php

- improve screen of virtual product