Fix phpcs
This commit is contained in:
parent
718105ff86
commit
2a87521da8
@ -426,7 +426,7 @@ if (empty($reshook))
|
|||||||
|
|
||||||
else if ($action == 'confirm_delete' && $confirm == 'yes' && $user->rights->reception->supprimer)
|
else if ($action == 'confirm_delete' && $confirm == 'yes' && $user->rights->reception->supprimer)
|
||||||
{
|
{
|
||||||
$result = $object->delete();
|
$result = $object->delete($user);
|
||||||
if ($result > 0)
|
if ($result > 0)
|
||||||
{
|
{
|
||||||
header("Location: ".DOL_URL_ROOT.'/reception/index.php');
|
header("Location: ".DOL_URL_ROOT.'/reception/index.php');
|
||||||
@ -567,7 +567,6 @@ if (empty($reshook))
|
|||||||
{
|
{
|
||||||
if ($lines[$i]->id == $line_id)
|
if ($lines[$i]->id == $line_id)
|
||||||
{
|
{
|
||||||
|
|
||||||
// delete single warehouse line
|
// delete single warehouse line
|
||||||
$line->id = $line_id;
|
$line->id = $line_id;
|
||||||
if (! $error && $line->delete($user) < 0)
|
if (! $error && $line->delete($user) < 0)
|
||||||
@ -1163,7 +1162,8 @@ if ($action == 'create')
|
|||||||
|
|
||||||
if (!empty($conf->productbatch->enabled))
|
if (!empty($conf->productbatch->enabled))
|
||||||
{
|
{
|
||||||
if( !empty($product->status_batch)){
|
if (!empty($product->status_batch))
|
||||||
|
{
|
||||||
print '<td><input name="batch'.$indiceAsked.'" value="'.$dispatchLines[$indiceAsked]['lot'].'"></td>';
|
print '<td><input name="batch'.$indiceAsked.'" value="'.$dispatchLines[$indiceAsked]['lot'].'"></td>';
|
||||||
print '<td>';
|
print '<td>';
|
||||||
print $form->select_date($dispatchLines[$indiceAsked]['DLC'],'dlc' . $indiceAsked, '', '', 1, "");
|
print $form->select_date($dispatchLines[$indiceAsked]['DLC'],'dlc' . $indiceAsked, '', '', 1, "");
|
||||||
@ -1171,9 +1171,9 @@ if ($action == 'create')
|
|||||||
print '<td>';
|
print '<td>';
|
||||||
print $form->select_date($dispatchLines[$indiceAsked]['DLUO'],'dluo' . $indiceAsked, '', '', 1, "");
|
print $form->select_date($dispatchLines[$indiceAsked]['DLUO'],'dluo' . $indiceAsked, '', '', 1, "");
|
||||||
print '</td>';
|
print '</td>';
|
||||||
}else {
|
}
|
||||||
|
else {
|
||||||
print '<td colspan="3"></td>';
|
print '<td colspan="3"></td>';
|
||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
print "</tr>\n";
|
print "</tr>\n";
|
||||||
@ -1624,19 +1624,17 @@ else if ($id || $ref)
|
|||||||
|
|
||||||
|
|
||||||
// Lines of products
|
// Lines of products
|
||||||
|
|
||||||
if ($action == 'editline')
|
if ($action == 'editline')
|
||||||
{
|
{
|
||||||
print ' <form name="updateline" id="updateline" action="' . $_SERVER["PHP_SELF"] . '?id=' . $object->id . '&lineid=' . $line_id . '" method="POST">
|
print '<form name="updateline" id="updateline" action="' . $_SERVER["PHP_SELF"] . '?id=' . $object->id . '&lineid=' . $line_id . '" method="POST">
|
||||||
<input type="hidden" name="token" value="' . $_SESSION ['newtoken'] . '">
|
<input type="hidden" name="token" value="' . $_SESSION ['newtoken'] . '">
|
||||||
<input type="hidden" name="action" value="updateline">
|
<input type="hidden" name="action" value="updateline">
|
||||||
<input type="hidden" name="mode" value="">
|
<input type="hidden" name="mode" value="">
|
||||||
<input type="hidden" name="id" value="' . $object->id . '">
|
<input type="hidden" name="id" value="' . $object->id . '">';
|
||||||
';
|
|
||||||
}
|
}
|
||||||
print '<br>';
|
print '<br>';
|
||||||
|
|
||||||
print '<div class="div-table-responsive-no-min">';
|
print '<div class="div-table-responsive-no-min">';
|
||||||
print '<table class="noborder" width="100%">';
|
print '<table class="noborder" width="100%">';
|
||||||
print '<tr class="liste_titre">';
|
print '<tr class="liste_titre">';
|
||||||
// #
|
// #
|
||||||
|
|||||||
@ -862,7 +862,8 @@ class Reception extends CommonObject
|
|||||||
/**
|
/**
|
||||||
* Delete reception.
|
* Delete reception.
|
||||||
*
|
*
|
||||||
* @return int >0 if OK, 0 if deletion done but failed to delete files, <0 if KO
|
* @param User $user Object user
|
||||||
|
* @return int >0 if OK, 0 if deletion done but failed to delete files, <0 if KO
|
||||||
*/
|
*/
|
||||||
function delete(User $user)
|
function delete(User $user)
|
||||||
{
|
{
|
||||||
@ -1012,7 +1013,6 @@ class Reception extends CommonObject
|
|||||||
$this->db->rollback();
|
$this->db->rollback();
|
||||||
return -1;
|
return -1;
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
|
// phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
|
||||||
@ -1129,6 +1129,7 @@ class Reception extends CommonObject
|
|||||||
return $this->LibStatut($this->statut,$mode);
|
return $this->LibStatut($this->statut,$mode);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
|
||||||
/**
|
/**
|
||||||
* Return label of a status
|
* Return label of a status
|
||||||
*
|
*
|
||||||
@ -1138,6 +1139,7 @@ class Reception extends CommonObject
|
|||||||
*/
|
*/
|
||||||
function LibStatut($statut,$mode)
|
function LibStatut($statut,$mode)
|
||||||
{
|
{
|
||||||
|
// phpcs:enable
|
||||||
global $langs;
|
global $langs;
|
||||||
|
|
||||||
if ($mode==0)
|
if ($mode==0)
|
||||||
@ -1846,8 +1848,8 @@ class Reception extends CommonObject
|
|||||||
if ($result < 0) {
|
if ($result < 0) {
|
||||||
$this->error = $mouvS->error;
|
$this->error = $mouvS->error;
|
||||||
$this->errors = $mouvS->errors;
|
$this->errors = $mouvS->errors;
|
||||||
$error++; break;
|
$error++;
|
||||||
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user