This commit is contained in:
Laurent Destailleur 2020-09-14 22:30:22 +02:00
parent 7712b277a6
commit 6dd1f522eb
3 changed files with 34 additions and 2 deletions

View File

@ -208,7 +208,10 @@ class FormFile
$out .= '<tr>';
if (!empty($options)) $out .= '<td>'.$options.'</td>';
$out .= '<td valign="middle" class="nowrap">';
$out .= '<input type="checkbox" '.$rename.' class="savingdocmask" name="savingdocmask" value="'.dol_escape_js($savingdocmask).'"> '.$langs->trans("SaveUploadedFileWithMask", preg_replace('/__file__/', $langs->transnoentitiesnoconv("OriginFileName"), $savingdocmask), $langs->transnoentitiesnoconv("OriginFileName"));
$out .= '<input type="checkbox" '.$rename.' class="savingdocmask" name="savingdocmask" value="'.dol_escape_js($savingdocmask).'"> ';
$out .= '<span class="opacitymedium">';
$out .= $langs->trans("SaveUploadedFileWithMask", preg_replace('/__file__/', $langs->transnoentitiesnoconv("OriginFileName"), $savingdocmask), $langs->transnoentitiesnoconv("OriginFileName"));
$out .= '</span>';
$out .= '</td>';
$out .= '</tr>';
}

View File

@ -349,7 +349,7 @@ if ($object->id > 0)
print '<a href="#" class="butAction">'.$langs->trans('UpdateByScaningLot').'</a>';
}*/
if ($conf->barcode->enabled || $conf->productbatch->enabled) {
print '<a href="#" class="butAction">'.$langs->trans("UpdateByScaning").'</a>';
print '<a href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=updatebyscaning" class="butAction">'.$langs->trans("UpdateByScaning").'</a>';
}
} else {
print '<a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->trans("NotEnoughPermissions")).'">'.$langs->trans('Save').'</a>'."\n";
@ -381,6 +381,17 @@ if ($object->id > 0)
print '</div>'."\n";
}
if ($action == 'updatebyscaning') {
print '<div class="div-for-modal">';
print 'TODO';
print '</div>';
}
print '<form method="POST" action="'.$_SERVER["PHP_SELF"].'">';
print '<input type="hidden" name="token" value="'.newToken().'">';
print '<input type="hidden" name="action" value="updateinventorylines">';

View File

@ -773,9 +773,15 @@ span.fa.fa-plus-circle.paddingleft {
#formuserfile {
margin-top: 4px;
}
#formuserfile input[type='file'] {
font-size: 1em;
}
#formuserfile_link {
margin-left: 1px;
}
#formuserfile_link input[type='text'] {
font-size: 1em;
}
.listofinvoicetype {
height: 28px;
vertical-align: middle;
@ -857,6 +863,18 @@ div.divsearchfield {
opacity: 0.6;
}
div.div-for-modal {
/* display: none; */
position:absolute;
top:calc(50% - 200px);
left:calc(50% - 250px);
width:500px; /* adjust as per your needs */
height:400px; /* adjust as per your needs */
background: #fff;
border: 1px solid #bbb;
box-shadow: 2px 2px 20px #ddd;
z-index: 100;
}
<?php
// Add a nowrap on smartphone, so long list of field used for filter are overflowed with clip