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

fix unit trad

Browse Source
This commit is contained in:
florian HENRY 2017-02-21 19:07:57 +01:00
parent 19e60f03b9
commit c8de648924
2 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
htdocs/core/class/html.form.class.php
View File

@ -3266,11 +3266,11 @@ class Form
{ {
if ($selected == $res->rowid) if ($selected == $res->rowid)
{ {
$return.='<option value="'.$res->rowid.'" selected>'.$langs->trans($res->label).'</option>'; $return.='<option value="'.$res->rowid.'" selected>'.($langs->trans('unit'.$res->code)!=$res->label?$langs->trans('unit'.$res->code):$res->label).'</option>';
} }
else else
{ {
$return.='<option value="'.$res->rowid.'">'.$langs->trans($res->label).'</option>'; $return.='<option value="'.$res->rowid.'">'.($langs->trans('unit'.$res->code)!=$res->label?$langs->trans('unit'.$res->code):$res->label).'</option>';
} }
} }
$return.='</select>'; $return.='</select>';

12
htdocs/langs/en_US/products.lang
View File

@ -175,6 +175,18 @@ m2=m²
m3=m³ m3=m³
liter=liter liter=liter
l=L l=L
unitP=Piece
unitSET=Set
unitS=Second
unitH=Hour
unitD=Day
unitKG=Kilogram
unitG=Gram
unitM=Meter
unitLM=Linear meter
unitM2=Square meter
unitM3=Cubic meter
unitL=Liter
ProductCodeModel=Product ref template ProductCodeModel=Product ref template
ServiceCodeModel=Service ref template ServiceCodeModel=Service ref template
CurrentProductPrice=Current price CurrentProductPrice=Current price