From b52cfe58d6e9925f8e51705c45bc98e7c187abea Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 26 Feb 2020 15:22:23 +0100
Subject: [PATCH] FIX Disable js if no javascript

---
 htdocs/core/class/html.formother.class.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/core/class/html.formother.class.php b/htdocs/core/class/html.formother.class.php
index a73621faa32..72ac856c31e 100644
--- a/htdocs/core/class/html.formother.class.php
+++ b/htdocs/core/class/html.formother.class.php
@@ -742,7 +742,7 @@ class FormOther
         if (!is_array($arrayofcolors) || count($arrayofcolors) < 1)
         {
             $langs->load("other");
-            if (empty($conf->dol_use_jmobile))
+            if (empty($conf->dol_use_jmobile) && !empty($conf->use_javascript_ajax))
             {
 	            $out .= '<link rel="stylesheet" media="screen" type="text/css" href="'.DOL_URL_ROOT.'/includes/jquery/plugins/jpicker/css/jPicker-1.1.6.css" />';
 	            $out .= '<script type="text/javascript" src="'.DOL_URL_ROOT.'/includes/jquery/plugins/jpicker/jpicker-1.1.6.js"></script>';
@@ -788,7 +788,7 @@ class FormOther
         }
         else  // In most cases, this is not used. We used instead function with no specific list of colors
         {
-            if (empty($conf->dol_use_jmobile))
+        	if (empty($conf->dol_use_jmobile) && !empty($conf->use_javascript_ajax))
             {
 	        	$out .= '<link rel="stylesheet" href="'.DOL_URL_ROOT.'/includes/jquery/plugins/colorpicker/jquery.colorpicker.css" type="text/css" media="screen" />';
 	            $out .= '<script src="'.DOL_URL_ROOT.'/includes/jquery/plugins/colorpicker/jquery.colorpicker.js" type="text/javascript"></script>';