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

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

Browse Source
This commit is contained in:
Laurent Destailleur 2022-06-09 13:03:21 +02:00
commit 4f3806ed70
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
htdocs/projet/tasks/time.php
View File

@ -246,7 +246,8 @@ if (($action == 'updateline' || $action == 'updatesplitline') && !$cancel && $us
if (!$error) { if (!$error) {
if (GETPOST('taskid', 'int') != $id) { // GETPOST('taskid') is id of new task if (GETPOST('taskid', 'int') != $id) { // GETPOST('taskid') is id of new task
$id = GETPOST('taskid', 'int'); $id_temp = GETPOST('taskid', 'int'); // should not overwrite $id
$object->fetchTimeSpent(GETPOST('lineid', 'int')); $object->fetchTimeSpent(GETPOST('lineid', 'int'));
@ -255,7 +256,7 @@ if (($action == 'updateline' || $action == 'updatesplitline') && !$cancel && $us
$result = $object->delTimeSpent($user); $result = $object->delTimeSpent($user);
} }
$object->fetch($id, $ref); $object->fetch($id_temp, $ref);
$object->timespent_note = GETPOST("timespent_note_line", 'alpha'); $object->timespent_note = GETPOST("timespent_note_line", 'alpha');
$object->timespent_old_duration = GETPOST("old_duration"); $object->timespent_old_duration = GETPOST("old_duration");

2
htdocs/societe/card.php
View File

@ -2672,7 +2672,9 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
print dol_print_profids($object->$key, 'ProfId'.$i, $object->country_code, 1); print dol_print_profids($object->$key, 'ProfId'.$i, $object->country_code, 1);
if ($object->$key) { if ($object->$key) {
if ($object->id_prof_check($i, $object) > 0) { if ($object->id_prof_check($i, $object) > 0) {
if (!empty($object->id_prof_url($i, $object))) {
print '   '.$object->id_prof_url($i, $object); print '   '.$object->id_prof_url($i, $object);
}
} else { } else {
print ' <span class="error">('.$langs->trans("ErrorWrongValue").')</span>'; print ' <span class="error">('.$langs->trans("ErrorWrongValue").')</span>';
} }