Merge pull request #17326 from atm-greg/FIX_warehouse_label_edition

fix warehouse label field edition
This commit is contained in:
Laurent Destailleur 2021-04-19 20:26:56 +02:00 committed by GitHub
commit e2d7e84072
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -98,6 +98,7 @@ if (empty($reshook))
$object->ref = GETPOST("ref"); $object->ref = GETPOST("ref");
$object->fk_parent = GETPOST("fk_parent"); $object->fk_parent = GETPOST("fk_parent");
$object->libelle = GETPOST("libelle"); $object->libelle = GETPOST("libelle");
$object->label = GETPOST("libelle");
$object->description = GETPOST("desc"); $object->description = GETPOST("desc");
$object->statut = GETPOST("statut"); $object->statut = GETPOST("statut");
$object->lieu = GETPOST("lieu"); $object->lieu = GETPOST("lieu");
@ -105,8 +106,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");
if (!empty($object->libelle)) if (!empty($object->libelle))
{ {
@ -168,6 +169,7 @@ if (empty($reshook))
if ($object->fetch($id)) if ($object->fetch($id))
{ {
$object->libelle = GETPOST("libelle"); $object->libelle = 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");
@ -176,8 +178,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);