lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rename method into selectLotDataList

Browse Source
This commit is contained in:
Laurent Destailleur 2021-10-17 14:38:12 +02:00
parent 0727e182ac
commit 79177b0a11
4 changed files with 9 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
htdocs/admin/tools/export_files.php
View File

@ -157,11 +157,9 @@ if ($compression == 'zip') {
} else { } else {
if ($compression == 'gz') { if ($compression == 'gz') {
$cmd = "gzip -f ".$outputdir."/".$file; $cmd = "gzip -f ".$outputdir."/".$file;
} } elseif ($compression == 'bz') {
elseif ($compression == 'bz') {
$cmd = "bzip2 -f ".$outputdir."/".$file; $cmd = "bzip2 -f ".$outputdir."/".$file;
} } elseif ($compression == 'zstd') {
elseif ($compression == 'zstd') {
$cmd = "zstd -z -9 -q --rm ".$outputdir."/".$file; $cmd = "zstd -z -9 -q --rm ".$outputdir."/".$file;
} }

6
htdocs/core/class/utils.class.php
View File

@ -249,11 +249,9 @@ class Utils
$compression = $compression ? $compression : 'none'; $compression = $compression ? $compression : 'none';
if ($compression == 'gz') { if ($compression == 'gz') {
$outputfile .= '.gz'; $outputfile .= '.gz';
} } elseif ($compression == 'bz') {
elseif ($compression == 'bz') {
$outputfile .= '.bz2'; $outputfile .= '.bz2';
} } elseif ($compression == 'zstd') {
elseif ($compression == 'zstd') {
$outputfile .= '.zst'; $outputfile .= '.zst';
} }
$outputerror = $outputfile.'.err'; $outputerror = $outputfile.'.err';

2
htdocs/mrp/mo_production.php
View File

@ -975,7 +975,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
if ($tmpproduct->status_batch) { if ($tmpproduct->status_batch) {
$preselected = (GETPOSTISSET('batch-'.$line->id.'-'.$i) ? GETPOST('batch-'.$line->id.'-'.$i) : ''); $preselected = (GETPOSTISSET('batch-'.$line->id.'-'.$i) ? GETPOST('batch-'.$line->id.'-'.$i) : '');
print '<input type="text" class="width50" name="batch-'.$line->id.'-'.$i.'" value="'.$preselected.'" list="batch-'.$line->id.'-'.$i.'">'; print '<input type="text" class="width50" name="batch-'.$line->id.'-'.$i.'" value="'.$preselected.'" list="batch-'.$line->id.'-'.$i.'">';
print $formproduct->selectLot('batch-'.$line->id.'-'.$i, 0, $line->fk_product, '', ''); print $formproduct->selectLotDataList('batch-'.$line->id.'-'.$i, 0, $line->fk_product, '', '');
} }
print '</td>'; print '</td>';
} }

9
htdocs/product/class/html.formproduct.class.php
View File

@ -543,7 +543,7 @@ class FormProduct
{ {
global $conf, $langs; global $conf, $langs;
dol_syslog(get_class($this)."::selectLot $selected, $htmlname, $filterstatus, $empty, $disabled, $fk_product, $fk_entrepot, $empty_label, $forcecombo, $morecss", LOG_DEBUG); dol_syslog(get_class($this)."::selectLotStock $selected, $htmlname, $filterstatus, $empty, $disabled, $fk_product, $fk_entrepot, $empty_label, $forcecombo, $morecss", LOG_DEBUG);
$out = ''; $out = '';
$productIdArray = array(); $productIdArray = array();
@ -613,21 +613,20 @@ class FormProduct
/** /**
* Return list of lot numbers (stock from product_batch) with stock location and stock qty * Return list of lot numbers (stock from product_batch) for product and warehouse.
* *
* @param string $htmlname Name of key that is inside attribute "list" of an input text field. * @param string $htmlname Name of key that is inside attribute "list" of an input text field.
* @param int $empty 1=Can be empty, 0 if not * @param int $empty 1=Can be empty, 0 if not
* @param int $fk_product show lot numbers of product with id fk_product. All from objectLines if 0. * @param int $fk_product show lot numbers of product with id fk_product. All from objectLines if 0.
* @param int $fk_entrepot filter lot numbers for warehouse with id fk_entrepot. All if 0. * @param int $fk_entrepot filter lot numbers for warehouse with id fk_entrepot. All if 0.
* @param array $objectLines Only cache lot numbers for products in lines of object. If no lines only for fk_product. If no fk_product, all. * @param array $objectLines Only cache lot numbers for products in lines of object. If no lines only for fk_product. If no fk_product, all.
*
* @return string HTML datalist * @return string HTML datalist
*/ */
public function selectLot($htmlname = 'batch_id', $empty = 0, $fk_product = 0, $fk_entrepot = 0, $objectLines = array()) public function selectLotDataList($htmlname = 'batch_id', $empty = 0, $fk_product = 0, $fk_entrepot = 0, $objectLines = array())
{ {
global $conf, $langs; global $conf, $langs;
dol_syslog(get_class($this)."::selectLot $htmlname, $empty, $fk_product, $fk_entrepot,$objectLines", LOG_DEBUG); dol_syslog(get_class($this)."::selectLotDataList $htmlname, $empty, $fk_product, $fk_entrepot,$objectLines", LOG_DEBUG);
$out = ''; $out = '';
$productIdArray = array(); $productIdArray = array();