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

Fix update extrafield

Browse Source
This commit is contained in:
fappels 2017-10-24 10:53:11 +02:00
parent b2cd2290e1
commit ba189277ee
1 changed files with 20 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
htdocs/expedition/card.php
View File

@ -621,6 +621,7 @@ if (empty($reshook))
{ {
$error++; $error++;
} }
unset($_POST["lineid".$details_entrepot->line_id]);
} }
} }
else if ($lines[$i] == $line_id) else if ($lines[$i] == $line_id)
@ -631,6 +632,7 @@ if (empty($reshook))
{ {
$error++; $error++;
} }
unset($_POST["lineid"]);
} }
} }
@ -663,7 +665,16 @@ if (empty($reshook))
{ {
// line to update // line to update
$line = new ExpeditionLigne($db); $line = new ExpeditionLigne($db);
// Extrafields Lines
$extrafieldsline = new ExtraFields($db);
$extralabelsline = $extrafieldsline->fetch_name_optionals_label($object->table_element_line);
$line->array_options = $extrafieldsline->getOptionalsFromPost($extralabelsline);
// Unset extrafield POST Data
if (is_array($extralabelsline)) {
foreach ($extralabelsline as $key => $value) {
unset($_POST["options_" . $key]);
}
}
$line->fk_product = $lines[$i]->fk_product; $line->fk_product = $lines[$i]->fk_product;
if (is_array($lines[$i]->detail_batch) && count($lines[$i]->detail_batch) > 0) if (is_array($lines[$i]->detail_batch) && count($lines[$i]->detail_batch) > 0)
{ {
@ -695,6 +706,8 @@ if (empty($reshook))
$error++; $error++;
} }
} }
unset($_POST[$batch]);
unset($_POST[$qty]);
} }
} }
else else
@ -712,6 +725,8 @@ if (empty($reshook))
setEventMessages($line->error, $line->errors, 'errors'); setEventMessages($line->error, $line->errors, 'errors');
$error++; $error++;
} }
unset($_POST[$stockLocation]);
unset($_POST[$qty]);
} }
else if (count($lines[$i]->details_entrepot) > 1) else if (count($lines[$i]->details_entrepot) > 1)
{ {
@ -732,6 +747,8 @@ if (empty($reshook))
$error++; $error++;
} }
} }
unset($_POST[$stockLocation]);
unset($_POST[$qty]);
} }
} }
} }
@ -739,16 +756,7 @@ if (empty($reshook))
} }
} }
// Extrafields Lines unset($_POST["lineid"]);
$extrafieldsline = new ExtraFields($db);
$extralabelsline = $extrafieldsline->fetch_name_optionals_label($object->table_element_line);
$array_options = $extrafieldsline->getOptionalsFromPost($extralabelsline);
// Unset extrafield POST Data
if (is_array($extralabelsline)) {
foreach ($extralabelsline as $key => $value) {
unset($_POST["options_" . $key]);
}
}
if (! $error) { if (! $error) {
if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) { if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) {
@ -2296,7 +2304,7 @@ else if ($id || $ref)
$line = new ExpeditionLigne($db); $line = new ExpeditionLigne($db);
$line->fetch_optionals($lines[$i]->id,$extralabelslines); $line->fetch_optionals($lines[$i]->id,$extralabelslines);
print '<tr class="oddeven">'; print '<tr class="oddeven">';
if ($lines[$i]->id == $line_id) if ($action == 'editline' && $lines[$i]->id == $line_id)
{ {
print $line->showOptionals($extrafieldsline, 'edit', array('style'=>$bc[$var], 'colspan'=>$colspan),$indiceAsked); print $line->showOptionals($extrafieldsline, 'edit', array('style'=>$bc[$var], 'colspan'=>$colspan),$indiceAsked);
} }