From 435ef3594a852db2ee2f24b57589aec39481a66e Mon Sep 17 00:00:00 2001
From: Philippe Grand <philippe.grand@atoo-net.com>
Date: Mon, 22 Mar 2010 13:32:55 +0000
Subject: [PATCH] add volume unit and measure within products

---
 htdocs/html.formproduct.class.php |  7 +++++++
 htdocs/langs/fr_FR/other.lang     |  4 ++++
 htdocs/product.class.php          | 10 +++++++++-
 3 files changed, 20 insertions(+), 1 deletion(-)

diff --git a/htdocs/html.formproduct.class.php b/htdocs/html.formproduct.class.php
index 77ae6cd2ec7..e71a11c2477 100644
--- a/htdocs/html.formproduct.class.php
+++ b/htdocs/html.formproduct.class.php
@@ -159,6 +159,13 @@ class FormProduct
 			$measuring_units[-6] = $langs->trans("VolumeUnitcm3");
 			$measuring_units[-9] = $langs->trans("VolumeUnitmm3");
 		}
+		else if ($measuring_style == 'volume_liquide')
+		{
+			$measuring_units[0] = $langs->trans("VolumeUnitm3");
+			$measuring_units[-3] = $langs->trans("VolumeUnitl");
+			$measuring_units[-4] = $langs->trans("VolumeUnitdl");
+			$measuring_units[-6] = $langs->trans("VolumeUnitml");
+		}
 
 		print '<select class="flat" name="'.$name.'">';
 		if ($adddefault) print '<option value="0">'.$langs->trans("Default").'</option>';
diff --git a/htdocs/langs/fr_FR/other.lang b/htdocs/langs/fr_FR/other.lang
index 1a72966d448..48be61010de 100644
--- a/htdocs/langs/fr_FR/other.lang
+++ b/htdocs/langs/fr_FR/other.lang
@@ -87,6 +87,10 @@ SurfaceUnitdm2=dm2
 SurfaceUnitcm2=cm2
 SurfaceUnitmm2=mm2
 Volume=Volume
+Volume_liquide=Volume liquide
+VolumeUnitl=l
+VolumeUnitdl=dl
+VolumeUnitml=ml
 TotalVolume=Volume total
 VolumeUnitm3=m3
 VolumeUnitdm3=dm3
diff --git a/htdocs/product.class.php b/htdocs/product.class.php
index d54a68e04c9..42d492156b7 100644
--- a/htdocs/product.class.php
+++ b/htdocs/product.class.php
@@ -94,6 +94,8 @@ class Product extends CommonObject
 	var $surface_units;
 	var $volume;
 	var $volume_units;
+	var $volume_liquide;
+	var $volume_l_units;
 
 	var $accountancy_code_buy;
 	var $accountancy_code_sell;
@@ -409,6 +411,8 @@ class Product extends CommonObject
 		$this->surface_units = trim($this->surface_units);
 		$this->volume = price2num($this->volume);
 		$this->volume_units = trim($this->volume_units);
+		$this->volume_liquide = price2num($this->volume_liquide);
+		$this->volume_l_units = trim($this->volume_l_units);
 		if (empty($this->tva_tx))    			$this->tva_tx = 0;
 		if (empty($this->finished))  			$this->finished = 0;
 		if (empty($this->hidden))   			$this->hidden = 0;
@@ -430,6 +434,8 @@ class Product extends CommonObject
 		$sql.= ",surface_units = " . ($this->surface_units!='' ? "'".$this->surface_units."'" : 'null');
 		$sql.= ",volume = " . ($this->volume!='' ? "'".$this->volume."'" : 'null');
 		$sql.= ",volume_units = " . ($this->volume_units!='' ? "'".$this->volume_units."'" : 'null');
+		$sql .= ",volume_liquide = " . ($this->volume_liquide!='' ? "'".$this->volume_liquide."'" : 'null');
+		$sql .= ",volume_l_units = " . ($this->volume_l_units!='' ? "'".$this->volume_l_units."'" : 'null');
 		$sql.= ",seuil_stock_alerte = " . ((isset($this->seuil_stock_alerte) && $this->seuil_stock_alerte != '') ? "'".$this->seuil_stock_alerte."'" : "null");
 		$sql.= ",description = '" . addslashes($this->description) ."'";
 		$sql.= ",note = '" .        addslashes($this->note) ."'";
@@ -926,7 +932,7 @@ class Product extends CommonObject
 		$sql = "SELECT rowid, ref, label, description, note, price, price_ttc,";
 		$sql.= " price_min, price_min_ttc, price_base_type, tva_tx, envente,";
 		$sql.= " fk_product_type, duration, seuil_stock_alerte, canvas,";
-		$sql.= " weight, weight_units, length, length_units, surface, surface_units, volume, volume_units, barcode, fk_barcode_type, finished, hidden,";
+		$sql.= " weight, weight_units, length, length_units, surface, surface_units, volume, volume_units, volume_liquide, volume_l_units, barcode, fk_barcode_type, finished, hidden,";
 		$sql.= " accountancy_code_buy, accountancy_code_sell, stock, pmp,";
 		$sql.= " import_key";
 		$sql.= " FROM ".MAIN_DB_PREFIX."product";
@@ -967,6 +973,8 @@ class Product extends CommonObject
 			$this->surface_units      = $result["surface_units"];
 			$this->volume             = $result["volume"];
 			$this->volume_units       = $result["volume_units"];
+			$this->volume_liquide     = $result["volume_liquide"];
+			$this->volume_l_units     = $result["volume_l_units"];
 			$this->barcode            = $result["barcode"];
 			$this->barcode_type       = $result["fk_barcode_type"];