lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
Conflicts:
	htdocs/product/stock/card.php
This commit is contained in:
Laurent Destailleur 2021-04-19 20:55:09 +02:00
commit 28f0c6c7cf
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
htdocs/product/stock/card.php
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");
@ -160,7 +160,7 @@ if (empty($reshook))
{ {
if ($object->fetch($id)) if ($object->fetch($id))
{ {
$object->label = GETPOST("libelle"); $object->label = GETPOST("libelle");
$object->fk_parent = GETPOST("fk_parent"); $object->fk_parent = GETPOST("fk_parent");
$object->description = GETPOST("desc"); $object->description = GETPOST("desc");
$object->statut = GETPOST("statut"); $object->statut = GETPOST("statut");
@ -169,8 +169,8 @@ if (empty($reshook))
$object->zip = GETPOST("zipcode"); $object->zip = GETPOST("zipcode");
$object->town = GETPOST("town"); $object->town = GETPOST("town");
$object->country_id = GETPOST("country_id"); $object->country_id = GETPOST("country_id");
$object->phone = GETPOST("phone"); $object->phone = GETPOST("phone");
$object->fax = GETPOST("fax"); $object->fax = GETPOST("fax");
// Fill array 'array_options' with data from add form // Fill array 'array_options' with data from add form
$ret = $extrafields->setOptionalsFromPost(null, $object); $ret = $extrafields->setOptionalsFromPost(null, $object);