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

FIX bad position of extrafields for interventions

Browse Source
This commit is contained in:
Laurent Destailleur 2022-02-25 20:36:40 +01:00
parent f8a5749fc4
commit 488049c6a6
3 changed files with 49 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/core/class/commonobject.class.php
View File

@ -7699,7 +7699,7 @@ abstract class CommonObject
if (empty($reshook)) { if (empty($reshook)) {
if (key_exists('label', $extrafields->attributes[$this->table_element]) && is_array($extrafields->attributes[$this->table_element]['label']) && count($extrafields->attributes[$this->table_element]['label']) > 0) { if (key_exists('label', $extrafields->attributes[$this->table_element]) && is_array($extrafields->attributes[$this->table_element]['label']) && count($extrafields->attributes[$this->table_element]['label']) > 0) {
$out .= "\n"; $out .= "\n";
$out .= '<!-- showOptionals --> '; $out .= '<!-- commonobject:showOptionals --> ';
$out .= "\n"; $out .= "\n";
$extrafields_collapse_num = ''; $extrafields_collapse_num = '';

2
htdocs/core/tpl/objectline_create.tpl.php
View File

@ -354,7 +354,7 @@ if ($nolinesbefore) {
} }
if (is_object($objectline)) { if (is_object($objectline)) {
$temps = $objectline->showOptionals($extrafields, 'create', array(), '', '', 1, 'line'); $temps = $objectline->showOptionals($extrafields, 'create', array(), '', '', 1, 'line');
;
if (!empty($temps)) { if (!empty($temps)) {
print '<div style="padding-top: 10px" id="extrafield_lines_area_create" name="extrafield_lines_area_create">'; print '<div style="padding-top: 10px" id="extrafield_lines_area_create" name="extrafield_lines_area_create">';
print $temps; print $temps;

72
htdocs/fichinter/card.php
View File

@ -1342,6 +1342,23 @@ if ($action == 'create') {
print '<a name="'.$objp->rowid.'"></a>'; // ancre pour retourner sur la ligne print '<a name="'.$objp->rowid.'"></a>'; // ancre pour retourner sur la ligne
print dol_htmlentitiesbr($objp->description); print dol_htmlentitiesbr($objp->description);
$objectline = new FichinterLigne($db);
$objectline->fetch($objp->rowid);
$objectline->fetch_optionals();
$extrafields->fetch_name_optionals_label($objectline->table_element);
if (!empty($extrafields)) {
$temps = $objectline->showOptionals($extrafields, 'view', array(), '', '', 1, 'line');
if (!empty($temps)) {
print '<div style="padding-top: 10px" id="extrafield_lines_area_'.$line->id.'" name="extrafield_lines_area_'.$line->id.'">';
print $temps;
print '</div>';
}
}
print '</td>';
// Date // Date
print '<td class="center" width="150">'.(empty($conf->global->FICHINTER_DATE_WITHOUT_HOUR) ?dol_print_date($db->jdate($objp->date_intervention), 'dayhour') : dol_print_date($db->jdate($objp->date_intervention), 'day')).'</td>'; print '<td class="center" width="150">'.(empty($conf->global->FICHINTER_DATE_WITHOUT_HOUR) ?dol_print_date($db->jdate($objp->date_intervention), 'dayhour') : dol_print_date($db->jdate($objp->date_intervention), 'day')).'</td>';
@ -1378,15 +1395,6 @@ if ($action == 'create') {
} }
print '</tr>'; print '</tr>';
$line = new FichinterLigne($db);
$line->fetch($objp->rowid);
$extrafields->fetch_name_optionals_label($line->table_element);
$line->fetch_optionals();
print $line->showOptionals($extrafields, 'view', array('colspan'=>5));
} }
// Line in update mode // Line in update mode
@ -1405,6 +1413,22 @@ if ($action == 'create') {
require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php'; require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
$doleditor = new DolEditor('np_desc', $objp->description, '', 164, 'dolibarr_details', '', false, true, $conf->global->FCKEDITOR_ENABLE_DETAILS, ROWS_2, '90%'); $doleditor = new DolEditor('np_desc', $objp->description, '', 164, 'dolibarr_details', '', false, true, $conf->global->FCKEDITOR_ENABLE_DETAILS, ROWS_2, '90%');
$doleditor->Create(); $doleditor->Create();
$objectline = new FichinterLigne($db);
$objectline->fetch($objp->rowid);
$objectline->fetch_optionals();
$extrafields->fetch_name_optionals_label($objectline->table_element);
if (!empty($extrafields)) {
$temps = $objectline->showOptionals($extrafields, 'edit', array(), '', '', 1, 'line');
if (!empty($temps)) {
print '<div style="padding-top: 10px" id="extrafield_lines_area_'.$line->id.'" name="extrafield_lines_area_'.$line->id.'">';
print $temps;
print '</div>';
}
}
print '</td>'; print '</td>';
// Date d'intervention // Date d'intervention
@ -1431,14 +1455,6 @@ if ($action == 'create') {
print '<input type="submit" class="button buttongen marginbottomonly button-save" name="save" value="'.$langs->trans("Save").'">'; print '<input type="submit" class="button buttongen marginbottomonly button-save" name="save" value="'.$langs->trans("Save").'">';
print '<input type="submit" class="button buttongen marginbottomonly button-cancel" name="cancel" value="'.$langs->trans("Cancel").'"></td>'; print '<input type="submit" class="button buttongen marginbottomonly button-cancel" name="cancel" value="'.$langs->trans("Cancel").'"></td>';
print '</tr>'."\n"; print '</tr>'."\n";
$line = new FichinterLigne($db);
$line->fetch($objp->rowid);
$extrafields->fetch_name_optionals_label($line->table_element);
$line->fetch_optionals();
print $line->showOptionals($extrafields, 'edit', array('colspan'=>5));
} }
$i++; $i++;
@ -1481,6 +1497,20 @@ if ($action == 'create') {
$doleditor = new DolEditor('np_desc', GETPOST('np_desc', 'restricthtml'), '', 100, 'dolibarr_details', '', false, true, $conf->global->FCKEDITOR_ENABLE_DETAILS, ROWS_2, '90%'); $doleditor = new DolEditor('np_desc', GETPOST('np_desc', 'restricthtml'), '', 100, 'dolibarr_details', '', false, true, $conf->global->FCKEDITOR_ENABLE_DETAILS, ROWS_2, '90%');
$doleditor->Create(); $doleditor->Create();
} }
$objectline = new FichinterLigne($db);
$extrafields->fetch_name_optionals_label($objectline->table_element);
if (is_object($objectline)) {
$temps = $objectline->showOptionals($extrafields, 'create', array(), '', '', 1, 'line');
if (!empty($temps)) {
print '<div style="padding-top: 10px" id="extrafield_lines_area_create" name="extrafield_lines_area_create">';
print $temps;
print '</div>';
}
}
print '</td>'; print '</td>';
// Date intervention // Date intervention
@ -1513,14 +1543,6 @@ if ($action == 'create') {
print '<td class="center" valign="middle" colspan="3"><input type="submit" class="button button-add" value="'.$langs->trans('Add').'" name="addline"></td>'; print '<td class="center" valign="middle" colspan="3"><input type="submit" class="button button-add" value="'.$langs->trans('Add').'" name="addline"></td>';
print '</tr>'; print '</tr>';
//Line extrafield
$lineadd = new FichinterLigne($db);
$extrafields->fetch_name_optionals_label($lineadd->table_element);
print $lineadd->showOptionals($extrafields, 'edit', array('colspan'=>5));
if (!$num) { if (!$num) {
print '</table>'; print '</table>';
} }