Merge branch '3.4' of https://github.com/Dolibarr/dolibarr.git into 3.4

htdocs/comm/mailing/cibles.php

@@ -113,7 +113,7 @@ if ($action == 'add')
 	}
 }
 
-if ($action == 'clear')
+if (GETPOST('clearlist'))
 {
 	// Chargement de la classe
 	$classname = "MailingTargets";
@@ -375,7 +375,7 @@ if ($object->fetch($id) >= 0)
 		if ($search_firstname) $param.= "&search_firstname=".urlencode($search_firstname);
 		if ($search_email)     $param.= "&search_email=".urlencode($search_email);
 
-		$cleartext='<br></div><div>'.$langs->trans("ToClearAllRecipientsClickHere").': '.'<input type="submit" class="button" value="'.$langs->trans("TargetsReset").'">';
+		$cleartext='<br></div><div>'.$langs->trans("ToClearAllRecipientsClickHere").': '.'<input type="submit" name="clearlist" class="button" value="'.$langs->trans("TargetsReset").'">';
 
 		print_barre_liste($langs->trans("MailSelectedRecipients").$cleartext,$page,$_SERVER["PHP_SELF"],$param,$sortfield,$sortorder,"",$num,$object->nbemail,'');
 

htdocs/core/class/html.formother.class.php

@@ -544,68 +544,73 @@ class FormOther
      */
     function selectColor($set_color='', $prefix='f_color', $form_name='objForm', $showcolorbox=1, $arrayofcolors='', $morecss='')
     {
-        global $langs;
+        global $langs,$conf;
 
         $out='';
 
         if (! is_array($arrayofcolors) || count($arrayofcolors) < 1)
         {
             $langs->load("other");
-            $out.= '<link rel="stylesheet" media="screen" type="text/css" href="'.DOL_URL_ROOT.'/includes/jquery/plugins/jpicker/css/jPicker-1.1.6.css" />';
+            if (empty($conf->dol_use_jmobile))
-            $out.= '<script type="text/javascript" src="'.DOL_URL_ROOT.'/includes/jquery/plugins/jpicker/jpicker-1.1.6.js"></script>';
+            {
-            $out.= '<script type="text/javascript">
+	            $out.= '<link rel="stylesheet" media="screen" type="text/css" href="'.DOL_URL_ROOT.'/includes/jquery/plugins/jpicker/css/jPicker-1.1.6.css" />';
-             jQuery(document).ready(function(){
+	            $out.= '<script type="text/javascript" src="'.DOL_URL_ROOT.'/includes/jquery/plugins/jpicker/jpicker-1.1.6.js"></script>';
-                $(\'#colorpicker'.$prefix.'\').jPicker( {
+	            $out.= '<script type="text/javascript">
-                window: {
+	             jQuery(document).ready(function(){
-                  title: \''.dol_escape_js($langs->trans("SelectAColor")).'\', /* any title for the jPicker window itself - displays "Drag Markers To Pick A Color" if left null */
+	                $(\'#colorpicker'.$prefix.'\').jPicker( {
-                  effects:
+	                window: {
-                    {
+	                  title: \''.dol_escape_js($langs->trans("SelectAColor")).'\', /* any title for the jPicker window itself - displays "Drag Markers To Pick A Color" if left null */
-                    type: \'show\', /* effect used to show/hide an expandable picker. Acceptable values "slide", "show", "fade" */
+	                  effects:
-                    speed:
+	                    {
-                    {
+	                    type: \'show\', /* effect used to show/hide an expandable picker. Acceptable values "slide", "show", "fade" */
-                      show: \'fast\', /* duration of "show" effect. Acceptable values are "fast", "slow", or time in ms */
+	                    speed:
-                      hide: \'fast\' /* duration of "hide" effect. Acceptable values are "fast", "slow", or time in ms */
+	                    {
-                    }
+	                      show: \'fast\', /* duration of "show" effect. Acceptable values are "fast", "slow", or time in ms */
-                    },
+	                      hide: \'fast\' /* duration of "hide" effect. Acceptable values are "fast", "slow", or time in ms */
-                  position:
+	                    }
-                    {
+	                    },
-                    x: \'screenCenter\', /* acceptable values "left", "center", "right", "screenCenter", or relative px value */
+	                  position:
-                    y: \'center\' /* acceptable values "top", "bottom", "center", or relative px value */
+	                    {
-                    },
+	                    x: \'screenCenter\', /* acceptable values "left", "center", "right", "screenCenter", or relative px value */
-                },
+	                    y: \'center\' /* acceptable values "top", "bottom", "center", or relative px value */
-                images: {
+	                    },
-                    clientPath: \''.DOL_URL_ROOT.'/includes/jquery/plugins/jpicker/images/\',
+	                },
-                    picker: { file: \'../../../../../theme/common/colorpicker.png\', width: 14, height: 14 }
+	                images: {
-          		},
+	                    clientPath: \''.DOL_URL_ROOT.'/includes/jquery/plugins/jpicker/images/\',
-                localization: // alter these to change the text presented by the picker (e.g. different language)
+	                    picker: { file: \'../../../../../theme/common/colorpicker.png\', width: 14, height: 14 }
-                  {
+	          		},
-                    text:
+	                localization: // alter these to change the text presented by the picker (e.g. different language)
-                    {
+	                  {
-                      title: \''.dol_escape_js($langs->trans("SelectAColor")).'\',
+	                    text:
-                      newColor: \''.dol_escape_js($langs->trans("New")).'\',
+	                    {
-                      currentColor: \''.dol_escape_js($langs->trans("Current")).'\',
+	                      title: \''.dol_escape_js($langs->trans("SelectAColor")).'\',
-                      ok: \''.dol_escape_js($langs->trans("Save")).'\',
+	                      newColor: \''.dol_escape_js($langs->trans("New")).'\',
-                      cancel: \''.dol_escape_js($langs->trans("Cancel")).'\'
+	                      currentColor: \''.dol_escape_js($langs->trans("Current")).'\',
-                    }
+	                      ok: \''.dol_escape_js($langs->trans("Save")).'\',
-                  }
+	                      cancel: \''.dol_escape_js($langs->trans("Cancel")).'\'
-		        } ); });
+	                    }
-             </script>';
+	                  }
+			        } ); });
+	             </script>';
+            }
             $out.= '<input id="colorpicker'.$prefix.'" name="'.$prefix.'" size="6" maxlength="7" class="flat'.($morecss?' '.$morecss:'').'" type="text" value="'.$set_color.'" />';
         }
         else  // In most cases, this is not used. We used instead function with no specific list of colors
         {
-            $out.= '<link rel="stylesheet" href="'.DOL_URL_ROOT.'/includes/jquery/plugins/colorpicker/jquery.colorpicker.css" type="text/css" media="screen" />';
+            if (empty($conf->dol_use_jmobile))
-            $out.= '<script src="'.DOL_URL_ROOT.'/includes/jquery/plugins/colorpicker/jquery.colorpicker.js" type="text/javascript"></script>';
+            {
-            $out.= '<script type="text/javascript">
+	        	$out.= '<link rel="stylesheet" href="'.DOL_URL_ROOT.'/includes/jquery/plugins/colorpicker/jquery.colorpicker.css" type="text/css" media="screen" />';
-             jQuery(document).ready(function(){
+	            $out.= '<script src="'.DOL_URL_ROOT.'/includes/jquery/plugins/colorpicker/jquery.colorpicker.js" type="text/javascript"></script>';
-                 jQuery(\'#colorpicker'.$prefix.'\').colorpicker({
+	            $out.= '<script type="text/javascript">
-                     size: 14,
+	             jQuery(document).ready(function(){
-                     label: \'\',
+	                 jQuery(\'#colorpicker'.$prefix.'\').colorpicker({
-                     hide: true
+	                     size: 14,
-                 });
+	                     label: \'\',
-             });
+	                     hide: true
-             </script>';
+	                 });
-
+	             });
+	             </script>';
+            }
             $out.= '<select id="colorpicker'.$prefix.'" class="flat'.($morecss?' '.$morecss:'').'" name="'.$prefix.'">';
             //print '<option value="-1">&nbsp;</option>';
             foreach ($arrayofcolors as $val)

htdocs/fourn/facture/fiche.php

@@ -1344,7 +1344,8 @@ else
                 if (! empty($conf->global->FAC_FORCE_DATE_VALIDATION))
                 {
                     $object->date=dol_now();
-                    $object->date_lim_reglement=$object->calculate_date_lim_reglement();
+                    //TODO: Possibly will have to control payment information into suppliers
+                    //$object->date_lim_reglement=$object->calculate_date_lim_reglement();
                 }
                 $numref = $object->getNextNumRef($soc);
             }

htdocs/langs/ca_ES/categories.lang

@@ -76,7 +76,7 @@ ProductsCategoryShort=Categoria productes
 MembersCategoryShort=Categoria membre
 SuppliersCategoriesShort=Categories proveïdors
 CustomersCategoriesShort=Categories clients
-CustomersProspectsCategoriesShort=Categories clients/potencials
+CustomersProspectsCategoriesShort=Categories clients
 ProductsCategoriesShort=Categories productes
 MembersCategoriesShort=Categories membres
 ThisCategoryHasNoProduct=Aquesta categoria no conté cap producte.

htdocs/langs/es_ES/categories.lang

@@ -76,7 +76,7 @@ ProductsCategoryShort=Categoría productos
 MembersCategoryShort=Categoría miembro
 SuppliersCategoriesShort=Categorías proveedores
 CustomersCategoriesShort=Categorías clientes
-CustomersProspectsCategoriesShort=Categorías clientes/potenciales
+CustomersProspectsCategoriesShort=Categorías clientes
 ProductsCategoriesShort=Categorías productos
 MembersCategoriesShort=Categorías miembros
 ThisCategoryHasNoProduct=Esta categoría no contiene ningún producto.