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

Add more measure units.

Browse Source
This commit is contained in:
Laurent Destailleur 2010-08-24 18:40:17 +00:00
parent ac4dfe00c4
commit d00efff3ec
4 changed files with 26 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
htdocs/langs/en_US/other.lang
View File

@ -79,6 +79,7 @@ WeightUnitton=tonnes
WeightUnitkg=kg
WeightUnitg=g
WeightUnitmg=mg
WeightUnitpound=pound
Length=Length
LengthUnitm=m
LengthUnitdm=dm
@ -95,11 +96,15 @@ VolumeUnitm3=m3
VolumeUnitdm3=dm3
VolumeUnitcm3=cm3
VolumeUnitmm3=mm3
VolumeUnitlitre=litre
VolumeUnitgallon=gallon
Size=size
SizeUnitm=m
SizeUnitdm=dm
SizeUnitcm=cm
SizeUnitmm=mm
SizeUnitinch=inch
SizeUnitfoot=foot
BugTracker=Bug tracker
SendNewPasswordDesc=This form allows you to request a new password. It will be send to your email address.<br>Change will be effective only after clicking on confirmation link inside this email.<br>Check your email reader software.
BackToLoginPage=Back to login page

5
htdocs/langs/fr_FR/other.lang
View File

@ -79,6 +79,7 @@ WeightUnitton=tonnes
WeightUnitkg=kg
WeightUnitg=g
WeightUnitmg=mg
WeightUnitpound=livre
Length=Longueur
LengthUnitm=m
LengthUnitdm=dm
@ -95,11 +96,15 @@ VolumeUnitm3=m3
VolumeUnitdm3=dm3 (l)
VolumeUnitcm3=cm3 (ml)
VolumeUnitmm3=mm3 (µl)
VolumeUnitlitre=litre
VolumeUnitgallon=gallon
Size=taille
SizeUnitm=m
SizeUnitdm=dm
SizeUnitcm=cm
SizeUnitmm=mm
SizeUnitinch=pouce
SizeUnitfoot=pied
BugTracker=Bug tracker
SendNewPasswordDesc=Ce formulaire permet d'envoyer un nouveau mot de passe. Il sera envoyé à l'adresse email de votre user.<br>La modification du mot de passe ne sera effective qu'après clic par le destinataire du lien de confirmation inclut dans ce mail.<br>Surveillez votre messagerie.
BackToLoginPage=Retour page de connexion

20
htdocs/lib/product.lib.php
View File

@ -271,20 +271,13 @@ function show_stats_for_company($product,$socid)
/**
* \brief Renvoi le texte d'une unite
* \param int Unit
* \param measuring_style Le style de mesure : weight, volume,...
* \return string Unite
* \TODO gerer les autres unites de mesure comme la livre, le gallon, le litre, ...
* Return translation label of a unit key
* @param int Unit key (-3,0,3,98,99...)
* @param measuring_style Style of unit: weight, volume,...
* @return string Unit string
*/
function measuring_units_string($unit,$measuring_style='')
{
/* Note Rodo aux dev :)
* Ne pas inserer dans la base de donnees ces valeurs
* cela surchagerait inutilement d'une requete supplementaire
* pour quelque chose qui est somme toute peu variable
*/
global $langs;
if ($measuring_style == 'weight')
@ -293,6 +286,7 @@ function measuring_units_string($unit,$measuring_style='')
$measuring_units[0] = $langs->trans("WeightUnitkg");
$measuring_units[-3] = $langs->trans("WeightUnitg");
$measuring_units[-6] = $langs->trans("WeightUnitmg");
$measuring_units[99] = $langs->trans("WeightUnitpound");
}
else if ($measuring_style == 'size')
{
@ -300,6 +294,8 @@ function measuring_units_string($unit,$measuring_style='')
$measuring_units[-1] = $langs->trans("SizeUnitdm");
$measuring_units[-2] = $langs->trans("SizeUnitcm");
$measuring_units[-3] = $langs->trans("SizeUnitmm");
$measuring_units[99] = $langs->trans("SizeUnitinch");
$measuring_units[98] = $langs->trans("SizeUnitfoot");
}
else if ($measuring_style == 'surface')
{
@ -314,6 +310,8 @@ function measuring_units_string($unit,$measuring_style='')
$measuring_units[-3] = $langs->trans("VolumeUnitdm3");
$measuring_units[-6] = $langs->trans("VolumeUnitcm3");
$measuring_units[-9] = $langs->trans("VolumeUnitmm3");
$measuring_units[98] = $langs->trans("VolumeUnitlitre");
$measuring_units[99] = $langs->trans("VolumeUnitgallon");
}
return $measuring_units[$unit];

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

@ -163,34 +163,11 @@ class FormProduct
$return='';
if ($measuring_style == 'weight')
{
$measuring_units[3] = $langs->trans("WeightUnitton");
$measuring_units[0] = $langs->trans("WeightUnitkg");
$measuring_units[-3] = $langs->trans("WeightUnitg");
$measuring_units[-6] = $langs->trans("WeightUnitmg");
}
else if ($measuring_style == 'size')
{
$measuring_units[0] = $langs->trans("SizeUnitm");
$measuring_units[-1] = $langs->trans("SizeUnitdm");
$measuring_units[-2] = $langs->trans("SizeUnitcm");
$measuring_units[-3] = $langs->trans("SizeUnitmm");
}
else if ($measuring_style == 'surface')
{
$measuring_units[0] = $langs->trans("SurfaceUnitm2");
$measuring_units[-2] = $langs->trans("SurfaceUnitdm2");
$measuring_units[-4] = $langs->trans("SurfaceUnitcm2");
$measuring_units[-6] = $langs->trans("SurfaceUnitmm2");
}
else if ($measuring_style == 'volume')
{
$measuring_units[0] = $langs->trans("VolumeUnitm3");
$measuring_units[-3] = $langs->trans("VolumeUnitdm3");
$measuring_units[-6] = $langs->trans("VolumeUnitcm3");
$measuring_units[-9] = $langs->trans("VolumeUnitmm3");
}
$measuring_units=array();
if ($measuring_style == 'weight') $measuring_units=array(-6=>1,-3=>1,0=>1,3=>1,99=>1);
else if ($measuring_style == 'size') $measuring_units=array(-3=>1,-2=>1,-1=>1,0=>1,99=>1,98=>1);
else if ($measuring_style == 'surface') $measuring_units=array(-6=>1,-4=>1,-2=>1,0=>1);
else if ($measuring_style == 'volume') $measuring_units=array(-9=>1,-6=>1,-3=>1,0=>1,99=>1,/* 98=>1 */); // Liter is not used as already available with dm3
$return.= '<select class="flat" name="'.$name.'">';
if ($adddefault) $return.= '<option value="0">'.$langs->trans("Default").'</option>';
@ -202,7 +179,8 @@ class FormProduct
{
$return.= ' selected="true"';
}
$return.= '>'.$value.'</option>';
//$return.= '>'.$value.'</option>';
$return.= '>'.measuring_units_string($key,$measuring_style).'</option>';
}
$return.= '</select>';