Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into 17.0
This commit is contained in:
commit
c4317728db
2 changed files with 1 additions and 6 deletions
|
|
@ -332,7 +332,7 @@ if ($id > 0 && !preg_match('/^add/i', $action)) {
|
|||
|
||||
// Remove
|
||||
if ($permissiontodelete && $action != 'edit') {
|
||||
print '<a class="butActionDelete" href="list.php?bid='.$object->id.'&action=delete&token='.newToken().'">'.$langs->trans("Delete").'</a>'."\n";
|
||||
print '<a class="butActionDelete" href="list.php?id='.$object->id.'&action=delete&token='.newToken().'">'.$langs->trans("Delete").'</a>'."\n";
|
||||
}
|
||||
|
||||
print '</div>';
|
||||
|
|
|
|||
|
|
@ -660,11 +660,6 @@ class Contracts extends DolibarrApi
|
|||
$object = parent::_cleanObjectDatas($object);
|
||||
|
||||
unset($object->address);
|
||||
|
||||
unset($object->date_start);
|
||||
unset($object->date_start_real);
|
||||
unset($object->date_end);
|
||||
unset($object->date_end_real);
|
||||
unset($object->civility_id);
|
||||
|
||||
return $object;
|
||||
|
|
|
|||
Loading…
Reference in a new issue