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

Update product.lib.php

Browse Source
This commit is contained in:
Laurent Destailleur 2019-06-14 13:46:59 +02:00 committed by GitHub
parent e6c28188db
commit 1fa1b91916
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
htdocs/core/lib/product.lib.php
View File

@ -483,7 +483,7 @@ function show_stats_for_company($product, $socid)
/** /**
* Return translation label of a unit key * Return translation label of a unit key
* *
* @param int $unit Unit key (-3,0,3,98,99...) * @param int $unit ID of unit (rowid in llx_c_units table)
* @param string $measuring_style Style of unit: weight, volume,... * @param string $measuring_style Style of unit: weight, volume,...
* @return string Unit string * @return string Unit string
* @see formproduct->selectMeasuringUnits * @see formproduct->selectMeasuringUnits
@ -494,7 +494,7 @@ function measuring_units_string($unit, $measuring_style = '')
require_once DOL_DOCUMENT_ROOT.'/core/class/cunits.class.php'; require_once DOL_DOCUMENT_ROOT.'/core/class/cunits.class.php';
$measuringUnits= new CUnits($db); $measuringUnits= new CUnits($db);
$result = $measuringUnits->fetchAll('', '', 0, 0, array( $result = $measuringUnits->fetchAll('', '', 0, 0, array(
't.scale' => $unit, 't.rowid' => $unit,
't.unit_type' => $measuring_style, 't.unit_type' => $measuring_style,
't.active' => 1 't.active' => 1
)); ));