diff --git a/htdocs/product/card.php b/htdocs/product/card.php index 352256f5c42..58a177dddc4 100644 --- a/htdocs/product/card.php +++ b/htdocs/product/card.php @@ -1135,6 +1135,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) { if ($type != 1 && !empty($conf->stock->enabled)) { // Default warehouse print ''.$langs->trans("DefaultWarehouse").''; + print img_picto($langs->trans("DefaultWarehouse"), 'stock', 'pictofixedwidth'); print $formproduct->selectWarehouses(GETPOST('fk_default_warehouse'), 'fk_default_warehouse', 'warehouseopen', 1); print ' '; print ''; diff --git a/htdocs/product/list.php b/htdocs/product/list.php index dfd15249585..94ba5cd4e1d 100644 --- a/htdocs/product/list.php +++ b/htdocs/product/list.php @@ -627,7 +627,7 @@ if ($resql) { $param = "&search_vatrate=".urlencode($search_vatrate); } if ($fourn_id > 0) { - $param .= ($fourn_id ? "&fourn_id=".$fourn_id : ""); + $param .= "&fourn_id=".urlencode($fourn_id); } //if ($seach_categ) $param.=($search_categ?"&search_categ=".urlencode($search_categ):""); if ($show_childproducts) { @@ -756,7 +756,7 @@ if ($resql) { $moreforfilter = ''; if (!empty($conf->categorie->enabled) && $user->rights->categorie->lire) { $moreforfilter .= '
'; - $moreforfilter .= $langs->trans('Categories').': '; + $moreforfilter .= img_picto($langs->trans('Categories'), 'category', 'class="pictofixedwidth"'); $categoriesProductArr = $form->select_all_categories(Categorie::TYPE_PRODUCT, '', '', 64, 0, 1); $categoriesProductArr[-2] = '- '.$langs->trans('NotCategorized').' -'; $moreforfilter .= Form::multiselectarray('search_category_product_list', $categoriesProductArr, $searchCategoryProductList, 0, 0, 'minwidth300'); diff --git a/htdocs/product/stats/card.php b/htdocs/product/stats/card.php index 5f94b6bf9cc..2dae292884e 100644 --- a/htdocs/product/stats/card.php +++ b/htdocs/product/stats/card.php @@ -184,9 +184,8 @@ if ($result || empty($id)) { // Tag if ($conf->categorie->enabled) { print ''.$langs->trans("Categories").''; - //$moreforfilter.='
'; + $moreforfilter .= img_picto($langs->trans("Categories"), 'category', 'paddingright'); $moreforfilter .= $htmlother->select_categories(Categorie::TYPE_PRODUCT, $search_categ, 'search_categ', 1); - //$moreforfilter.='
'; print $moreforfilter; print ''; } @@ -205,7 +204,7 @@ if ($result || empty($id)) { $arrayyears[$currentyear] = $currentyear; } arsort($arrayyears); - print $form->selectarray('search_year', $arrayyears, $search_year, 1); + print $form->selectarray('search_year', $arrayyears, $search_year, 1, 0, 0, '', 0, 0, 0, '', 'width75'); print ''; print ''; print '
'; diff --git a/htdocs/product/stock/movement_list.php b/htdocs/product/stock/movement_list.php index 3db1e3308ac..aed4278bb0e 100644 --- a/htdocs/product/stock/movement_list.php +++ b/htdocs/product/stock/movement_list.php @@ -886,6 +886,7 @@ if ($resql) { print ''; } if (! empty($arrayfields['m.datem']['checked'])) { + // Date print ''; print '
'; print $form->selectDate($search_date_start?$search_date_start:-1, 'search_date_start', 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans('From'), 'tzuserrel'); @@ -1014,7 +1015,7 @@ if ($resql) { print_liste_field_titre($arrayfields['m.rowid']['label'], $_SERVER["PHP_SELF"], 'm.rowid', '', $param, '', $sortfield, $sortorder); } if (!empty($arrayfields['m.datem']['checked'])) { - print_liste_field_titre($arrayfields['m.datem']['label'], $_SERVER["PHP_SELF"], 'm.datem', '', $param, '', $sortfield, $sortorder); + print_liste_field_titre($arrayfields['m.datem']['label'], $_SERVER["PHP_SELF"], 'm.datem', '', $param, '', $sortfield, $sortorder, 'center '); } if (!empty($arrayfields['p.ref']['checked'])) { print_liste_field_titre($arrayfields['p.ref']['label'], $_SERVER["PHP_SELF"], 'p.ref', '', $param, '', $sortfield, $sortorder); @@ -1132,7 +1133,7 @@ if ($resql) { } if (!empty($arrayfields['m.datem']['checked'])) { // Date - print ''.dol_print_date($db->jdate($objp->datem), 'dayhour', 'tzuserrel').''; + print ''.dol_print_date($db->jdate($objp->datem), 'dayhour', 'tzuserrel').''; } if (!empty($arrayfields['p.ref']['checked'])) { // Product ref