From c2c4366c629a64fa91fa47bc7c81bce66c900188 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Wed, 24 Oct 2018 11:38:16 +0200 Subject: [PATCH] Removed duplicate translation --- htdocs/core/modules/modStock.class.php | 2 +- htdocs/langs/en_US/stocks.lang | 2 +- htdocs/product/stock/massstockmove.php | 4 ++-- htdocs/product/stock/movement_list.php | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/htdocs/core/modules/modStock.class.php b/htdocs/core/modules/modStock.class.php index e9e33c8bbf3..d4f79f1efcf 100644 --- a/htdocs/core/modules/modStock.class.php +++ b/htdocs/core/modules/modStock.class.php @@ -273,7 +273,7 @@ class modStock extends DolibarrModules 'e.rowid'=>'IdWarehouse','e.ref'=>'LocationSummary','e.description'=>'DescWareHouse','e.lieu'=>'LieuWareHouse','e.address'=>'Address','e.zip'=>'Zip', 'e.town'=>'Town','p.rowid'=>"ProductId",'p.ref'=>"Ref",'p.fk_product_type'=>"Type",'p.label'=>"Label",'p.description'=>"Description",'p.note'=>"Note", 'p.price'=>"Price",'p.tva_tx'=>'VAT','p.tosell'=>"OnSell",'p.tobuy'=>'OnBuy','p.duration'=>"Duration",'p.datec'=>'DateCreation', - 'p.tms'=>'DateModification','sm.rowid'=>'MovementId','sm.value'=>'Qty','sm.datem'=>'DateMovement','sm.label'=>'LabelMovement', + 'p.tms'=>'DateModification','sm.rowid'=>'MovementId','sm.value'=>'Qty','sm.datem'=>'DateMovement','sm.label'=>'MovementLabel', 'sm.inventorycode'=>'InventoryCode' ); $this->export_TypeFields_array[$r]=array( diff --git a/htdocs/langs/en_US/stocks.lang b/htdocs/langs/en_US/stocks.lang index b3313f5ff73..57138a75153 100644 --- a/htdocs/langs/en_US/stocks.lang +++ b/htdocs/langs/en_US/stocks.lang @@ -44,7 +44,6 @@ TransferStock=Transfer stock MassStockTransferShort=Mass stock transfer StockMovement=Stock movement StockMovements=Stock movements -LabelMovement=Movement label NumberOfUnit=Number of units UnitPurchaseValue=Unit purchase price StockTooLow=Stock too low @@ -134,6 +133,7 @@ StockMustBeEnoughForInvoice=Stock level must be enough to add product/service to StockMustBeEnoughForOrder=Stock level must be enough to add product/service to order (check is done on current real stock when adding a line into order whatever the rule for automatic stock change) StockMustBeEnoughForShipment= Stock level must be enough to add product/service to shipment (check is done on current real stock when adding a line into shipment whatever the rule for automatic stock change) MovementLabel=Label of movement +TypeMovement=Type of movement DateMovement=Date of movement InventoryCode=Movement or inventory code IsInPackage=Contained into package diff --git a/htdocs/product/stock/massstockmove.php b/htdocs/product/stock/massstockmove.php index c585b7a7e89..e456f966cf5 100644 --- a/htdocs/product/stock/massstockmove.php +++ b/htdocs/product/stock/massstockmove.php @@ -161,7 +161,7 @@ if ($action == 'createmovements') if (! GETPOST("label")) { $error++; - setEventMessages($langs->trans("ErrorFieldRequired"),$langs->transnoentitiesnoconv("LabelMovement"), null, 'errors'); + setEventMessages($langs->trans("ErrorFieldRequired"),$langs->transnoentitiesnoconv("MovementLabel"), null, 'errors'); } $db->begin(); @@ -451,7 +451,7 @@ print ''; print ''; print ''; print ''; - print ''; + print ''; print ''; diff --git a/htdocs/product/stock/movement_list.php b/htdocs/product/stock/movement_list.php index 31394144337..053fe3a458b 100644 --- a/htdocs/product/stock/movement_list.php +++ b/htdocs/product/stock/movement_list.php @@ -103,7 +103,7 @@ $arrayfields=array( 'e.ref'=>array('label'=>$langs->trans("Warehouse"), 'checked'=>1, 'enabled'=>(! $id > 0)), // If we are on specific warehouse, we hide it 'm.fk_user_author'=>array('label'=>$langs->trans("Author"), 'checked'=>0), 'm.inventorycode'=>array('label'=>$langs->trans("InventoryCodeShort"), 'checked'=>1), - 'm.label'=>array('label'=>$langs->trans("LabelMovement"), 'checked'=>1), + 'm.label'=>array('label'=>$langs->trans("MovementLabel"), 'checked'=>1), 'm.type_mouvement'=>array('label'=>$langs->trans("TypeMovement"), 'checked'=>1), 'origin'=>array('label'=>$langs->trans("Origin"), 'checked'=>1), 'm.value'=>array('label'=>$langs->trans("Qty"), 'checked'=>1),
'.$langs->trans("LabelMovement").''.$langs->trans("MovementLabel").''; print ''; print '