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

Clean code of extrafields

Browse Source
This commit is contained in:
Laurent Destailleur 2019-10-06 16:50:04 +02:00
parent d4bb6490e9
commit 1285f71ceb
2 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
htdocs/expedition/card.php
View File

@ -1031,8 +1031,7 @@ if ($action == 'create')
if (empty($reshook)) { if (empty($reshook)) {
// copy from order // copy from order
$orderExtrafields = new Extrafields($db); $extrafields->fetch_name_optionals_label($object->table_element);
$orderExtrafieldLabels = $orderExtrafields->fetch_name_optionals_label($object->table_element);
if ($object->fetch_optionals() > 0) { if ($object->fetch_optionals() > 0) {
$expe->array_options = array_merge($expe->array_options, $object->array_options); $expe->array_options = array_merge($expe->array_options, $object->array_options);
} }
@ -1576,13 +1575,16 @@ if ($action == 'create')
{ {
//var_dump($line); //var_dump($line);
$colspan=5; $colspan=5;
$extrafields->fetch_name_optionals_label($object->table_element_line); $extrafields->fetch_name_optionals_label($expe->table_element_line);
$expLine = new ExpeditionLigne($db);
$srcLine = new OrderLine($db); $srcLine = new OrderLine($db);
$extrafields->fetch_name_optionals_label($srcLine->table_element);
$srcLine->fetch_optionals($line->id); // fetch extrafields also available in orderline $srcLine->fetch_optionals($line->id); // fetch extrafields also available in orderline
//$line->fetch_optionals($line->id); //$line->fetch_optionals($line->id);
$line->array_options = array_merge($line->array_options, $srcLine->array_options); $line->array_options = array_merge($line->array_options, $srcLine->array_options);
print $line->showOptionals($extrafields, 'edit', array('style'=>'class="drag drop oddeven"','colspan'=>$colspan), $indiceAsked, '', empty($conf->global->MAIN_EXTRAFIELDS_IN_ONE_TD)?0:1); print $expLine->showOptionals($extrafields, 'edit', array('style'=>'class="drag drop oddeven"', 'colspan'=>$colspan), $indiceAsked, '', empty($conf->global->MAIN_EXTRAFIELDS_IN_ONE_TD)?0:1);
} }
} }
@ -2256,8 +2258,8 @@ elseif ($id || $ref)
} }
} }
} }
print '</td>';
} }
print '</td>';
if ($action == 'editline' && $lines[$i]->id == $line_id) if ($action == 'editline' && $lines[$i]->id == $line_id)
{ {
@ -2425,8 +2427,9 @@ elseif ($id || $ref)
print '<td class="center" colspan="2" valign="middle">'; print '<td class="center" colspan="2" valign="middle">';
print '<input type="submit" class="button" id="savelinebutton" name="save" value="' . $langs->trans("Save") . '"><br>'; print '<input type="submit" class="button" id="savelinebutton" name="save" value="' . $langs->trans("Save") . '"><br>';
print '<input type="submit" class="button" id="cancellinebutton" name="cancel" value="' . $langs->trans("Cancel") . '"><br>'; print '<input type="submit" class="button" id="cancellinebutton" name="cancel" value="' . $langs->trans("Cancel") . '"><br>';
print '</td>';
} }
elseif ($object->statut == 0) elseif ($object->statut == Expedition::STATUS_DRAFT)
{ {
// edit-delete buttons // edit-delete buttons
print '<td class="linecoledit center">'; print '<td class="linecoledit center">';
@ -2448,7 +2451,10 @@ elseif ($id || $ref)
// Display lines extrafields // Display lines extrafields
if (! empty($extrafields)) { if (! empty($extrafields)) {
$colspan= empty($conf->productbatch->enabled) ? 5 : 6; $colspan=6;
if ($origin && $origin_id > 0) $colspan++;
if (! empty($conf->productbatch->enabled)) $colspan++;
if (! empty($conf->stock->enabled)) $colspan++;
$lines[$i]->fetch_optionals($lines[$i]->id); $lines[$i]->fetch_optionals($lines[$i]->id);

3
htdocs/expedition/shipment.php
View File

@ -537,6 +537,9 @@ if ($id > 0 || ! empty($ref))
print '</td></tr>'; print '</td></tr>';
} }
$expe = new Expedition($db);
$extrafields->fetch_name_optionals_label($expe->table_element);
// Other attributes // Other attributes
$cols = 2; $cols = 2;
include DOL_DOCUMENT_ROOT . '/core/tpl/extrafields_view.tpl.php'; include DOL_DOCUMENT_ROOT . '/core/tpl/extrafields_view.tpl.php';