diff --git a/htdocs/core/tpl/predefinedproductline_create.tpl.php b/htdocs/core/tpl/predefinedproductline_create.tpl.php index 17b438640e8..5d19946deaa 100644 --- a/htdocs/core/tpl/predefinedproductline_create.tpl.php +++ b/htdocs/core/tpl/predefinedproductline_create.tpl.php @@ -36,10 +36,9 @@ if (! empty($conf->margin->enabled) && ! empty($object->element) && in_array($ob global->MAIN_VIEW_LINE_NUMBER) ? ' colspan="4"' : ' colspan="3"'); ?>> trans("AddNewLine").' - '; - if (! empty($conf->service->enabled)) - echo $langs->trans('RecordedProductsAndServices'); - else - echo $langs->trans('RecordedProducts'); + if (! empty($conf->product->enabled) && empty($conf->service->enabled)) echo $langs->trans('RecordedProducts'); + else if (empty($conf->product->enabled) && ! empty($conf->service->enabled)) echo $langs->trans('RecordedServices'); + else echo $langs->trans('RecordedProductsAndServices'); ?> trans('Qty'); ?> diff --git a/htdocs/langs/en_US/products.lang b/htdocs/langs/en_US/products.lang index 8881ce278f9..fa6b3331d22 100644 --- a/htdocs/langs/en_US/products.lang +++ b/htdocs/langs/en_US/products.lang @@ -151,6 +151,7 @@ DiscountQtyMin=Discount quantity min. (by default) NoPriceDefinedForThisSupplier=No price/qty defined for this supplier/product NoSupplierPriceDefinedForThisProduct=No supplier price/qty defined for this product RecordedProducts=Products recorded +RecordedServices=Services recorded RecordedProductsAndServices=Products/services recorded GenerateThumb=Generate thumb ProductCanvasAbility=Use special "canvas" addons diff --git a/htdocs/langs/fr_FR/products.lang b/htdocs/langs/fr_FR/products.lang index c641adee29a..234ea360a39 100644 --- a/htdocs/langs/fr_FR/products.lang +++ b/htdocs/langs/fr_FR/products.lang @@ -151,6 +151,7 @@ VATRateForSupplierProduct=Taux TVA (pour ce produit/fournisseur) NoPriceDefinedForThisSupplier=Aucun prix/qté défini pour ce fournisseur/produit NoSupplierPriceDefinedForThisProduct=Aucun prix/qté fournisseur défini pour ce produit RecordedProducts=Produits en vente +RecordedServices=Services en vente RecordedProductsAndServices=Produits/Services en vente GenerateThumb=Générer la vignette ProductCanvasAbility=Utiliser les extensions spéciales "canvas"