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

Merge branch '13.0_new_collapse_batch_detail' of github.com:atm-gauthier/dolibarr into develop_new_collapse_batch_detail

Browse Source
This commit is contained in:
Gauthier PC portable 024 2021-04-20 10:03:20 +02:00
commit 70f739b332
3 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -256,3 +256,4 @@ ObjectNotFound=%s not found
MakeMovementsAndClose=Generate movements and close MakeMovementsAndClose=Generate movements and close
AutofillWithExpected=Fill real quantity with expected quantity AutofillWithExpected=Fill real quantity with expected quantity
ShowAllBatchByDefault=By default, show batch details on product "stock" tab ShowAllBatchByDefault=By default, show batch details on product "stock" tab
CollapseBatchDetailHelp=You can set batch detail default display in stocks module configuration

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

@ -256,3 +256,4 @@ ObjectNotFound=%s not found
MakeMovementsAndClose=Generate movements and close MakeMovementsAndClose=Generate movements and close
AutofillWithExpected=Fill real quantity with expected quantity AutofillWithExpected=Fill real quantity with expected quantity
ShowAllBatchByDefault=Dérouler par défaut le détail des lots dans l'onglet "stock" ShowAllBatchByDefault=Dérouler par défaut le détail des lots dans l'onglet "stock"
CollapseBatchDetailHelp=Vous pouvez définir l'affichage par défaut du détail des lots dans la configuration du module stocks

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

@ -900,7 +900,8 @@ if (!$variants) {
$colspan = 3; $colspan = 3;
print '<tr class="liste_titre"><td width="14%">'; print '<tr class="liste_titre"><td width="14%">';
print '<a id="show_all" href="#">'.img_picto('', 'folder-open', 'class="paddingright"').$langs->trans("ExpandAll").'</a><br>'; print '<a id="show_all" href="#">'.img_picto('', 'folder-open', 'class="paddingright"').$langs->trans("ExpandAll").'</a><br>';
print '<a id="hide_all" href="#">'.img_picto('', 'folder', 'class="paddingright"').$langs->trans("UndoExpandAll").'</a>'; print '<a id="hide_all" href="#">'.img_picto('', 'folder', 'class="paddingright"').$langs->trans("UndoExpandAll").'</a>&nbsp;';
print $form->textwithpicto('', $langs->trans('CollapseBatchDetailHelp'), 1, 'help', '');
print '</td>'; print '</td>';
print '<td class="right">'.$langs->trans("batch_number").'</td>'; print '<td class="right">'.$langs->trans("batch_number").'</td>';
if (empty($conf->global->PRODUCT_DISABLE_EATBY)) { if (empty($conf->global->PRODUCT_DISABLE_EATBY)) {