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

Merge pull request #21660 from Hystepik/develop#2

Browse Source 
Fix : regretion on stockmovement
This commit is contained in:
Laurent Destailleur 2022-08-10 04:40:07 +02:00 committed by GitHub
commit 528c853b49
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/product/class/product.class.php
View File

@ -5049,7 +5049,7 @@ class Product extends CommonObject
$result .= (img_object(($notooltip ? '' : $label), 'service', ($notooltip ? 'class="paddingright"' : 'class="paddingright classfortooltip"'), 0, 0, $notooltip ? 0 : 1)); $result .= (img_object(($notooltip ? '' : $label), 'service', ($notooltip ? 'class="paddingright"' : 'class="paddingright classfortooltip"'), 0, 0, $notooltip ? 0 : 1));
} }
} }
$result .= $newref; $result .= dol_escape_htmltag($newref);
$result .= $linkend; $result .= $linkend;
if ($withpicto != 2) { if ($withpicto != 2) {
$result .= (($add_label && $this->label) ? $sep.dol_trunc($this->label, ($add_label > 1 ? $add_label : 0)) : ''); $result .= (($add_label && $this->label) ? $sep.dol_trunc($this->label, ($add_label > 1 ? $add_label : 0)) : '');

20
htdocs/product/stock/massstockmove.php
View File

@ -336,11 +336,11 @@ if ($action == 'importCSV' && !empty($user->rights->stock->mouvement->creer)) {
continue; continue;
} }
//var_dump($data); //var_dump($data);
$tmp_id_sw = (int) $data[$i][0]['val']; $tmp_id_sw = $data[$i][0]['val'];
$tmp_id_tw = (int) $data[$i][1]['val']; $tmp_id_tw = $data[$i][1]['val'];
$tmp_id_product = (int) $data[$i][2]['val']; $tmp_id_product = $data[$i][2]['val'];
$tmp_qty = price2num((float) $data[$i][3]['val'], 'MS'); $tmp_qty = $data[$i][3]['val'];
$tmp_batch = dol_escape_htmltag($data[$i][4]['val']); $tmp_batch = $data[$i][4]['val'];
if (!is_numeric($tmp_id_product)) { if (!is_numeric($tmp_id_product)) {
$result = fetchref($productstatic, $tmp_id_product); $result = fetchref($productstatic, $tmp_id_product);
@ -604,11 +604,11 @@ print '</td>';
if (isModEnabled('productbatch')) { if (isModEnabled('productbatch')) {
print '<td>'; print '<td>';
print img_picto($langs->trans("LotSerial"), 'lot', 'class="paddingright"'); print img_picto($langs->trans("LotSerial"), 'lot', 'class="paddingright"');
print '<input type="text" name="batch" class="flat maxwidth50" value="'.$batch.'">'; print '<input type="text" name="batch" class="flat maxwidth50" value="'.dol_escape_htmltag($batch).'">';
print '</td>'; print '</td>';
} }
// Qty // Qty
print '<td class="center"><input type="text" class="flat maxwidth50" name="qty" value="'.$qty.'"></td>'; print '<td class="center"><input type="text" class="flat maxwidth50" name="qty" value="'.price2num((float) $qty, 'MS').'"></td>';
// Button to add line // Button to add line
print '<td class="right"><input type="submit" class="button" name="addline" value="'.dol_escape_htmltag($titletoadd).'"></td>'; print '<td class="right"><input type="submit" class="button" name="addline" value="'.dol_escape_htmltag($titletoadd).'"></td>';
@ -641,14 +641,14 @@ foreach ($listofdata as $key => $val) {
print $warehousestatict->getNomUrl(1); print $warehousestatict->getNomUrl(1);
print '</td>'; print '</td>';
print '<td>'; print '<td>';
print $productstatic->getNomUrl(1).' - '.$productstatic->label; print $productstatic->getNomUrl(1).' - '.dol_escape_htmltag($productstatic->label);
print '</td>'; print '</td>';
if (isModEnabled('productbatch')) { if (isModEnabled('productbatch')) {
print '<td>'; print '<td>';
print $val['batch']; print dol_escape_htmltag($val['batch']);
print '</td>'; print '</td>';
} }
print '<td class="center">'.$val['qty'].'</td>'; print '<td class="center">'.price2num((float) $val['qty'], 'MS').'</td>';
print '<td class="right"><a href="'.$_SERVER["PHP_SELF"].'?action=delline&token='.newToken().'&idline='.$val['id'].'">'.img_delete($langs->trans("Remove")).'</a></td>'; print '<td class="right"><a href="'.$_SERVER["PHP_SELF"].'?action=delline&token='.newToken().'&idline='.$val['id'].'">'.img_delete($langs->trans("Remove")).'</a></td>';
print '</tr>'; print '</tr>';
} }