--- /dolibarr/htdocs/html.form.class.php	2008-08-09 00:12:28.000000000 +0200
+++ /newdolibarr/htdocs/html.form.class.php	2008-10-28 09:12:55.000000000 +0100
@@ -2606,6 +2606,14 @@
       $measuring_units[-6] = $langs->trans("VolumeUnitcm3");
       $measuring_units[-9] = $langs->trans("VolumeUnitmm3");
     }
+	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");
+    }
+
 		
 		print '<select class="flat" name="'.$name.'">';
 		if ($adddefault) print '<option value="0">'.$langs->trans("Default").'</option>';
 	
--- /dolibarr/htdocs/expedition/expedition.class.php	2008-07-11 08:46:56.000000000 +0200
+++ /newdolibarr/htdocs/expedition/expedition.class.php	2008-10-27 17:47:01.000000000 +0100
 
 require_once(DOL_DOCUMENT_ROOT."/commonobject.class.php");
@@ -88,10 +88,10 @@
 		$this->db->begin();
 
 		$sql = "INSERT INTO ".MAIN_DB_PREFIX."expedition (ref, date_creation, fk_user_author, date_expedition";
-		$sql.= ", fk_soc";
+		$sql.= ", fk_soc,weight,size,width,height,weight_units,size_units";
 		$sql.= ")";
 		$sql.= " VALUES ('(PROV)', now(), $user->id, ".$this->db->idate($this->date_expedition);
-		$sql.= ", ".$this->socid;
+		$sql.= ", ".$this->socid.",".$this->weight.",".$this->sizeS.",".$this->sizeW.",".$this->sizeH.",".$this->weight_units.",".$this->size_units;
 		$sql.= ")";
 
 		$resql=$this->db->query($sql);
@@ -203,6 +203,7 @@
 		global $conf;
 
 		$sql = "SELECT e.rowid, e.fk_soc as socid, e.date_creation, e.ref, e.fk_user_author, e.fk_statut";
+		$sql.= ", weight, weight_units, size, size_units, width, height";
 		$sql.= ", ".$this->db->pdate("e.date_expedition")." as date_expedition, e.model_pdf, e.fk_adresse_livraison";
 		if ($conf->commande->enabled)
 		{
@@ -245,7 +246,10 @@
 				$this->date                 = $obj->date_expedition;
 				$this->adresse_livraison_id = $obj->fk_adresse_livraison;
 				$this->modelpdf             = $obj->model_pdf;
-			  
+			  	$this->trueWeight           = $obj->weight;
+				$this->weight_units         = $obj->weight_units;
+				$this->trueSize           	= $obj->size."x".$obj->width."x".$obj->height;
+				$this->size_units           = $obj->size_units;
 				if ($conf->commande->enabled)
 				{
 					$this->origin = "commande";
--- /dolibarr/htdocs/expedition/fiche.php	2008-08-21 09:39:38.000000000 +0200
+++ /newdolibarr/htdocs/expedition/fiche.php	2008-10-28 09:36:28.000000000 +0100
 require("./pre.inc.php");
@@ -73,6 +73,12 @@
   $expedition->note             = $_POST["note"];
   $expedition->origin           = $origin;
   $expedition->origin_id        = $origin_id;
+  $expedition->weight			= $_POST["weight"]==""?"NULL":$_POST["weight"];
+  $expedition->sizeH			= $_POST["sizeH"]==""?"NULL":$_POST["sizeH"];
+  $expedition->sizeW			= $_POST["sizeW"]==""?"NULL":$_POST["sizeW"];
+  $expedition->sizeS			= $_POST["sizeS"]==""?"NULL":$_POST["sizeS"];
+  $expedition->size_units		= $_POST["size_units"];
+  $expedition->weight_units	= $_POST["weight_units"];
 
    On boucle sur chaque ligne du document d'origine pour compléter objet expedition
    avec qté à livrer
@@ -282,9 +287,22 @@
 			{
 				print '<tr><td colspan="3">'.$langs->trans("NotePrivate").': '.nl2br($object->note)."</td></tr>";
 			}
-	
-			print "</table>";
-	
+			modification de l'ajout ici
+			print '<table><tr><td>';
+			print $langs->trans("Weight");
+			print '</td><td><input name="weight" size="4" value=""></td><td>';
+			print $html->select_measuring_units("weight_units","weight");
+			print '</td></tr><tr><td>';
+			print $langs->trans("width");
+			print ' </td><td><input name="sizeW" size="4" value=""></td>';
+			print '<td>&nbsp;</td></tr><tr><td>';
+			print $langs->trans("height");
+			print '</td><td><input name="sizeH" size="4" value=""></td><td>';
+			print $html->select_measuring_units("size_units","size");
+			print '</td></tr><tr><td>';
+			print $langs->trans("depth");
+			print '</td><td><input name="sizeS" size="4" value=""></td>';
+			print '<td>&nbsp;</td></tr></table>';
 			/*
 			* Lignes de commandes
 			*
@@ -511,13 +540,25 @@
             TODO: ajouter conversion pour le poids et le volume et selection de l'unité de mesure la plus utilisée
             $totalWeight = '';
             $totalVolume = '';
+			$weightUnit=-20;
+			$volumeUnit=-20;
             for ($i = 0 ; $i < $num_prod ; $i++)
             {
-            	$totalWeight += $lignes[$i]->weight*$lignes[$i]->qty_shipped;
+				if ( $lignes[$i]->weight_units > $weightUnit)
+				{
             	$weightUnit = $lignes[$i]->weight_units;
-            	$totalVolume += $lignes[$i]->volume*$lignes[$i]->qty_shipped;
+				}
+				$trueWeightUnit=pow(10,$lignes[$i]->weight_units);
+            	$totalWeight += $lignes[$i]->weight*$lignes[$i]->qty_shipped*$trueWeightUnit;
+
+				if ( $lignes[$i]->volume_units > $volumeUnit)
+                {
             	$volumeUnit = $lignes[$i]->volume_units;
             }
+            	$trueVolumeUnit=pow(10,$lignes[$i]->volume_units);
+				$totalVolume += $lignes[$i]->volume*$lignes[$i]->qty_shipped*$trueVolumeUnit;
+            }
+			$totalVolume=$totalVolume*pow(10,3);
 
             print '<table class="border" width="100%">';
 
@@ -563,8 +604,15 @@
    			    print '</tr>';
    			    
    			     Poids Total
-            print '<tr><td>'.$langs->trans("TotalWeight").'</td>';
+            print '<tr><td>'.$langs->trans("TotalWeight").' '.$toto.'</td>';
+			if($totalWeight >= $expedition->trueWeight*pow(10,$expedition->weight_units))
+			{
             print '<td colspan="3">'.$totalWeight.' '.measuring_units_string($weightUnit,"weight")."</td>\n";
+			}
+			else
+			{
+				print '<td colspan="3">'.$expedition->trueWeight.' '.measuring_units_string($expedition->weight_units,"weight")."</td>\n";
+			}
    			    print '</tr>';
    			    
    			     Volume Total
@@ -572,6 +620,11 @@
             print '<td colspan="3">'.$totalVolume.' '.measuring_units_string($volumeUnit,"volume")."</td>\n";
    			    print '</tr>';
 
+			  taille
+            print '<tr><td>'.$langs->trans("size").'</td>';
+            print '<td colspan="3">'.$expedition->trueSize.' '.measuring_units_string($expedition->size_units,"size")."</td>\n";
+                print '</tr>';
+
              Statut
             print '<tr><td>'.$langs->trans("Status").'</td>';
             print '<td colspan="3">'.$expedition->getLibStatut(4)."</td>\n";
--- /dolibarr/htdocs/lib/functions.lib.php	2008-08-19 23:08:14.000000000 +0200
+++ /newdolibarr/htdocs/lib/functions.lib.php	2008-10-28 08:50:22.000000000 +0100
 
@@ -2439,6 +2439,13 @@
 		$measuring_units[-6] = $langs->trans("VolumeUnitcm3");
 		$measuring_units[-9] = $langs->trans("VolumeUnitmm3");
 	}
+	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");
+	}
 
 	return $measuring_units[$unit];
 }
--- /dolibarr/htdocs/langs/fr_FR/other.lang	2008-04-21 14:02:34.000000000 +0200
+++ /newdolibarr/htdocs/langs/fr_FR/other.lang	2008-10-28 09:35:18.000000000 +0100
@@ -79,6 +79,14 @@
 VolumeUnitdm3=dm<SUP>3</SUP>
 VolumeUnitcm3=cm<SUP>3</SUP>
 VolumeUnitmm3=mm<SUP>3</SUP>
+height=hauteur
+width=largeur
+depth=profondeur
+size=taille
+SizeUnitm=m
+SizeUnitdm=dm
+SizeUnitcm=cm
+SizeUnitmm=mm
 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