diff --git a/.tx/config b/.tx/config index d6e339462e3..b650e3109c1 100644 --- a/.tx/config +++ b/.tx/config @@ -248,6 +248,12 @@ source_file = htdocs/langs/en_US/products.lang source_lang = en_US type = MOZILLAPROPERTIES +[dolibarr.productbatch] +file_filter = htdocs/langs//products.lang +source_file = htdocs/langs/en_US/products.lang +source_lang = en_US +type = MOZILLAPROPERTIES + [dolibarr.projects] file_filter = htdocs/langs//projects.lang source_file = htdocs/langs/en_US/projects.lang diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang index ecfa7497c79..aa331e5fe8e 100644 --- a/htdocs/langs/en_US/admin.lang +++ b/htdocs/langs/en_US/admin.lang @@ -503,6 +503,8 @@ Module2500Name=Electronic Content Management Module2500Desc=Save and share documents Module2600Name=WebServices Module2600Desc=Enable the Dolibarr web services server +Module2650Name=WebServices (client) +Module2650Desc=Enable the Dolibarr web services client (Can be used to push data/requests to external servers. Supplier orders supported only for the moment) Module2700Name=Gravatar Module2700Desc=Use online Gravatar service (www.gravatar.com) to show photo of users/members (found with their emails). Need an internet access Module2800Desc=FTP Client @@ -517,7 +519,7 @@ Module6000Desc=Workflow management Module20000Name=Leave Requests management Module20000Desc=Declare and follow employees leaves requests Module39000Name=Product batch -Module39000Desc=Batch number, eat-by and sell-by date management on products +Module39000Desc=Batch or serial number, eat-by and sell-by date management on products Module50000Name=PayBox Module50000Desc=Module to offer an online payment page by credit card with PayBox Module50100Name=Point of sales diff --git a/htdocs/langs/en_US/productbatch.lang b/htdocs/langs/en_US/productbatch.lang index 07fb45985d5..435ceadfbbf 100644 --- a/htdocs/langs/en_US/productbatch.lang +++ b/htdocs/langs/en_US/productbatch.lang @@ -1,9 +1,10 @@ # ProductBATCH language file - en_US - ProductBATCH CHARSET= UTF-8 -ProductStatusOnBatch= Managed -ProductStatusNotOnBatch= Not Managed -ProductStatusOnBatchShort= Managed -ProductStatusNotOnBatchShort= Not Managed +ManageLotSerial=Manage lot or serial +ProductStatusOnBatch=Managed +ProductStatusNotOnBatch=Not Managed +ProductStatusOnBatchShort=Managed +ProductStatusNotOnBatchShort=Not Managed Batch=Batch atleast1batchfield= Eat-by date or Sell-by date or Batch number batch_number= Batch number diff --git a/htdocs/product/card.php b/htdocs/product/card.php index 529f812d8c4..adde861c6a5 100644 --- a/htdocs/product/card.php +++ b/htdocs/product/card.php @@ -1122,7 +1122,7 @@ else // Batch number managment if ($conf->productbatch->enabled) { - print ''.$langs->trans("Status").' ('.$langs->trans("Lot").')'; + print ''.$langs->trans("ManageLotSerial").''; $statutarray=array('0' => $langs->trans("ProductStatusNotOnBatch"), '1' => $langs->trans("ProductStatusOnBatch")); print $form->selectarray('status_batch',$statutarray,$object->status_batch); print ''; @@ -1437,7 +1437,7 @@ else // Batch number management (to batch) if ($conf->productbatch->enabled) { - print ''.$langs->trans("Status").' ('.$langs->trans("Lot").')'; + print ''.$langs->trans("ManageLotSerial").''; if (! empty($conf->use_javascript_ajax) && $user->rights->produit->creer && ! empty($conf->global->MAIN_DIRECT_STATUS_UPDATE)) { print ajax_object_onoff($object, 'status_batch', 'tobatch', 'ProductStatusOnBatch', 'ProductStatusNotOnBatch'); } else {