diff --git a/htdocs/core/modules/contract/doc/pdf_strato.modules.php b/htdocs/core/modules/contract/doc/pdf_strato.modules.php index e28cd62efae..2b9fb62b1d4 100644 --- a/htdocs/core/modules/contract/doc/pdf_strato.modules.php +++ b/htdocs/core/modules/contract/doc/pdf_strato.modules.php @@ -340,13 +340,12 @@ class pdf_strato extends ModelePDFContract $datere = $langs->trans("Unknown"); } - $txtpredefinedservice = ''; - $txtpredefinedservice = $objectligne->product_label; - if ($objectligne->product_label) - { - $txtpredefinedservice .= ' - '; - $txtpredefinedservice .= $objectligne->product_label; - } + $txtpredefinedservice = $objectligne->product_ref; + if ($objectligne->product_label) + { + $txtpredefinedservice .= ' - '; + $txtpredefinedservice .= $objectligne->product_label; + } $desc = dol_htmlentitiesbr($objectligne->desc, 1); // Desc (not empty for free lines) $txt = ''; diff --git a/htdocs/ticket/card.php b/htdocs/ticket/card.php index 84bec78bf30..d4185e7dbc6 100644 --- a/htdocs/ticket/card.php +++ b/htdocs/ticket/card.php @@ -586,16 +586,16 @@ if (empty($reshook)) { if (!$error) { $result = $object->insertExtraFields(empty($triggermodname) ? '' : $triggermodname, $user); - if ($result > 0) { - setEventMessages($langs->trans('RecordSaved'), null, 'mesgs'); - $action = 'view'; - } else { - $error++; - setEventMessages($object->error, $object->errors, 'errors'); - } + if ($result < 0) { $error++; } } - if ($error) $action = 'edit_extras'; + if ($error) { + setEventMessages($object->error, $object->errors, 'errors'); + $action = 'edit_extras'; + } else { + setEventMessages($langs->trans('RecordSaved'), null, 'mesgs'); + $action = 'view'; + } } if ($action == "change_property" && GETPOST('btn_update_ticket_prop', 'alpha') && $user->rights->ticket->write) {