From d0d5891eefc3d0d5f62cd2dcc9e139475efe6405 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 27 Aug 2012 20:02:23 +0200
Subject: [PATCH] New: Add unit foot2, inch2, foot3 and inch3 for surface and
 volumes.

---
 ChangeLog                                       | 1 +
 htdocs/core/lib/product.lib.php                 | 8 ++++++--
 htdocs/langs/en_US/other.lang                   | 4 ++++
 htdocs/langs/fr_FR/other.lang                   | 4 ++++
 htdocs/product/class/html.formproduct.class.php | 6 +++---
 5 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 33370d56006..8d51bd475ac 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -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.
diff --git a/htdocs/core/lib/product.lib.php b/htdocs/core/lib/product.lib.php
index 391e180e839..eb2de353ca9 100644
--- a/htdocs/core/lib/product.lib.php
+++ b/htdocs/core/lib/product.lib.php
@@ -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");
 	}
diff --git a/htdocs/langs/en_US/other.lang b/htdocs/langs/en_US/other.lang
index 650dde25d0e..324a0e24ee6 100644
--- a/htdocs/langs/en_US/other.lang
+++ b/htdocs/langs/en_US/other.lang
@@ -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
diff --git a/htdocs/langs/fr_FR/other.lang b/htdocs/langs/fr_FR/other.lang
index 75cb28c67d0..670940a8a10 100644
--- a/htdocs/langs/fr_FR/other.lang
+++ b/htdocs/langs/fr_FR/other.lang
@@ -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
diff --git a/htdocs/product/class/html.formproduct.class.php b/htdocs/product/class/html.formproduct.class.php
index ff96ccf80f1..de861d5a3f7 100644
--- a/htdocs/product/class/html.formproduct.class.php
+++ b/htdocs/product/class/html.formproduct.class.php
@@ -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>';