diff --git a/htdocs/product/reassortlot.php b/htdocs/product/reassortlot.php index 3c1f7313855..a443fe10f62 100644 --- a/htdocs/product/reassortlot.php +++ b/htdocs/product/reassortlot.php @@ -482,7 +482,10 @@ if ($resql) { //if ($objp->seuil_stock_alerte && ($objp->stock_physique < $objp->seuil_stock_alerte)) print img_warning($langs->trans("StockTooLow")).' '; print $objp->stock_physique; print ''; - print ''.$langs->trans("Movements").''; + print ''; + print img_picto($langs->trans("StockMovement"), 'movement', 'class="pictofixedwidth"'); + print ''.$langs->trans("Movements").''; + print ''; print ''.$product_static->LibStatut($objp->statut, 5, 0).''; print ''.$product_static->LibStatut($objp->tobuy, 5, 1).''; print ''; diff --git a/htdocs/product/stock/massstockmove.php b/htdocs/product/stock/massstockmove.php index 830e8aa56e9..5a5808b04f3 100644 --- a/htdocs/product/stock/massstockmove.php +++ b/htdocs/product/stock/massstockmove.php @@ -1,5 +1,5 @@ +/* Copyright (C) 2013-2021 Laurent Destaileur * Copyright (C) 2014 Regis Houssin * * This program is free software: you can redistribute it and/or modify @@ -344,14 +344,14 @@ print ''; print ''; // From warehouse print ''; -print $formproduct->selectWarehouses($id_sw, 'id_sw', 'warehouseopen,warehouseinternal', 1, 0, 0, '', 0, 0, array(), 'minwidth200imp maxwidth200'); +print img_picto($langs->trans("WarehouseSource"), 'stock', 'class="paddingright"').$formproduct->selectWarehouses($id_sw, 'id_sw', 'warehouseopen,warehouseinternal', 1, 0, 0, '', 0, 0, array(), 'minwidth200imp maxwidth200'); print ''; // To warehouse print ''; -print $formproduct->selectWarehouses($id_tw, 'id_tw', 'warehouseopen,warehouseinternal', 1, 0, 0, '', 0, 0, array(), 'minwidth200imp maxwidth200'); +print img_picto($langs->trans("WarehouseTarget"), 'stock', 'class="paddingright"').$formproduct->selectWarehouses($id_tw, 'id_tw', 'warehouseopen,warehouseinternal', 1, 0, 0, '', 0, 0, array(), 'minwidth200imp maxwidth200'); print ''; // Product -print ''; +print ''; $filtertype = 0; if (!empty($conf->global->STOCK_SUPPORTS_SERVICES)) { $filtertype = ''; @@ -362,11 +362,13 @@ if ($conf->global->PRODUIT_LIMIT_SIZE <= 0) { $limit = $conf->global->PRODUIT_LIMIT_SIZE; } -$form->select_produits($id_product, 'productid', $filtertype, $limit, 0, -1, 2, '', 1, array(), 0, '1', 0, 'minwidth200imp maxwidth300', 1); +print img_picto($langs->trans("Product"), 'product', 'class="paddingright"'); +print $form->select_produits($id_product, 'productid', $filtertype, $limit, 0, -1, 2, '', 1, array(), 0, '1', 0, 'minwidth200imp maxwidth300', 1, '', null, 1); print ''; // Batch number if ($conf->productbatch->enabled) { print ''; + print img_picto($langs->trans("LotSerial"), 'lot', 'class="paddingright"'); print ''; print ''; } diff --git a/htdocs/variants/ajax/orderAttribute.php b/htdocs/variants/ajax/orderAttribute.php index 1d9e1b8e892..81632dc0164 100644 --- a/htdocs/variants/ajax/orderAttribute.php +++ b/htdocs/variants/ajax/orderAttribute.php @@ -58,7 +58,7 @@ top_httphead(); // Registering the location of boxes if (GETPOSTISSET('roworder')) { - $roworder = GETPOST('roworder', 'alpha', 2); + $roworder = GETPOST('roworder', 'intcomma', 2); dol_syslog("AjaxOrderAttribute roworder=".$roworder, LOG_DEBUG); diff --git a/htdocs/variants/list.php b/htdocs/variants/list.php index bfe4dd0aa72..dd55b028ff9 100644 --- a/htdocs/variants/list.php +++ b/htdocs/variants/list.php @@ -99,7 +99,8 @@ $forcereloadpage = empty($conf->global->MAIN_FORCE_RELOAD_PAGE) ? 0 : 1; var roworder = cleanSerialize(decodeURI($("#tablelines").tableDnDSerialize())); $.post("/variants/ajax/orderAttribute.php", { - roworder: roworder + roworder: roworder, + token: "" }, function() { if (reloadpage == 1) {