GPCsolutions-droposcommerce

Conflicts:
	htdocs/install/mysql/migration/3.6.0-3.7.0.sql
	htdocs/langs/vi_VN/admin.lang
	htdocs/langs/vi_VN/shop.lang

spaces.

New: extrafields for projects and tasks are exported to ODT documents.

notes and documents)

Fix: Missing maxwidthonsmartphone.
Fix: Missing backtopage
Fix: Missing translation key

Conflicts:
	ChangeLog
	htdocs/categories/fiche.php
	htdocs/comm/action/index.php
	htdocs/comm/propal.php
	htdocs/commande/fiche.php
	htdocs/compta/facture.php
	htdocs/compta/facture/class/facture.class.php
	htdocs/contrat/class/contrat.class.php
	htdocs/core/class/commonobject.class.php
	htdocs/core/tpl/objectline_create.tpl.php
	htdocs/fourn/fiche.php
	htdocs/product/composition/fiche.php
	htdocs/product/price.php
	htdocs/projet/tasks/task.php
	htdocs/projet/tasks/time.php

Conflicts:
	htdocs/core/lib/date.lib.php

Missing reprogramming task into GUI for cron module.

Update modContrat.class.php

Fix :: Button on/off for account in chart of accounts

Fix bug 1588 : relative discount

Fix increase stock on shipment validation

Update product.class.php

Lowercased booleans to fit with PSR-2 specification.

Fix: Color of first line of documents.
Fix: The calculated progress was not calculated.

Allow reporting progress along with timespent

multiprice

github.com:Devensys/dolibarr into
Devensys-develop-HiddenMailPasswordForgotten

Conflicts:
	htdocs/core/lib/functions.lib.php

Allow to make PUT request with getURLContent() function

Fix: Missing includes.