user making timesheet into timesheet pages.
NEW: Can enter start hours of task when creating timesheet

Conflicts:
	htdocs/societe/class/societe.class.php

Conflicts:
	htdocs/comm/action/index.php
	htdocs/core/lib/agenda.lib.php
	htdocs/fourn/paiement/fiche.php

Fix bad merge

NEW : Better extrafeild management on proposal and contract line NEW : Add company information into category contact export

NEW: Add bank account owner in invoice/proposal/orders footer

atm-ph-incoterm

Conflicts:
	htdocs/comm/propal.php
	htdocs/fourn/commande/card.php
	htdocs/fourn/facture/card.php
	htdocs/install/mysql/migration/3.7.0-3.8.0.sql

Fix: Masks works with thirdparty type

Update index.php

[ bug #1892 ] PHP Fatal error when using USER_UPDATE_SESSION trigger and adding a supplier invoice payment

NEW: [T1848] Merge bank card & account card

Typo "Copytight"

into develop

Conflicts:
	htdocs/includes/tcpdi/fpdf_tpl.php
	htdocs/projet/card.php

Fixed bug with hide/show checkboxes reported by Ruben Almeida (aruben)

develop

Conflicts:
	htdocs/projet/class/project.class.php

FIXED: Remove condition to show accountancy field on user.

quotation/price to suppliers.
Merge branch 'new_ask_price' of https://github.com/atm-ph/dolibarr into
atm-ph-new_ask_price

Conflicts:
	htdocs/core/class/commonobject.class.php
	htdocs/core/class/html.formfile.class.php
	htdocs/core/tpl/document_actions_post_headers.tpl.php
	htdocs/core/tpl/objectline_edit.tpl.php
	htdocs/core/tpl/objectline_view.tpl.php
	htdocs/fourn/class/fournisseur.commande.class.php
	htdocs/fourn/commande/card.php
	htdocs/install/mysql/migration/3.7.0-3.8.0.sql

Better fix for bug-1825. There are actually a lot to things to escape and escaped methods can make conflict with similar names so it is better to make a md5 to have a unique value