Merge branch 'NEW/integration_GPEC_code' of github.com:atm-gauthier/dolibarr into NEW/integration_GPEC_code

This commit is contained in:
Gauthier PC portable 024 2021-09-29 08:35:21 +02:00
commit 92ae884331
5 changed files with 111 additions and 115 deletions

View File

@ -72,11 +72,9 @@ $coldisplay = 0;
<td class="linecollabel"><?php $coldisplay++; ?><div id="line_<?php print $line->id; ?>"></div> <td class="linecollabel"><?php $coldisplay++; ?><div id="line_<?php print $line->id; ?>"></div>
<?php <?php
if ($line->fk_skill > 0) { if ($line->fk_skill > 0) {
$skill = new Skill($this->db); $skill = new Skill($this->db);
$resSkill = $skill->fetch($line->fk_skill); $resSkill = $skill->fetch($line->fk_skill);
if ($resSkill > 0) print $skill->getNomUrl(1); if ($resSkill > 0) print $skill->getNomUrl(1);
} }
?> ?>
</td> </td>

View File

@ -80,8 +80,6 @@ $permission = $user->rights->ecm->setup;
if (!empty($object->table_element_line)) { if (!empty($object->table_element_line)) {
// Show object lines // Show object lines
$result = $object->getLinesArray(); $result = $object->getLinesArray();
} }