Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-12-17 23:11:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

NEW Introduce option MAIN_WEIGHT_DEFAULT_UNIT and

Browse Source 
MAIN_VOLUME_DEFAULT_UNIT to force output unit for weight and volume.
This commit is contained in:
Laurent Destailleur
2016-04-01 18:44:23 +02:00
parent 7edd1d89a0
commit 281b06a2d3
7 changed files with 106 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
htdocs/core/lib/functions.lib.php
View File

@@ -3420,28 +3420,29 @@ function price2num($amount,$rounding='',$alreadysqlnb=0)
* @param string $type 'weight', 'volume', ...
* @param Translate $outputlangs Translate language object
* @param int $round -1 = non rounding, x = number of decimal
* @param string $forceunitoutput 'no' or numeric (-3, -6, ...) compared to $unit
* @return string String to show dimensions
*/
function showDimensionInBestUnit($dimension, $unit, $type, $outputlangs, $round=-1)
function showDimensionInBestUnit($dimension, $unit, $type, $outputlangs, $round=-1, $forceunitouput='no')
{
require_once DOL_DOCUMENT_ROOT.'/core/lib/product.lib.php';
if ($dimension < 1/10000)
if (($forceunitouput == 'no' && $dimension < 1/10000) || (is_numeric($forceunitouput) && $forceunitouput == -6))
{
$dimension = $dimension * 1000000;
$unit = $unit - 6;
}
elseif ($dimension < 1/10)
elseif (($forceunitouput == 'no' && $dimension < 1/10) || (is_numeric($forceunitouput) && $forceunitouput == -3))
{
$dimension = $dimension * 1000;
$unit = $unit - 3;
}
elseif ($dimension > 100000000)
elseif (($forceunitouput == 'no' && $dimension > 100000000) || (is_numeric($forceunitouput) && $forceunitouput == 6))
{
$dimension = $dimension / 1000000;
$unit = $unit + 6;
}
elseif ($dimension > 100000)
elseif (($forceunitouput == 'no' && $dimension > 100000) || (is_numeric($forceunitouput) && $forceunitouput == 3))
{
$dimension = $dimension / 1000;
$unit = $unit + 3;