Mirrors/dolibarr
1
0
Fork 0
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-02-20 13:46:52 +01:00
Code Issues Packages Projects Releases Wiki Activity

NEW : "+" and "-" to show / hide batch details on product "stock" tab

Browse Source
This commit is contained in:
Gauthier PC portable 024 2021-04-19 14:34:11 +02:00
parent 60990dc0e6
commit 894eb1e5a4
4 changed files with 71 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
htdocs/admin/stock.php
View File

@ -758,6 +758,21 @@ if ($conf->use_javascript_ajax) {
}
print "</td>\n";
print "</tr>\n";
if (!empty($conf->productbatch->enabled)) {
print '<tr class="oddeven">';
print '<td>' . $langs->trans("ShowAllBatchByDefault") . '</td>';
print '<td class="right">';
if ($conf->use_javascript_ajax) {
print ajax_constantonoff('STOCK_SHOW_ALL_BATCH_BY_DEFAULT');
} else {
$arrval = array('0' => $langs->trans("No"), '1' => $langs->trans("Yes"));
print $form->selectarray("STOCK_SHOW_ALL_BATCH_BY_DEFAULT", $arrval, $conf->global->STOCK_SHOW_ALL_BATCH_BY_DEFAULT);
}
print "</td>\n";
print "</tr>\n";
}
print '</table>';
print '</form>';

3
htdocs/langs/en_US/stocks.lang
View File

@ -240,4 +240,5 @@ InventoryRealQtyHelp=Set value to 0 to reset qty<br>Keep field empty, or remove
UpdateByScaning=Update by scaning
UpdateByScaningProductBarcode=Update by scan (product barcode)
UpdateByScaningLot=Update by scan (lot|serial barcode)
DisableStockChangeOfSubProduct=Deactivate the stock change for all the subproducts of this Kit during this movement.
DisableStockChangeOfSubProduct=Deactivate the stock change for all the subproducts of this Kit during this movement.
ShowAllBatchByDefault=By default, show batch details on product "stock" tab

1
htdocs/langs/fr_FR/stocks.lang
View File

@ -242,3 +242,4 @@ UpdateByScaning=Mise à jour par scan
UpdateByScaningProductBarcode=Mettre à jour par scan (code-barres produit)
UpdateByScaningLot=Mise à jour par scan (code barres lot/série)
DisableStockChangeOfSubProduct=Désactiver les mouvements de stock des composants pour tout mouvement de stock de ce kit
ShowAllBatchByDefault=Dérouler par défaut le détail des lots dans l'onglet "stock"

56
htdocs/product/stock/product.php
View File

@ -9,6 +9,7 @@
* Copyright (C) 2014-2015 Cédric Gross <c.gross@kreiz-it.fr>
* Copyright (C) 2015 Marcos García <marcosgdf@gmail.com>
* Copyright (C) 2018-2019 Frédéric France <frederic.france@netlogic.fr>
* Copyright (C) 2021 Gauthier VERDOL <gauthier.verdol@atm-consulting.fr>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@ -522,6 +523,48 @@ if ($id > 0 || $ref)
llxHeader('', $title, $helpurl);
?>
<script type="text/javascript" language="javascript">
$(document).ready(function() {
$(".collapse_batch").click(function() {
var id_entrepot = $(this).attr('id').replace('ent', '');
if($(this).text().indexOf('+') > 0) {
$(".batch_warehouse" + id_entrepot).show();
$(this).html('(-)&nbsp;');
}
else {
$(".batch_warehouse" + id_entrepot).hide();
$(this).html('(+)&nbsp;');
}
return false;
});
$("#show_all").click(function() {
$(this).hide();
$("#hide_all").show();
$("[class^=batch_warehouse]").show();
$("[class^=collapse_batch]").html('(-)&nbsp;');
return false;
});
$("#hide_all").click(function() {
$("[class^=batch_warehouse]").hide();
$(this).hide();
$("#show_all").show();
$("[class^=collapse_batch]").html('(+)&nbsp;');
return false;
});
});
</script>
<?php
if ($result > 0)
{
$head = product_prepare_head($object);
@ -828,7 +871,10 @@ if (!$variants) {
print '</tr>';
if ((!empty($conf->productbatch->enabled)) && $object->hasbatch()) {
$colspan = 3;
print '<tr class="liste_titre"><td width="10%"></td>';
print '<tr class="liste_titre"><td width="14%">';
print '<a style="display:'.(!empty($conf->global->STOCK_SHOW_ALL_BATCH_BY_DEFAULT) ? 'visible' : 'none').';" id="hide_all" href="#">'.img_picto('', 'folder', 'class="paddingright"').$langs->trans("UndoExpandAll").'</a>';
print '<a style="display:'.(!empty($conf->global->STOCK_SHOW_ALL_BATCH_BY_DEFAULT) ? 'none' : 'visible').';" id="show_all" href="#">'.img_picto('', 'folder-open', 'class="paddingright"').$langs->trans("ExpandAll").'</a>';
print '</td>';
print '<td class="right" width="10%">'.$langs->trans("batch_number").'</td>';
if (empty($conf->global->PRODUCT_DISABLE_EATBY)) {
$colspan--;
@ -880,7 +926,11 @@ if (!$variants) {
$stock_real = price2num($obj->reel, 'MS');
print '<tr class="oddeven">';
print '<td colspan="4">'.$entrepotstatic->getNomUrl(1).'</td>';
print '<td colspan="4">';
if(!empty($conf->productbatch->enabled)) {
print '<a class="collapse_batch" id="ent' . $entrepotstatic->id . '" href="#">' . (empty($conf->global->STOCK_SHOW_ALL_BATCH_BY_DEFAULT) ? '(+)' : '(-)') . '&nbsp;</a>';
}
print $entrepotstatic->getNomUrl(1).'</td>';
print '<td class="right">'.$stock_real.($stock_real < 0 ? ' '.img_warning() : '').'</td>';
// PMP
print '<td class="right">'.(price2num($object->pmp) ? price2num($object->pmp, 'MU') : '').'</td>';
@ -934,7 +984,7 @@ if (!$variants) {
print '</form>';
print '</td></tr>';
} else {
print "\n".'<tr><td class="right">';
print "\n".'<tr style="display:'.(empty($conf->global->STOCK_SHOW_ALL_BATCH_BY_DEFAULT) ? 'none' : 'visible').';" class="batch_warehouse'.$entrepotstatic->id.'"><td class="right">';
print img_picto($langs->trans("Tranfer"), 'uparrow', 'class="hideonsmartphone"').' ';
print '<a href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;id_entrepot='.$entrepotstatic->id.'&amp;action=transfert&amp;pdluoid='.$pdluo->id.'">'.$langs->trans("TransferStock").'</a>';
// Disabled, because edition of stock content must use the "Correct stock menu".