From 87af5f13f47250ffd6cc48bfdd2375eb1efab9a9 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@users.sourceforge.net>
Date: Tue, 13 Jul 2010 19:38:39 +0000
Subject: [PATCH] Fix: Better translation

---
 htdocs/expedition/fiche.php      | 28 +++++++++++++++++++---------
 htdocs/langs/en_US/other.lang    |  2 ++
 htdocs/langs/en_US/sendings.lang |  2 +-
 htdocs/langs/fr_FR/other.lang    |  2 ++
 4 files changed, 24 insertions(+), 10 deletions(-)

diff --git a/htdocs/expedition/fiche.php b/htdocs/expedition/fiche.php
index 166559903fd..abc9de6ac53 100644
--- a/htdocs/expedition/fiche.php
+++ b/htdocs/expedition/fiche.php
@@ -820,13 +820,13 @@ else
 			}
 
 			// Weight
-			print '<tr><td>'.$html->editfieldkey("TotalWeight",'trueWeight',$expedition->trueWeight,'id',$expedition->id,$user->rights->expedition->creer).'</td><td colspan="3">';
-			print $html->editfieldval("TotalWeight",'trueWeight',$expedition->trueWeight,'id',$expedition->id,$user->rights->expedition->creer);
+			print '<tr><td>'.$html->editfieldkey("Weight",'trueWeight',$expedition->trueWeight,'id',$expedition->id,$user->rights->expedition->creer).'</td><td colspan="3">';
+			print $html->editfieldval("Weight",'trueWeight',$expedition->trueWeight,'id',$expedition->id,$user->rights->expedition->creer);
 			print $expedition->weight_units?measuring_units_string($expedition->weight_units,"weight"):'';
 			print '</td></tr>';
 
 			// Volume Total
-			print '<tr><td>'.$langs->trans("TotalVolume").'</td>';
+			print '<tr><td>'.$langs->trans("Volume").'</td>';
 			print '<td colspan="3">';
 			if ($expedition->trueVolume)
 			{
@@ -927,8 +927,9 @@ else
 				print '<td align="center">'.$langs->trans("QtyShipped").'</td>';
 			}
 
-			print '<td align="center">'.$langs->trans("Weight").'</td>';
-			print '<td align="center">'.$langs->trans("Volume").'</td>';
+			print '<td align="center">'.$langs->trans("CalculatedWeight").'</td>';
+			print '<td align="center">'.$langs->trans("CalculatedVolume").'</td>';
+			//print '<td align="center">'.$langs->trans("Size").'</td>';
 
 			if ($conf->stock->enabled)
 			{
@@ -942,7 +943,7 @@ else
 			{
 				print "<tr ".$bc[$var].">";
 
-				// Product
+				// Predefined product or service
 				if ($lignes[$i]->fk_product > 0)
 				{
 					print '<td>';
@@ -978,11 +979,20 @@ else
 				// Qte a expedier ou expedier
 				print '<td align="center">'.$lignes[$i]->qty_shipped.'</td>';
 
-				// Poids
-				print '<td align="center">'.$lignes[$i]->weight*$lignes[$i]->qty_shipped.' '.measuring_units_string($lignes[$i]->weight_units,"weight").'</td>';
+				// Weight
+				print '<td align="center">';
+				if ($lignes[$i]->fk_product_type == 0) print $lignes[$i]->weight*$lignes[$i]->qty_shipped.' '.measuring_units_string($lignes[$i]->weight_units,"weight");
+				else print '&nbsp;';
+				print '</td>';
 
 				// Volume
-				print '<td align="center">'.$lignes[$i]->volume*$lignes[$i]->qty_shipped.' '.measuring_units_string($lignes[$i]->volume_units,"volume").'</td>';
+				print '<td align="center">';
+				if ($lignes[$i]->fk_product_type == 0) print $lignes[$i]->volume*$lignes[$i]->qty_shipped.' '.measuring_units_string($lignes[$i]->volume_units,"volume");
+				else print '&nbsp;';
+				print '</td>';
+
+				// Size
+				//print '<td align="center">'.$lignes[$i]->volume*$lignes[$i]->qty_shipped.' '.measuring_units_string($lignes[$i]->volume_units,"volume").'</td>';
 
 				// Entrepot source
 				if ($conf->stock->enabled)
diff --git a/htdocs/langs/en_US/other.lang b/htdocs/langs/en_US/other.lang
index 3415eff6db1..fadc7744c6c 100644
--- a/htdocs/langs/en_US/other.lang
+++ b/htdocs/langs/en_US/other.lang
@@ -70,6 +70,8 @@ FeaturesSupported=Features supported
 Width=Width
 Height=Height
 Depth=Depth
+CalculatedWeight=Calculated weight
+CalculatedVolume=Calculated volume
 Weight=Weight
 TotalWeight=Total weight
 WeightUnitton=tonnes
diff --git a/htdocs/langs/en_US/sendings.lang b/htdocs/langs/en_US/sendings.lang
index 3a7995940d5..4963625d276 100644
--- a/htdocs/langs/en_US/sendings.lang
+++ b/htdocs/langs/en_US/sendings.lang
@@ -27,7 +27,7 @@ DateSending=Date sending order
 DateSendingShort=Date sending order
 SendingsForSameOrder=Shipments for this order
 SendingsAndReceivingForSameOrder=Shipments and receivings for this order
-SendingsToValidate=Sending to validate
+SendingsToValidate=Shipments to validate
 StatusSendingCanceled=Canceled
 StatusSendingDraft=Draft
 StatusSendingValidated=Validated (products to ship or already shipped)
diff --git a/htdocs/langs/fr_FR/other.lang b/htdocs/langs/fr_FR/other.lang
index 77e32646da8..43ed577ed8a 100644
--- a/htdocs/langs/fr_FR/other.lang
+++ b/htdocs/langs/fr_FR/other.lang
@@ -70,6 +70,8 @@ FeaturesSupported=Fonctionnalités supportées
 Width=Largeur
 Height=Hauteur
 Depth=Profondeur
+CalculatedWeight=Poids calculé
+CalculatedVolume=Volume calculé
 Weight=Poids
 TotalWeight=Poids total
 WeightUnitton=tonnes