diff --git a/htdocs/bom/bom_card.php b/htdocs/bom/bom_card.php index 71c64087419..85ce0a0366d 100644 --- a/htdocs/bom/bom_card.php +++ b/htdocs/bom/bom_card.php @@ -627,13 +627,13 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea return false; }); - //TODO : SHOW ALL / COLLAPSE ALL + //To Show all the sub bom lines $("#show_all").click(function() { $("[class^=sub_bom_lines]").show(); $("[class^=collapse_bom]").html('(-) '); return false; }); - + //To Hide all the sub bom lines $("#hide_all").click(function() { $("[class^=sub_bom_lines]").hide(); $("[class^=collapse_bom]").html('(+) '); diff --git a/htdocs/bom/tpl/objectline_title.tpl.php b/htdocs/bom/tpl/objectline_title.tpl.php index 0656f23aed9..ce811096d33 100644 --- a/htdocs/bom/tpl/objectline_title.tpl.php +++ b/htdocs/bom/tpl/objectline_title.tpl.php @@ -45,6 +45,8 @@ print "\n"; print ''; print ''.img_picto('', 'folder-open', 'class="paddingright"').$langs->trans("ExpandAll").'  '; print ''.img_picto('', 'folder', 'class="paddingright"').$langs->trans("UndoExpandAll").' '; +$form = new Form($object->db); +print $form->textwithpicto('', $langs->trans('CollapseBOMHelp'), 1, 'help', ''); // Adds a line numbering column if (!empty($conf->global->MAIN_VIEW_LINE_NUMBER)) { diff --git a/htdocs/langs/en_US/mrp.lang b/htdocs/langs/en_US/mrp.lang index 8aaf345feed..c414a219894 100644 --- a/htdocs/langs/en_US/mrp.lang +++ b/htdocs/langs/en_US/mrp.lang @@ -101,4 +101,6 @@ HumanMachine=Human / Machine WorkstationArea=Workstation area Machines=Machines THMEstimatedHelp=This rate makes it possible to define a forecast cost of the item -BOM=Nomenclature +BOM=Bill Of Materials +CollapseBOMHelp=You can define the default display of the details of the nomenclature in the configuration of the BOM module + diff --git a/htdocs/langs/fr_FR/mrp.lang b/htdocs/langs/fr_FR/mrp.lang index 2db57d53bfb..12873fd5093 100644 --- a/htdocs/langs/fr_FR/mrp.lang +++ b/htdocs/langs/fr_FR/mrp.lang @@ -102,3 +102,4 @@ WorkstationArea=Espace Poste de travail Machines=Machines THMEstimatedHelp=Ce taux permet de définir un coût prévisionnel de l'article BOM=Nomenclature +CollapseBOMHelp=Vous pouvez définir l'affichage par défaut du détail des nomenclature dans la configuration du module "Nomenclature Produits"