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/core/modules/contract/doc/pdf_strato.modules.php
	htdocs/ticket/card.php
This commit is contained in:
Laurent Destailleur 2021-01-21 18:34:55 +01:00
commit 7982cab526
2 changed files with 14 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
htdocs/core/modules/contract/doc/pdf_strato.modules.php
View File

@ -340,13 +340,12 @@ class pdf_strato extends ModelePDFContract
$datere = $langs->trans("Unknown"); $datere = $langs->trans("Unknown");
} }
$txtpredefinedservice = ''; $txtpredefinedservice = $objectligne->product_ref;
$txtpredefinedservice = $objectligne->product_label; if ($objectligne->product_label)
if ($objectligne->product_label) {
{ $txtpredefinedservice .= ' - ';
$txtpredefinedservice .= ' - '; $txtpredefinedservice .= $objectligne->product_label;
$txtpredefinedservice .= $objectligne->product_label; }
}
$desc = dol_htmlentitiesbr($objectligne->desc, 1); // Desc (not empty for free lines) $desc = dol_htmlentitiesbr($objectligne->desc, 1); // Desc (not empty for free lines)
$txt = ''; $txt = '';

16
htdocs/ticket/card.php
View File

@ -586,16 +586,16 @@ if (empty($reshook)) {
if (!$error) { if (!$error) {
$result = $object->insertExtraFields(empty($triggermodname) ? '' : $triggermodname, $user); $result = $object->insertExtraFields(empty($triggermodname) ? '' : $triggermodname, $user);
if ($result > 0) { if ($result < 0) { $error++; }
setEventMessages($langs->trans('RecordSaved'), null, 'mesgs');
$action = 'view';
} else {
$error++;
setEventMessages($object->error, $object->errors, 'errors');
}
} }
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) { if ($action == "change_property" && GETPOST('btn_update_ticket_prop', 'alpha') && $user->rights->ticket->write) {