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

Fix: Better translation

Browse Source
This commit is contained in:
Laurent Destailleur 2010-07-13 19:38:39 +00:00
parent 4069b157ad
commit 87af5f13f4
4 changed files with 24 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
htdocs/expedition/fiche.php
View File

@ -820,13 +820,13 @@ else
} }
// Weight // Weight
print '<tr><td>'.$html->editfieldkey("TotalWeight",'trueWeight',$expedition->trueWeight,'id',$expedition->id,$user->rights->expedition->creer).'</td><td colspan="3">'; print '<tr><td>'.$html->editfieldkey("Weight",'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 $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 $expedition->weight_units?measuring_units_string($expedition->weight_units,"weight"):'';
print '</td></tr>'; print '</td></tr>';
// Volume Total // Volume Total
print '<tr><td>'.$langs->trans("TotalVolume").'</td>'; print '<tr><td>'.$langs->trans("Volume").'</td>';
print '<td colspan="3">'; print '<td colspan="3">';
if ($expedition->trueVolume) if ($expedition->trueVolume)
{ {
@ -927,8 +927,9 @@ else
print '<td align="center">'.$langs->trans("QtyShipped").'</td>'; print '<td align="center">'.$langs->trans("QtyShipped").'</td>';
} }
print '<td align="center">'.$langs->trans("Weight").'</td>'; print '<td align="center">'.$langs->trans("CalculatedWeight").'</td>';
print '<td align="center">'.$langs->trans("Volume").'</td>'; print '<td align="center">'.$langs->trans("CalculatedVolume").'</td>';
//print '<td align="center">'.$langs->trans("Size").'</td>';
if ($conf->stock->enabled) if ($conf->stock->enabled)
{ {
@ -942,7 +943,7 @@ else
{ {
print "<tr ".$bc[$var].">"; print "<tr ".$bc[$var].">";
// Product // Predefined product or service
if ($lignes[$i]->fk_product > 0) if ($lignes[$i]->fk_product > 0)
{ {
print '<td>'; print '<td>';
@ -978,11 +979,20 @@ else
// Qte a expedier ou expedier // Qte a expedier ou expedier
print '<td align="center">'.$lignes[$i]->qty_shipped.'</td>'; print '<td align="center">'.$lignes[$i]->qty_shipped.'</td>';
// Poids // Weight
print '<td align="center">'.$lignes[$i]->weight*$lignes[$i]->qty_shipped.' '.measuring_units_string($lignes[$i]->weight_units,"weight").'</td>'; 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 // 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 // Entrepot source
if ($conf->stock->enabled) if ($conf->stock->enabled)

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

@ -70,6 +70,8 @@ FeaturesSupported=Features supported
Width=Width Width=Width
Height=Height Height=Height
Depth=Depth Depth=Depth
CalculatedWeight=Calculated weight
CalculatedVolume=Calculated volume
Weight=Weight Weight=Weight
TotalWeight=Total weight TotalWeight=Total weight
WeightUnitton=tonnes WeightUnitton=tonnes

2
htdocs/langs/en_US/sendings.lang
View File

@ -27,7 +27,7 @@ DateSending=Date sending order
DateSendingShort=Date sending order DateSendingShort=Date sending order
SendingsForSameOrder=Shipments for this order SendingsForSameOrder=Shipments for this order
SendingsAndReceivingForSameOrder=Shipments and receivings for this order SendingsAndReceivingForSameOrder=Shipments and receivings for this order
SendingsToValidate=Sending to validate SendingsToValidate=Shipments to validate
StatusSendingCanceled=Canceled StatusSendingCanceled=Canceled
StatusSendingDraft=Draft StatusSendingDraft=Draft
StatusSendingValidated=Validated (products to ship or already shipped) StatusSendingValidated=Validated (products to ship or already shipped)

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

@ -70,6 +70,8 @@ FeaturesSupported=Fonctionnalités supportées
Width=Largeur Width=Largeur
Height=Hauteur Height=Hauteur
Depth=Profondeur Depth=Profondeur
CalculatedWeight=Poids calculé
CalculatedVolume=Volume calculé
Weight=Poids Weight=Poids
TotalWeight=Poids total TotalWeight=Poids total
WeightUnitton=tonnes WeightUnitton=tonnes