diff --git a/htdocs/admin/confexped.php b/htdocs/admin/confexped.php
index d9be768461ffa088a69e55ddf0ab9205253a99ab..de10a5b8e4fbf5daaabc61af69ff8cba0a1ed296 100644
--- a/htdocs/admin/confexped.php
+++ b/htdocs/admin/confexped.php
@@ -87,7 +87,7 @@ $h++;
if (! empty($conf->global->MAIN_SUBMODULE_EXPEDITION))
{
$head[$h][0] = DOL_URL_ROOT."/admin/expedition.php";
- $head[$h][1] = $langs->trans("Sending");
+ $head[$h][1] = $langs->trans("Shipment");
$h++;
}
diff --git a/htdocs/admin/expedition.php b/htdocs/admin/expedition.php
index d0d21e43e6494c9ab8972ac88e1d84532a704e01..0e0008a54b79c432391ea8c7ad547894c4625e43 100644
--- a/htdocs/admin/expedition.php
+++ b/htdocs/admin/expedition.php
@@ -210,7 +210,7 @@ $head[$h][1] = $langs->trans("Setup");
$h++;
$head[$h][0] = DOL_URL_ROOT."/admin/expedition.php";
-$head[$h][1] = $langs->trans("Sending");
+$head[$h][1] = $langs->trans("Shipment");
$hselected=$h;
$h++;
@@ -225,7 +225,7 @@ dol_fiche_head($head, $hselected, $langs->trans("ModuleSetup"));
/*
* Expedition numbering model
- */
+ */
print_titre($langs->trans("SendingsNumberingModules"));
@@ -260,13 +260,13 @@ foreach ($dirmodels as $reldir)
require_once $dir.$file.'.php';
$module = new $file;
-
+
if ($module->isEnabled())
{
// Show modules according to features level
if ($module->version == 'development' && $conf->global->MAIN_FEATURES_LEVEL < 2) continue;
if ($module->version == 'experimental' && $conf->global->MAIN_FEATURES_LEVEL < 1) continue;
-
+
$var=!$var;
print '<tr '.$bc[$var].'><td>'.$module->nom."</td>\n";
print '<td>';
@@ -276,8 +276,8 @@ foreach ($dirmodels as $reldir)
// Show example of numbering module
print '<td class="nowrap">';
$tmp=$module->getExample();
- if (preg_match('/^Error/',$tmp)) {
- $langs->load("errors"); print '<div class="error">'.$langs->trans($tmp).'</div>';
+ if (preg_match('/^Error/',$tmp)) {
+ $langs->load("errors"); print '<div class="error">'.$langs->trans($tmp).'</div>';
}
elseif ($tmp=='NotConfigured') print $langs->trans($tmp);
else print $tmp;
diff --git a/htdocs/admin/livraison.php b/htdocs/admin/livraison.php
index 96e84af3d58a10cde37494471665db6d52a735ed..566025087773a996184fbd928fc212080085bb85 100644
--- a/htdocs/admin/livraison.php
+++ b/htdocs/admin/livraison.php
@@ -192,7 +192,7 @@ $h++;
if (! empty($conf->global->MAIN_SUBMODULE_EXPEDITION))
{
$head[$h][0] = DOL_URL_ROOT."/admin/expedition.php";
- $head[$h][1] = $langs->trans("Sending");
+ $head[$h][1] = $langs->trans("Shipment");
$h++;
}
@@ -207,7 +207,7 @@ dol_fiche_head($head, $hselected, $langs->trans("ModuleSetup"));
/*
* Livraison numbering model
*/
-
+
print_titre($langs->trans("DeliveryOrderNumberingModules"));
print '<table class="noborder" width="100%">';
@@ -240,13 +240,13 @@ foreach ($dirmodels as $reldir)
require_once $dir.$file.'.php';
$module = new $file;
-
+
if ($module->isEnabled())
{
// Show modules according to features level
if ($module->version == 'development' && $conf->global->MAIN_FEATURES_LEVEL < 2) continue;
if ($module->version == 'experimental' && $conf->global->MAIN_FEATURES_LEVEL < 1) continue;
-
+
$var=!$var;
print '<tr '.$bc[$var].'><td>'.$module->nom."</td><td>\n";
print $module->info();
@@ -255,8 +255,8 @@ foreach ($dirmodels as $reldir)
// Show example of numbering module
print '<td class="nowrap">';
$tmp=$module->getExample();
- if (preg_match('/^Error/',$tmp)) {
- $langs->load("errors"); print '<div class="error">'.$langs->trans($tmp).'</div>';
+ if (preg_match('/^Error/',$tmp)) {
+ $langs->load("errors"); print '<div class="error">'.$langs->trans($tmp).'</div>';
}
elseif ($tmp=='NotConfigured') print $langs->trans($tmp);
else print $tmp;
@@ -315,7 +315,7 @@ print '</table>';
print '<br>';
print_titre($langs->trans("DeliveryOrderModel"));
-// Defini tableau def de modele
+// Defini tableau def de modele
$type="delivery";
$def = array();
diff --git a/htdocs/core/lib/order.lib.php b/htdocs/core/lib/order.lib.php
index 25fa766aa3d9be31aadb6284e9718c80f48b8c40..216887139d4ff0a94f230fe29b3332e1dfb1912d 100644
--- a/htdocs/core/lib/order.lib.php
+++ b/htdocs/core/lib/order.lib.php
@@ -52,7 +52,7 @@ function commande_prepare_head($object)
|| ($conf->livraison_bon->enabled && $user->rights->expedition->livraison->lire))
{
$head[$h][0] = DOL_URL_ROOT.'/expedition/shipment.php?id='.$object->id;
- if ($conf->expedition_bon->enabled) $text=$langs->trans("Sendings");
+ if ($conf->expedition_bon->enabled) $text=$langs->trans("Shipment");
if ($conf->expedition_bon->enabled && $conf->livraison_bon->enabled) $text.='/';
if ($conf->livraison_bon->enabled) $text.=$langs->trans("Receivings");
$head[$h][1] = $text;
@@ -93,7 +93,7 @@ function commande_prepare_head($object)
$head[$h][2] = 'note';
$h++;
}
-
+
require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
$upload_dir = $conf->commande->dir_output . "/" . dol_sanitizeFileName($object->ref);
$nbFiles = count(dol_dir_list($upload_dir,'files'));
@@ -137,7 +137,7 @@ function order_admin_prepare_head($object)
$head[$h][1] = $langs->trans("ExtraFields");
$head[$h][2] = 'attributes';
$h++;
-
+
$head[$h][0] = DOL_URL_ROOT.'/admin/orderdet_extrafields.php';
$head[$h][1] = $langs->trans("ExtraFieldsLines");
$head[$h][2] = 'attributeslines';
diff --git a/htdocs/core/lib/propal.lib.php b/htdocs/core/lib/propal.lib.php
index 34ab3bb53554c672ecc26c48d324281c871c6cc7..435567bebae449033802ada1145299127b1f2e69 100644
--- a/htdocs/core/lib/propal.lib.php
+++ b/htdocs/core/lib/propal.lib.php
@@ -48,7 +48,7 @@ function propal_prepare_head($object)
{
$langs->load("sendings");
$head[$h][0] = DOL_URL_ROOT.'/expedition/propal.php?id='.$object->id;
- if ($conf->expedition_bon->enabled) $text=$langs->trans("Sendings");
+ if ($conf->expedition_bon->enabled) $text=$langs->trans("Shipment");
if ($conf->livraison_bon->enabled) $text.='/'.$langs->trans("Receivings");
$head[$h][1] = $text;
$head[$h][2] = 'shipping';
@@ -135,7 +135,7 @@ function propal_admin_prepare_head($object)
$head[$h][1] = $langs->trans("ExtraFields");
$head[$h][2] = 'attributes';
$h++;
-
+
$head[$h][0] = DOL_URL_ROOT.'/comm/admin/propaldet_extrafields.php';
$head[$h][1] = $langs->trans("ExtraFieldsLines");
$head[$h][2] = 'attributeslines';
diff --git a/htdocs/core/modules/expedition/doc/pdf_merou.modules.php b/htdocs/core/modules/expedition/doc/pdf_merou.modules.php
index 614ccbcc0c1bceab8c9e38e26d9e5736cd94bfcf..dc189262bb2c484b90bd3b16c400512f3f15aa27 100644
--- a/htdocs/core/modules/expedition/doc/pdf_merou.modules.php
+++ b/htdocs/core/modules/expedition/doc/pdf_merou.modules.php
@@ -172,10 +172,10 @@ class pdf_merou extends ModelePdfExpedition
if (method_exists($pdf,'AliasNbPages')) $pdf->AliasNbPages();
$pdf->SetTitle($outputlangs->convToOutputCharset($object->ref));
- $pdf->SetSubject($outputlangs->transnoentities("Sending"));
+ $pdf->SetSubject($outputlangs->transnoentities("Shipment"));
$pdf->SetCreator("Dolibarr ".DOL_VERSION);
$pdf->SetAuthor($outputlangs->convToOutputCharset($user->getFullName($outputlangs)));
- $pdf->SetKeyWords($outputlangs->convToOutputCharset($object->ref)." ".$outputlangs->transnoentities("Sending"));
+ $pdf->SetKeyWords($outputlangs->convToOutputCharset($object->ref)." ".$outputlangs->transnoentities("Shipment"));
if (! empty($conf->global->MAIN_DISABLE_PDF_COMPRESSION)) $pdf->SetCompression(false);
$pdf->SetMargins($this->marge_gauche, $this->marge_haute, $this->marge_droite); // Left, Top, Right
diff --git a/htdocs/core/modules/expedition/doc/pdf_rouget.modules.php b/htdocs/core/modules/expedition/doc/pdf_rouget.modules.php
index a541b7b2b1e0c1ce0d748432002359e062e2059b..4394c3200f5a9e46f80830c3674e9cb97cb042a5 100644
--- a/htdocs/core/modules/expedition/doc/pdf_rouget.modules.php
+++ b/htdocs/core/modules/expedition/doc/pdf_rouget.modules.php
@@ -157,10 +157,10 @@ class pdf_rouget extends ModelePdfExpedition
if (method_exists($pdf,'AliasNbPages')) $pdf->AliasNbPages();
$pdf->SetTitle($outputlangs->convToOutputCharset($object->ref));
- $pdf->SetSubject($outputlangs->transnoentities("Sending"));
+ $pdf->SetSubject($outputlangs->transnoentities("Shipment"));
$pdf->SetCreator("Dolibarr ".DOL_VERSION);
$pdf->SetAuthor($outputlangs->convToOutputCharset($user->getFullName($outputlangs)));
- $pdf->SetKeyWords($outputlangs->convToOutputCharset($object->ref)." ".$outputlangs->transnoentities("Sending"));
+ $pdf->SetKeyWords($outputlangs->convToOutputCharset($object->ref)." ".$outputlangs->transnoentities("Shipment"));
if (! empty($conf->global->MAIN_DISABLE_PDF_COMPRESSION)) $pdf->SetCompression(false);
$pdf->SetMargins($this->marge_gauche, $this->marge_haute, $this->marge_droite); // Left, Top, Right
diff --git a/htdocs/core/modules/expedition/mod_expedition_ribera.php b/htdocs/core/modules/expedition/mod_expedition_ribera.php
index ddbc494622cb30e4653b93025fe93641679a0540..f40d3d361a02481045c639c3eb407412d86f5b3f 100644
--- a/htdocs/core/modules/expedition/mod_expedition_ribera.php
+++ b/htdocs/core/modules/expedition/mod_expedition_ribera.php
@@ -53,10 +53,10 @@ class mod_expedition_ribera extends ModelNumRefExpedition
$texte.= '<input type="hidden" name="maskconstexpedition" value="EXPEDITION_RIBERA_MASK">';
$texte.= '<table class="nobordernopadding" width="100%">';
- $tooltip=$langs->trans("GenericMaskCodes",$langs->transnoentities("Sending"),$langs->transnoentities("Sending"));
+ $tooltip=$langs->trans("GenericMaskCodes",$langs->transnoentities("Shipment"),$langs->transnoentities("Shipment"));
$tooltip.=$langs->trans("GenericMaskCodes2");
$tooltip.=$langs->trans("GenericMaskCodes3");
- $tooltip.=$langs->trans("GenericMaskCodes4a",$langs->transnoentities("Sending"),$langs->transnoentities("Sending"));
+ $tooltip.=$langs->trans("GenericMaskCodes4a",$langs->transnoentities("Shipment"),$langs->transnoentities("Shipment"));
$tooltip.=$langs->trans("GenericMaskCodes5");
$texte.= '<tr><td>'.$langs->trans("Mask").':</td>';
diff --git a/htdocs/expedition/contact.php b/htdocs/expedition/contact.php
index bd396f0e8f5df2f75c52cfe5ad3b35caae025ab5..ef5faa79e3b05b895f8d359ba3a1ba4b07f892e9 100644
--- a/htdocs/expedition/contact.php
+++ b/htdocs/expedition/contact.php
@@ -153,7 +153,7 @@ if ($id > 0 || ! empty($ref))
$langs->trans("OrderCard");
$head = shipping_prepare_head($object);
- dol_fiche_head($head, 'contact', $langs->trans("Sending"), 0, 'sending');
+ dol_fiche_head($head, 'contact', $langs->trans("Shipment"), 0, 'sending');
/*
diff --git a/htdocs/expedition/fiche.php b/htdocs/expedition/fiche.php
index f0d6e5fd8bdbfa2e15cd8f5b4783ba40b4cbd55a..000bd9a5b81f304148ebcfb6ffae55ca6f4569b5 100644
--- a/htdocs/expedition/fiche.php
+++ b/htdocs/expedition/fiche.php
@@ -87,7 +87,7 @@ if ($id > 0 || ! empty($ref))
if ($action == 'add')
{
$error=0;
-
+
$object = new Expedition($db);
$db->begin();
@@ -517,7 +517,7 @@ else if ($action == 'classifybilled')
* View
*/
-llxHeader('',$langs->trans('Sending'),'Expedition');
+llxHeader('',$langs->trans('Shipment'),'Expedition');
$form = new Form($db);
$formfile = new FormFile($db);
@@ -916,7 +916,7 @@ else
$soc->fetch($object->socid);
$head=shipping_prepare_head($object);
- dol_fiche_head($head, 'shipping', $langs->trans("Sending"), 0, 'sending');
+ dol_fiche_head($head, 'shipping', $langs->trans("Shipment"), 0, 'sending');
dol_htmloutput_mesg($mesg);
@@ -926,7 +926,7 @@ else
if ($action == 'delete')
{
print $form->formconfirm($_SERVER['PHP_SELF'].'?id='.$object->id,$langs->trans('DeleteSending'),$langs->trans("ConfirmDeleteSending",$object->ref),'confirm_delete','',0,1);
-
+
}
/*
@@ -955,7 +955,7 @@ else
}
print $form->formconfirm($_SERVER['PHP_SELF'].'?id='.$object->id,$langs->trans('ValidateSending'),$text,'confirm_valid','',0,1);
-
+
}
/*
* Confirmation de l'annulation
@@ -963,7 +963,7 @@ else
if ($action == 'annuler')
{
print $form->formconfirm($_SERVER['PHP_SELF'].'?id='.$object->id,$langs->trans('CancelSending'),$langs->trans("ConfirmCancelSending",$object->ref),'confirm_cancel','',0,1);
-
+
}
// Calculate true totalWeight and totalVolume for all products
diff --git a/htdocs/expedition/index.php b/htdocs/expedition/index.php
index 94dd06c5b73cb76fe98dce2271a9b2e255bac83a..33082aa9193bd12c244b09071cd1b0017e860ffb 100644
--- a/htdocs/expedition/index.php
+++ b/htdocs/expedition/index.php
@@ -39,7 +39,7 @@ $companystatic=new Societe($db);
$shipment=new Expedition($db);
$helpurl='EN:Module_Shipments|FR:Module_Expéditions|ES:Módulo_Expediciones';
-llxHeader('',$langs->trans("Sendings"),$helpurl);
+llxHeader('',$langs->trans("Shipment"),$helpurl);
print_fiche_titre($langs->trans("SendingsArea"));
diff --git a/htdocs/expedition/note.php b/htdocs/expedition/note.php
index 2fcd18fef130f67c6b1bb1181e24e593d850d55c..d0300dad27852da981a295c2eeda9e374d8b343c 100644
--- a/htdocs/expedition/note.php
+++ b/htdocs/expedition/note.php
@@ -88,7 +88,7 @@ if ($id > 0 || ! empty($ref))
$soc->fetch($object->socid);
$head=shipping_prepare_head($object);
- dol_fiche_head($head, 'note', $langs->trans("Sending"), 0, 'sending');
+ dol_fiche_head($head, 'note', $langs->trans("Shipment"), 0, 'sending');
print '<table class="border" width="100%">';
diff --git a/htdocs/langs/en_US/orders.lang b/htdocs/langs/en_US/orders.lang
index 661883a3f12fe5d23774fcb2d3adc7d5c6bfdc26..2ef1b49e1525c403b6ff7ce91b8bdd04f15d6c30 100644
--- a/htdocs/langs/en_US/orders.lang
+++ b/htdocs/langs/en_US/orders.lang
@@ -56,8 +56,6 @@ DraftOrWaitingShipped=Draft or validated not yet shipped
MenuOrdersToBill=Orders delivered
MenuOrdersToBill2=Orders to bill
SearchOrder=Search order
-Sending=Sending
-Sendings=Sendings
ShipProduct=Ship product
Discount=Discount
CreateOrder=Create Order
diff --git a/htdocs/langs/en_US/sendings.lang b/htdocs/langs/en_US/sendings.lang
index 2b7c7f9814063b5728570df6fa4d7ff51a39155e..609066453abab87fa3f3d6e10bf4d2042a05ac7d 100644
--- a/htdocs/langs/en_US/sendings.lang
+++ b/htdocs/langs/en_US/sendings.lang
@@ -3,6 +3,7 @@ CHARSET=UTF-8
RefSending=Ref. shipment
Sending=Shipment
Sendings=Shipments
+Shipment=Shipment
Shipments=Shipments
Receivings=Receivings
SendingsArea=Shipments area
diff --git a/htdocs/langs/fr_FR/orders.lang b/htdocs/langs/fr_FR/orders.lang
index 79796a0a90772192953d0871f972c433abead5b7..644075e9a6bdb227734be062df22987eb9d6d45a 100644
--- a/htdocs/langs/fr_FR/orders.lang
+++ b/htdocs/langs/fr_FR/orders.lang
@@ -56,8 +56,6 @@ DraftOrWaitingShipped=Brouillon ou validée pas encore expédiée
MenuOrdersToBill=Commandes délivrées
MenuOrdersToBill2=Commandes à facturer
SearchOrder=Rechercher une commande
-Sending=Expédition
-Sendings=Expéditions
ShipProduct=Expédier produit
Discount=Remise
CreateOrder=Créer Commande
diff --git a/htdocs/langs/fr_FR/sendings.lang b/htdocs/langs/fr_FR/sendings.lang
index a4ddaafef013c2c61cdb461c36db1c32308868ca..3d8088624c68b44f4633a971d6074f3515c6ea6a 100644
--- a/htdocs/langs/fr_FR/sendings.lang
+++ b/htdocs/langs/fr_FR/sendings.lang
@@ -3,6 +3,7 @@ CHARSET=UTF-8
RefSending=Réf. expédition
Sending=Expédition
Sendings=Expéditions
+Shipment=Expédition
Shipments=Expéditions
Receivings=Réceptions
SendingsArea=Espace expéditions
diff --git a/htdocs/livraison/fiche.php b/htdocs/livraison/fiche.php
index 44c0bc911665a039ee50c29e6b5bb178600373ff..9fdb13ffe40ae922a5e00c097101874ebfddf154 100644
--- a/htdocs/livraison/fiche.php
+++ b/htdocs/livraison/fiche.php
@@ -479,7 +479,7 @@ else
$soc->fetch($delivery->socid);
$head=delivery_prepare_head($delivery);
- dol_fiche_head($head, 'delivery', $langs->trans("Sending"), 0, 'sending');
+ dol_fiche_head($head, 'delivery', $langs->trans("Shipment"), 0, 'sending');
/*
* Confirmation de la suppression
@@ -489,7 +489,7 @@ else
{
$expedition_id = $_GET["expid"];
print $form->formconfirm($_SERVER['PHP_SELF'].'?id='.$delivery->id.'&expid='.$expedition_id,$langs->trans("DeleteDeliveryReceipt"),$langs->trans("DeleteDeliveryReceiptConfirm",$delivery->ref),'confirm_delete','','',1);
-
+
}
/*
@@ -499,7 +499,7 @@ else
if ($action == 'valid')
{
print $form->formconfirm($_SERVER['PHP_SELF'].'?id='.$delivery->id,$langs->trans("ValidateDeliveryReceipt"),$langs->trans("ValidateDeliveryReceiptConfirm",$delivery->ref),'confirm_valid','','',1);
-
+
}