diff --git a/htdocs/expedition/dispatch.php b/htdocs/expedition/dispatch.php index e382375e760e7..1ac8ee123d68d 100644 --- a/htdocs/expedition/dispatch.php +++ b/htdocs/expedition/dispatch.php @@ -1259,16 +1259,24 @@ $out_js_line .= ' jQuery.each(data, function(key, objBatch) {'; $out_js_line .= ' var dataEatByDate = objBatch.eatbydate;'; $out_js_line .= ' var dataSellByDate = objBatch.sellbydate;'; + $out_js_line .= ' var optionLabel = key+" (";'; $out_js_line .= ' if (selectwarehouse.val() == -1) {'; - $out_js_line .= ' var label = key+" ('.dol_escape_js($langs->trans('StockTotal')).' : "+objBatch.qty+")";'; + $out_js_line .= ' optionLabel += "'.dol_escape_js($langs->trans('StockTotal')).': "+objBatch.qty;'; $out_js_line .= ' } else {'; - $out_js_line .= ' var label = key+" ('.dol_escape_js($langs->trans('Stock')).' : "+objBatch.qty+")";'; + $out_js_line .= ' optionLabel += "'.dol_escape_js($langs->trans('Stock')).': "+objBatch.qty;'; $out_js_line .= ' }'; + $out_js_line .= ' if (dataEatByDate != "") {'; + $out_js_line .= ' optionLabel += " - '.dol_escape_js($langs->trans('EatByDate')).': "+dataEatByDate;'; + $out_js_line .= ' }'; + $out_js_line .= ' if (dataSellByDate != "") {'; + $out_js_line .= ' optionLabel += " - '.dol_escape_js($langs->trans('SellByDate')).': "+dataSellByDate;'; + $out_js_line .= ' }'; + $out_js_line .= ' optionLabel += ")";'; + $out_js_line .= ' var option = "