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

New: Add unit foot2, inch2, foot3 and inch3 for surface and volumes.

Browse Source
This commit is contained in:
Laurent Destailleur 2012-08-27 20:02:23 +02:00
parent 6c0dac2f17
commit d0d5891eef
5 changed files with 18 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@ -38,6 +38,7 @@ For users:
- New: [ task #494 ] Send an email to foundation when a new member has auto-subscribed
- New: [ task #326 ]: Add a numbering module to suggest automatically a product ref
- New: Add conditional substitution IF/ELSEIF/ENDIF for ODT templates
- New: Add unit foot2, inch2, foot3 and inch3 for surface and volumes.
- Fix: [ bug #499 ]: Supplier order input method not translated
- Fix: No images into product description lines as PDF generation does
not work with this.

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

@ -329,8 +329,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");
$measuring_units[99] = $langs->trans("SizeUnitinch");
}
else if ($measuring_style == 'surface')
{
@ -338,6 +338,8 @@ function measuring_units_string($unit,$measuring_style='')
$measuring_units[-2] = $langs->trans("SurfaceUnitdm2");
$measuring_units[-4] = $langs->trans("SurfaceUnitcm2");
$measuring_units[-6] = $langs->trans("SurfaceUnitmm2");
$measuring_units[98] = $langs->trans("SurfaceUnitfoot2");
$measuring_units[99] = $langs->trans("SurfaceUnitinch2");
}
else if ($measuring_style == 'volume')
{
@ -345,7 +347,9 @@ 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[97] = $langs->trans("VolumeUnitounce");
$measuring_units[88] = $langs->trans("VolumeUnitfoot3");
$measuring_units[89] = $langs->trans("VolumeUnitinch3");
$measuring_units[97] = $langs->trans("VolumeUnitounce");
$measuring_units[98] = $langs->trans("VolumeUnitlitre");
$measuring_units[99] = $langs->trans("VolumeUnitgallon");
}

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

@ -103,12 +103,16 @@ SurfaceUnitm2=m2
SurfaceUnitdm2=dm2
SurfaceUnitcm2=cm2
SurfaceUnitmm2=mm2
SurfaceUnitfoot2=ft2
SurfaceUnitinch2=in2
Volume=Volume
TotalVolume=Total volume
VolumeUnitm3=m3
VolumeUnitdm3=dm3
VolumeUnitcm3=cm3
VolumeUnitmm3=mm3
VolumeUnitfoot3=ft3
VolumeUnitinch3=in3
VolumeUnitounce=ounce
VolumeUnitlitre=litre
VolumeUnitgallon=gallon

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

@ -102,12 +102,16 @@ SurfaceUnitm2=m2
SurfaceUnitdm2=dm2
SurfaceUnitcm2=cm2
SurfaceUnitmm2=mm2
SurfaceUnitfoot2=pied2
SurfaceUnitinch2=pouce2
Volume=Volume
TotalVolume=Volume total
VolumeUnitm3=m3
VolumeUnitdm3=dm3 (l)
VolumeUnitcm3=cm3 (ml)
VolumeUnitmm3=mm3 (µl)
VolumeUnitfoot3=pied3
VolumeUnitinch3=pouce3
VolumeUnitounce=once
VolumeUnitlitre=litre
VolumeUnitgallon=gallon

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

@ -172,9 +172,9 @@ class FormProduct
$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,97=>1,99=>1,/* 98=>1 */); // Liter is not used as already available with dm3
else if ($measuring_style == 'size') $measuring_units=array(-3=>1,-2=>1,-1=>1,0=>1,98=>1,99=>1);
else if ($measuring_style == 'surface') $measuring_units=array(-6=>1,-4=>1,-2=>1,0=>1,98=>1,99=>1);
else if ($measuring_style == 'volume') $measuring_units=array(-9=>1,-6=>1,-3=>1,0=>1,88=>1,89=>1,97=>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>';