Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0

Conflicts:
	htdocs/product/stock/card.php
This commit is contained in:
Laurent Destailleur 2021-04-19 20:55:09 +02:00
commit 28f0c6c7cf

View File

@ -97,7 +97,7 @@ if (empty($reshook))
$object->fk_parent = (int) GETPOST("fk_parent", "int"); $object->fk_parent = (int) GETPOST("fk_parent", "int");
$object->label = (string) GETPOST("libelle", "alpha"); $object->label = (string) GETPOST("libelle", "alpha");
$object->description = (string) GETPOST("desc", "alpha"); $object->description = (string) GETPOST("desc", "alpha");
$object->statut = GETPOST("statut"); $object->statut = GETPOST("statut", "int");
$object->lieu = (string) GETPOST("lieu", "alpha"); $object->lieu = (string) GETPOST("lieu", "alpha");
$object->address = (string) GETPOST("address", "alpha"); $object->address = (string) GETPOST("address", "alpha");
$object->zip = (string) GETPOST("zipcode", "alpha"); $object->zip = (string) GETPOST("zipcode", "alpha");