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

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

Fix: Bad localtaxes calc for Spain if VAT is 0. For >= 3.9.x

Fix: Bad localtaxes calc for Spain if VAT is 0

FIX: Error when CATEGORIE_RECURSIV_ADD is enabled and new category is daughter of an already linked to object

FIX: #5340 Importing Tiers problem with capital field

FIX: Error when CATEGORIE_RECURSIV_ADD is enabled and new category is daughter of an already linked to object

FIX: only show projects of related third if external user

FIX : missing column into SQL on thridparty list

FIX: Failed to export contact categories with contact extra fields

Fix: Using $this when not in object context

FIX No ORDER BY needed for a COUNT sql, causes PGSQL error

Fixed product description field name in line edit.

The POST value 'desc' was never evaluated and caused fields to blank
out on update action.