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

fix not working unlink

Browse Source
This commit is contained in:
Tobias Sekan 2020-03-06 11:33:42 +01:00 committed by GitHub
parent 3e58cc4c02
commit acd7366d64
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 17 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
htdocs/projet/element.php
View File

@ -925,13 +925,15 @@ foreach ($listofreferent as $key => $value)
for ($i = 0; $i < $num; $i++) for ($i = 0; $i < $num; $i++)
{ {
$tablerow = new TableRow(); $tablerow = new TableRow();
$tmp = explode('_', $elementarray[$i]); $tmp = explode('_', $elementarray[$i]);
$idofelement = $tmp[0]; $idofelement = $tmp[0];
$idofelementuser = $tmp[1]; $idofelementuser = $tmp[1];
$element->fetch($idofelement); $element->fetch($idofelement);
if ($idofelementuser) $elementuser->fetch($idofelementuser); if ($idofelementuser) $elementuser->fetch($idofelementuser);
// Special cases // Special cases
if ($tablename != 'expensereport_det') if ($tablename != 'expensereport_det')
{ {
@ -942,26 +944,29 @@ foreach ($listofreferent as $key => $value)
$expensereport = new ExpenseReport($db); $expensereport = new ExpenseReport($db);
$expensereport->fetch($element->fk_expensereport); $expensereport->fetch($element->fk_expensereport);
} }
//print 'xxx'.$tablename.'yyy'.$classname; //print 'xxx'.$tablename.'yyy'.$classname;
if ($breakline && $saved_third_id != $element->thirdparty->id) if ($breakline && $saved_third_id != $element->thirdparty->id)
{ {
print $breakline; print $breakline;
$saved_third_id = $element->thirdparty->id; $saved_third_id = $element->thirdparty->id;
$breakline = ''; $breakline = '';
$total_ht_by_third = 0; $total_ht_by_third = 0;
$total_ttc_by_third = 0; $total_ttc_by_third = 0;
} }
$saved_third_id = $element->thirdparty->id; $saved_third_id = $element->thirdparty->id;
$qualifiedfortotal = true; $qualifiedfortotal = true;
if ($key == 'invoice') if ($key == 'invoice')
{ {
if (!empty($element->close_code) && $element->close_code == 'replaced') $qualifiedfortotal = false; // Replacement invoice, do not include into total if (!empty($element->close_code) && $element->close_code == 'replaced') $qualifiedfortotal = false; // Replacement invoice, do not include into total
} }
// Unlink - save id of the element, need for the "unlink" action
$tablerow->id = $element->id;
// Ref // Ref
if ($tablename == 'expensereport_det') if ($tablename == 'expensereport_det')
@ -1308,7 +1313,7 @@ foreach ($listofreferent as $key => $value)
{ {
if (empty($conf->global->PROJECT_DISABLE_UNLINK_FROM_OVERVIEW) || $user->admin) // PROJECT_DISABLE_UNLINK_FROM_OVERVIEW is empty by defaut, so this test true if (empty($conf->global->PROJECT_DISABLE_UNLINK_FROM_OVERVIEW) || $user->admin) // PROJECT_DISABLE_UNLINK_FROM_OVERVIEW is empty by defaut, so this test true
{ {
print '<a href="' . $_SERVER["PHP_SELF"] . '?id=' . $object->id . '&action=unlink&tablename=' . $tablename . '&elementselect=' . $element->id . ($project_field ? '&projectfield=' . $project_field : '') . '" class="reposition">'; print '<a href="' . $_SERVER["PHP_SELF"] . '?id=' . $object->id . '&action=unlink&tablename=' . $tablename . '&elementselect=' . $tablerow->id . ($project_field ? '&projectfield=' . $project_field : '') . '" class="reposition">';
print img_picto($langs->trans('Unlink'), 'unlink'); print img_picto($langs->trans('Unlink'), 'unlink');
print '</a>'; print '</a>';
} }
@ -1505,6 +1510,11 @@ function sort_by_user_desc($left, $right)
*/ */
class TableRow class TableRow
{ {
/**
* The id of this project (need for "unlink" action)
*/
var $id;
/** /**
* The reference of this object (only for sorting) * The reference of this object (only for sorting)
*/ */