diff --git a/htdocs/comm/action/card.php b/htdocs/comm/action/card.php index 49051464614..5fffaba8636 100644 --- a/htdocs/comm/action/card.php +++ b/htdocs/comm/action/card.php @@ -2336,12 +2336,13 @@ if ($id > 0) { // Type if (getDolGlobalString('AGENDA_USE_EVENT_TYPE')) { print ''.$langs->trans("Type").''; - $labeltoshow = $langs->trans("Action".$object->type_code); + $labeltype = ($langs->transnoentities("Action".$object->type_code) != "Action".$object->type_code) ? $langs->transnoentities("Action".$object->type_code) : $object->type_label; + $labeltoshow = $labeltype; if ($object->code) { $labeltoshow .= ' ('.$object->code.')'; } print $object->getTypePicto('pictofixedwidth paddingright', $labeltoshow); - print $langs->trans("Action".$object->type_code); + print $labeltype; print ''; } diff --git a/htdocs/comm/action/class/actioncomm.class.php b/htdocs/comm/action/class/actioncomm.class.php index 5a8db497980..1b253bc5aab 100644 --- a/htdocs/comm/action/class/actioncomm.class.php +++ b/htdocs/comm/action/class/actioncomm.class.php @@ -845,6 +845,7 @@ class ActionComm extends CommonObject $this->type_color = $obj->type_color; $this->type_picto = $obj->type_picto; $this->type = $obj->type_type; + $this->type_label = $obj->type_label; $this->code = $obj->code; $this->label = $obj->label; diff --git a/htdocs/product/stock/replenish.php b/htdocs/product/stock/replenish.php index d3c6406672c..71b076cea98 100644 --- a/htdocs/product/stock/replenish.php +++ b/htdocs/product/stock/replenish.php @@ -201,7 +201,7 @@ if ($action == 'order' && GETPOST('valid') && $user->hasRight('fournisseur', 'co // If we use multicurrency if (isModEnabled('multicurrency') && !empty($productsupplier->fourn_multicurrency_code) && $productsupplier->fourn_multicurrency_code != $conf->currency) { $line->multicurrency_code = $productsupplier->fourn_multicurrency_code; - $line->fk_multicurrency = $productsupplier->fourn_multicurrency_id; + $line->fk_multicurrency = (int) $productsupplier->fourn_multicurrency_id; $line->multicurrency_subprice = $productsupplier->fourn_multicurrency_unitprice; }