diff --git a/htdocs/core/boxes/box_graph_invoices_permonth.php b/htdocs/core/boxes/box_graph_invoices_permonth.php index c0e6ce0044786e25e038fe761cfede326c0aa9fa..3ec5add8a05d2a60e02187fe63dc8346310b1956 100644 --- a/htdocs/core/boxes/box_graph_invoices_permonth.php +++ b/htdocs/core/boxes/box_graph_invoices_permonth.php @@ -71,7 +71,8 @@ class box_graph_invoices_permonth extends ModeleBoxes $text = $langs->trans("BoxInvoicesPerMonth",$max); $this->info_box_head = array( 'text' => $text, - 'limit'=> dol_strlen($text) + 'limit'=> dol_strlen($text), + 'graph'=> 1 ); if ($user->rights->facture->lire) diff --git a/htdocs/core/boxes/modules_boxes.php b/htdocs/core/boxes/modules_boxes.php index cf9e7f6fd320c4fec74267dc221d9ba5cc0f0cb5..140b5c757f99e657fbeae92f37da0bb4bfc0a472 100644 --- a/htdocs/core/boxes/modules_boxes.php +++ b/htdocs/core/boxes/modules_boxes.php @@ -168,7 +168,9 @@ class ModeleBoxes // Can't be abtract as it is instanciated to build "empty" // The image must have the class 'boxhandle' beause it's value used in DOM draggable objects to define the area used to catch the full object print img_picto($langs->trans("MoveBox",$this->box_id),'grip','class="boxhandle hideonsmartphone" style="cursor:move;"'); print img_picto($langs->trans("Close",$this->box_id),'close','class="boxclose" rel="x:y" style="cursor:pointer;" id="imgclose'.$this->box_id.'"'); - print '<input type="hidden" id="boxlabelentry'.$this->box_id.'" value="'.dol_escape_htmltag($head['text']).'">'; + $label=$head['text']; + if (! empty($head['graph'])) $label.=' ('.$langs->trans("Graph").')'; + print '<input type="hidden" id="boxlabelentry'.$this->box_id.'" value="'.dol_escape_htmltag($label).'">'; print '</td></tr></table>'; } print '</td>'; diff --git a/htdocs/core/class/html.formother.class.php b/htdocs/core/class/html.formother.class.php index 73427b714552db4ffd11b1ec87554968b232578c..c87f2df36dd627ff18110c135ca7a07cd7e0082a 100644 --- a/htdocs/core/class/html.formother.class.php +++ b/htdocs/core/class/html.formother.class.php @@ -957,7 +957,7 @@ class FormOther var boxid=self.id.substring(8); var label=jQuery(\'#boxlabelentry\'+boxid).val(); jQuery(\'#boxto_\'+boxid).remove(); - // TODO Add id, label into combo list + if (boxid > 0) jQuery(\'#boxcombo\').append(new Option(label, boxid)); updateBoxOrder(1); });