From 01e15a256402e34bf38c8d25cf6280ed8a5899d4 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 6 May 2024 18:50:11 +0200 Subject: [PATCH] Simplify code --- htdocs/core/tpl/objectline_create.tpl.php | 20 +++++--------------- htdocs/langs/en_US/admin.lang | 1 + htdocs/langs/en_US/products.lang | 9 +++------ 3 files changed, 9 insertions(+), 21 deletions(-) diff --git a/htdocs/core/tpl/objectline_create.tpl.php b/htdocs/core/tpl/objectline_create.tpl.php index b76af45f151..7c748f448c2 100644 --- a/htdocs/core/tpl/objectline_create.tpl.php +++ b/htdocs/core/tpl/objectline_create.tpl.php @@ -230,22 +230,12 @@ if ($nolinesbefore) { echo ' '; $labelforradio = ''; if (empty($conf->dol_optimize_smallscreen)) { - if (empty($senderissupplier)) { - if (isModEnabled("product") && !isModEnabled('service')) { - $labelforradio = $langs->trans('PredefinedProductsToSell'); - } elseif ((!isModEnabled('product') && isModEnabled('service')) || ($object->element == 'contrat' && !getDolGlobalString('CONTRACT_SUPPORT_PRODUCTS'))) { - $labelforradio = $langs->trans('PredefinedServicesToSell'); - } else { - $labelforradio = $langs->trans('PredefinedProductsAndServicesToSell'); - } + if (isModEnabled("product") && !isModEnabled('service')) { + $labelforradio = $langs->trans('PredefinedProducts'); + } elseif ((!isModEnabled('product') && isModEnabled('service')) || ($object->element == 'contrat' && !getDolGlobalString('CONTRACT_SUPPORT_PRODUCTS'))) { + $labelforradio = $langs->trans('PredefinedServices'); } else { - if (isModEnabled("product") && !isModEnabled('service')) { - $labelforradio = $langs->trans('PredefinedProductsToPurchase'); - } elseif (!isModEnabled('product') && isModEnabled('service')) { - $labelforradio = $langs->trans('PredefinedServicesToPurchase'); - } else { - $labelforradio = $langs->trans('PredefinedProductsAndServicesToPurchase'); - } + $labelforradio = $langs->trans('PredefinedProductsAndServices'); } } else { $labelforradio = $langs->trans('PredefinedItem'); diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang index fcd46c6c04b..d9091a786f0 100644 --- a/htdocs/langs/en_US/admin.lang +++ b/htdocs/langs/en_US/admin.lang @@ -2475,3 +2475,4 @@ AIPromptForFeatures=AI custom prompts for features EnterAnIP=Enter an IP address ConvertInto=Convert into YouAreHere=You are here +Unstable=Unstable diff --git a/htdocs/langs/en_US/products.lang b/htdocs/langs/en_US/products.lang index b1b219f116a..f57cf2b1931 100644 --- a/htdocs/langs/en_US/products.lang +++ b/htdocs/langs/en_US/products.lang @@ -147,12 +147,9 @@ DiscountQtyMin=Discount for this qty. NoPriceDefinedForThisSupplier=No price/qty defined for this vendor/product NoSupplierPriceDefinedForThisProduct=No vendor price/qty defined for this product PredefinedItem=Predefined item -PredefinedProductsToSell=Predefined Product -PredefinedServicesToSell=Predefined Service -PredefinedProductsAndServicesToSell=Predefined products/services to sell -PredefinedProductsToPurchase=Predefined product to purchase -PredefinedServicesToPurchase=Predefined services to purchase -PredefinedProductsAndServicesToPurchase=Predefined products/services to purchase +PredefinedProducts=Predefined Product +PredefinedServices=Predefined Service +PredefinedProductsAndServices=Predefined products/services NotPredefinedProducts=Not predefined products/services GenerateThumb=Generate thumb ServiceNb=Service #%s