@@ -579,7 +579,7 @@ |
||
| 579 | 579 | $maxfilesizearray = getMaxFileSizeArray(); |
| 580 | 580 | $maxmin = $maxfilesizearray['maxmin']; |
| 581 | 581 | if ($maxmin > 0) { |
| 582 | - print '<input type="hidden" name="MAX_FILE_SIZE" value="' . ($maxmin * 1024) . '">'; // MAX_FILE_SIZE must precede the field type=file |
|
| 582 | + print '<input type="hidden" name="MAX_FILE_SIZE" value="' . ($maxmin * 1024) . '">'; // MAX_FILE_SIZE must precede the field type=file |
|
| 583 | 583 | } |
| 584 | 584 | print '<input type="file" name="userfile" size="20" maxlength="80"> '; |
| 585 | 585 | $out = (!getDolGlobalString('MAIN_UPLOAD_DOC') ? ' disabled' : ''); |
@@ -1294,7 +1294,7 @@ |
||
| 1294 | 1294 | $pse = new ProductStockEntrepot($db); |
| 1295 | 1295 | $lines = $pse->fetchAll($id); |
| 1296 | 1296 | |
| 1297 | - $visibleWarehouseEntities = explode(',', getEntity('stock')); // For MultiCompany compatibility |
|
| 1297 | + $visibleWarehouseEntities = explode(',', getEntity('stock')); // For MultiCompany compatibility |
|
| 1298 | 1298 | |
| 1299 | 1299 | if (!empty($lines)) { |
| 1300 | 1300 | $var = false; |
@@ -33,7 +33,7 @@ |
||
| 33 | 33 | |
| 34 | 34 | // Get parameters |
| 35 | 35 | $id = GETPOSTINT('id'); |
| 36 | -$ref = GETPOST('ref', 'alpha'); |
|
| 36 | +$ref = GETPOST('ref', 'alpha'); |
|
| 37 | 37 | $action = GETPOST('action', 'aZ09'); |
| 38 | 38 | |
| 39 | 39 | // Initialize technical objects |
@@ -569,7 +569,7 @@ |
||
| 569 | 569 | } elseif (in_array($val['type'], array('double(24,8)', 'double(6,3)', 'integer', 'real', 'price')) && $val['label'] != 'TechnicalID' && empty($val['arrayofkeyval'])) { |
| 570 | 570 | $cssforfield .= ($cssforfield ? ' ' : '') . 'right'; |
| 571 | 571 | } |
| 572 | - $cssforfield = preg_replace('/small\s*/', '', $cssforfield); // the 'small' css must not be used for the title label |
|
| 572 | + $cssforfield = preg_replace('/small\s*/', '', $cssforfield); // the 'small' css must not be used for the title label |
|
| 573 | 573 | if (!empty($arrayfields['t.' . $key]['checked'])) { |
| 574 | 574 | print getTitleFieldOfList($arrayfields['t.' . $key]['label'], 0, $_SERVER['PHP_SELF'], 't.' . $key, '', $param, ($cssforfield ? 'class="' . $cssforfield . '"' : ''), $sortfield, $sortorder, ($cssforfield ? $cssforfield . ' ' : '')) . "\n"; |
| 575 | 575 | $totalarray['nbfield']++; |
@@ -40,8 +40,8 @@ |
||
| 40 | 40 | |
| 41 | 41 | $id = GETPOSTINT('id'); |
| 42 | 42 | $ref = GETPOST('ref', 'alpha'); |
| 43 | -$batch = GETPOST('batch', 'alpha'); |
|
| 44 | -$objectid = GETPOSTINT('productid'); |
|
| 43 | +$batch = GETPOST('batch', 'alpha'); |
|
| 44 | +$objectid = GETPOSTINT('productid'); |
|
| 45 | 45 | |
| 46 | 46 | // Security check |
| 47 | 47 | $fieldvalue = (!empty($id) ? $id : (!empty($ref) ? $ref : '')); |
@@ -40,8 +40,8 @@ |
||
| 40 | 40 | |
| 41 | 41 | $id = GETPOSTINT('id'); |
| 42 | 42 | $ref = GETPOST('ref', 'alpha'); |
| 43 | -$batch = GETPOST('batch', 'alpha'); |
|
| 44 | -$objectid = GETPOSTINT('productid'); |
|
| 43 | +$batch = GETPOST('batch', 'alpha'); |
|
| 44 | +$objectid = GETPOSTINT('productid'); |
|
| 45 | 45 | |
| 46 | 46 | // Security check |
| 47 | 47 | $fieldvalue = (!empty($id) ? $id : (!empty($ref) ? $ref : '')); |
@@ -40,8 +40,8 @@ |
||
| 40 | 40 | |
| 41 | 41 | $id = GETPOSTINT('id'); |
| 42 | 42 | $ref = GETPOST('ref', 'alpha'); |
| 43 | -$batch = GETPOST('batch', 'alpha'); |
|
| 44 | -$objectid = GETPOSTINT('productid'); |
|
| 43 | +$batch = GETPOST('batch', 'alpha'); |
|
| 44 | +$objectid = GETPOSTINT('productid'); |
|
| 45 | 45 | |
| 46 | 46 | // Security check |
| 47 | 47 | $fieldvalue = (!empty($id) ? $id : (!empty($ref) ? $ref : '')); |
@@ -452,7 +452,7 @@ discard block |
||
| 452 | 452 | //'builddoc'=>img_picto('', 'pdf', 'class="pictofixedwidth"').$langs->trans("PDFMerge"), |
| 453 | 453 | ); |
| 454 | 454 | //if ($user->rights->stock->supprimer) $arrayofmassactions['predelete']=img_picto('', 'delete', 'class="pictofixedwidth"').$langs->trans("Delete"); |
| 455 | -if (GETPOSTINT('nomassaction') || in_array($massaction, array('presend', 'predelete','preaffecttag'))) { |
|
| 455 | +if (GETPOSTINT('nomassaction') || in_array($massaction, array('presend', 'predelete', 'preaffecttag'))) { |
|
| 456 | 456 | $arrayofmassactions = array(); |
| 457 | 457 | } |
| 458 | 458 | if (isModEnabled('category') && $user->hasRight('stock', 'creer')) { |
@@ -530,7 +530,7 @@ discard block |
||
| 530 | 530 | } |
| 531 | 531 | |
| 532 | 532 | $varpage = empty($contextpage) ? $_SERVER["PHP_SELF"] : $contextpage; |
| 533 | -$htmlofselectarray = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage, getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')); // This also change content of $arrayfields with user setup |
|
| 533 | +$htmlofselectarray = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage, getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')); // This also change content of $arrayfields with user setup |
|
| 534 | 534 | $selectedfields = ($mode != 'kanban' ? $htmlofselectarray : ''); |
| 535 | 535 | $selectedfields .= (count($arrayofmassactions) ? $form->showCheckAddButtons('checkforselect', 1) : ''); |
| 536 | 536 | |
@@ -647,7 +647,7 @@ discard block |
||
| 647 | 647 | } elseif (in_array($val['type'], array('double(24,8)', 'double(6,3)', 'integer', 'real', 'price')) && !in_array($key, array('id', 'rowid', 'ref', 'status')) && $val['label'] != 'TechnicalID' && empty($val['arrayofkeyval'])) { |
| 648 | 648 | $cssforfield .= ($cssforfield ? ' ' : '') . 'right'; |
| 649 | 649 | } |
| 650 | - $cssforfield = preg_replace('/small\s*/', '', $cssforfield); // the 'small' css must not be used for the title label |
|
| 650 | + $cssforfield = preg_replace('/small\s*/', '', $cssforfield); // the 'small' css must not be used for the title label |
|
| 651 | 651 | if (!empty($arrayfields['t.' . $key]['checked'])) { |
| 652 | 652 | print getTitleFieldOfList($arrayfields['t.' . $key]['label'], 0, $_SERVER['PHP_SELF'], 't.' . $key, '', $param, ($cssforfield ? 'class="' . $cssforfield . '"' : ''), $sortfield, $sortorder, ($cssforfield ? $cssforfield . ' ' : ''), 0, (empty($val['helplist']) ? '' : $val['helplist'])) . "\n"; |
| 653 | 653 | $totalarray['nbfield']++; |
@@ -157,7 +157,7 @@ discard block |
||
| 157 | 157 | if ($productid > 0) { |
| 158 | 158 | $sql .= " AND ps.fk_product = " . ((int) $productid); |
| 159 | 159 | } |
| 160 | - if (! empty($search_fk_warehouse)) { |
|
| 160 | + if (!empty($search_fk_warehouse)) { |
|
| 161 | 161 | $sql .= " AND ps.fk_entrepot IN (" . $db->sanitize(implode(",", $search_fk_warehouse)) . ")"; |
| 162 | 162 | } |
| 163 | 163 | if ($search_ref) { |
@@ -373,8 +373,7 @@ discard block |
||
| 373 | 373 | |
| 374 | 374 | // Lines of title |
| 375 | 375 | print implode(";", ($mode == 'future') ? |
| 376 | - array('"Product Reference"', '"Label"', '"Current Stock"', '"' . $stocklabel . '"', '"Virtual Stock"') : |
|
| 377 | - array('"Product Reference"', '"Label"', '"' . $stocklabel . '"', '"Estimated Stock Value"', '"Estimate Sell Value"', '"Movements"', '"Current Stock"')) . "\r\n"; |
|
| 376 | + array('"Product Reference"', '"Label"', '"Current Stock"', '"' . $stocklabel . '"', '"Virtual Stock"') : array('"Product Reference"', '"Label"', '"' . $stocklabel . '"', '"Estimated Stock Value"', '"Estimate Sell Value"', '"Movements"', '"Current Stock"')) . "\r\n"; |
|
| 378 | 377 | } else { |
| 379 | 378 | llxHeader('', $title, $helpurl, '', 0, 0, '', '', '', 'mod-product page-stock_stockatdate'); |
| 380 | 379 | |
@@ -604,7 +603,7 @@ discard block |
||
| 604 | 603 | |
| 605 | 604 | if ($mode == 'future') { |
| 606 | 605 | $prod->load_stock('warehouseopen,warehouseinternal,nobatch', 0, $dateendofday); |
| 607 | - $stock = $prod->stock_theorique; // virtual stock at a date |
|
| 606 | + $stock = $prod->stock_theorique; // virtual stock at a date |
|
| 608 | 607 | $prod->load_stock('warehouseopen,warehouseinternal,nobatch', 0); |
| 609 | 608 | $virtualstock = $prod->stock_theorique; // virtual stock in infinite future |
| 610 | 609 | } else { |
@@ -712,7 +711,7 @@ discard block |
||
| 712 | 711 | $url .= '&search_date_startyear=' . GETPOSTINT('dateyear'); |
| 713 | 712 | } |
| 714 | 713 | if (count($search_fk_warehouse) > 1) { |
| 715 | - $url = ''; // Do not show link, multi warehouse as filter not managed yet by target page |
|
| 714 | + $url = ''; // Do not show link, multi warehouse as filter not managed yet by target page |
|
| 716 | 715 | } else { |
| 717 | 716 | foreach ($search_fk_warehouse as $val) { |
| 718 | 717 | $url .= ($val > 0 ? '&search_warehouse=' . ((int) $val) : ''); |
@@ -767,8 +766,7 @@ discard block |
||
| 767 | 766 | '', |
| 768 | 767 | $productid > 0 ? price2num($totalcurrentstock, 'MS') : '', |
| 769 | 768 | '', |
| 770 | - price(price2num($totalvirtualstock, 'MS'))) : |
|
| 771 | - array( |
|
| 769 | + price(price2num($totalvirtualstock, 'MS'))) : array( |
|
| 772 | 770 | '"' . $langs->trans("Totalforthispage") . '"', |
| 773 | 771 | '', |
| 774 | 772 | '', |