Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0

Conflicts:
	htdocs/core/lib/pdf.lib.php
This commit is contained in:
Laurent Destailleur 2020-08-04 13:41:19 +02:00
commit 83a9be2428

View File

@ -78,6 +78,7 @@ $cancel != $langs->trans("Cancel") &&
$object->label = $_POST["libelle"];
$object->description = dol_htmlcleanlastbr($_POST["desc"]);
$object->other = dol_htmlcleanlastbr($_POST["other"]);
$object->update($object->id, $user);
}
else
{