diff --git a/htdocs/admin/company.php b/htdocs/admin/company.php index 7390e2e5fbe..84acb576407 100644 --- a/htdocs/admin/company.php +++ b/htdocs/admin/company.php @@ -118,7 +118,7 @@ if (($action == 'update' && !GETPOST("cancel", 'alpha')) // Remove to check file size to large /*if ($_FILES[$varforimage]["tmp_name"]) {*/ - $reg = array(); + $reg = array(); if (preg_match('/([^\\/:]+)$/i', $_FILES[$varforimage]["name"], $reg)) { $original_file = $reg[1]; diff --git a/htdocs/core/lib/reception.lib.php b/htdocs/core/lib/reception.lib.php index 16e036991f9..6cdbe2cd5eb 100644 --- a/htdocs/core/lib/reception.lib.php +++ b/htdocs/core/lib/reception.lib.php @@ -48,7 +48,7 @@ function reception_prepare_head(Reception $object) if ($object->statut == Reception::STATUS_DRAFT) { $head[$h][0] = DOL_URL_ROOT."/reception/dispatch.php?id=".$object->id; - $head[$h][1] = $langs->trans("DispatchCard"); + $head[$h][1] = $langs->trans("ReceptionDistribution"); $head[$h][2] = 'dispatch'; $h++; } diff --git a/htdocs/core/lib/sendings.lib.php b/htdocs/core/lib/sendings.lib.php index 60566dae909..45a9222e594 100644 --- a/htdocs/core/lib/sendings.lib.php +++ b/htdocs/core/lib/sendings.lib.php @@ -49,7 +49,7 @@ function shipping_prepare_head($object) if ($object->statut == Expedition::STATUS_DRAFT) { $head[$h][0] = DOL_URL_ROOT."/expedition/dispatch.php?id=".$object->id; - $head[$h][1] = $langs->trans("DispatchCard"); + $head[$h][1] = $langs->trans("ShipmentDistribution"); $head[$h][2] = 'dispatch'; $h++; } diff --git a/htdocs/langs/en_US/receptions.lang b/htdocs/langs/en_US/receptions.lang index 766f31de7f2..17a8202ffc6 100644 --- a/htdocs/langs/en_US/receptions.lang +++ b/htdocs/langs/en_US/receptions.lang @@ -54,4 +54,4 @@ ReceptionClassifyClosedInDolibarr=Reception %s classified Closed ReceptionUnClassifyCloseddInDolibarr=Reception %s re-open RestoreWithCurrentQtySaved=Fill quantities with latest saved values ReceptionUpdated=Reception sucessfully updated -DispatchCard=Reception distribution \ No newline at end of file +ReceptionDistribution=Reception distribution \ No newline at end of file diff --git a/htdocs/langs/en_US/sendings.lang b/htdocs/langs/en_US/sendings.lang index dbbb4926ec0..84f85fb13b4 100644 --- a/htdocs/langs/en_US/sendings.lang +++ b/htdocs/langs/en_US/sendings.lang @@ -75,8 +75,7 @@ SumOfProductWeights=Sum of product weights DetailWarehouseNumber= Warehouse details DetailWarehouseFormat= W:%s (Qty: %d) -# Other -DispatchCard = Dispatch card +ShipmentDistribution=Shipment distribution ErrorTooManyCombinationBatchcode=No dispatch for line %s as too many combination warehouse, product, batch code was found (%s). ErrorNoCombinationBatchcode=No dispatch for line %s as no combination warehouse, product, batch code was found. \ No newline at end of file diff --git a/htdocs/reception/dispatch.php b/htdocs/reception/dispatch.php index 4a752689304..e6d825edfcb 100644 --- a/htdocs/reception/dispatch.php +++ b/htdocs/reception/dispatch.php @@ -297,7 +297,7 @@ $formproduct = new FormProduct($db); $warehouse_static = new Entrepot($db); $supplierorderdispatch = new CommandeFournisseurDispatch($db); -$title = $object->ref." - ".$langs->trans('DispatchCard'); +$title = $object->ref." - ".$langs->trans('ReceptionDistribution'); $help_url = 'EN:Module_Suppliers_Orders|FR:CommandeFournisseur|ES:Módulo_Pedidos_a_proveedores'; $morejs = array('/fourn/js/lib_dispatch.js.php');