Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop

htdocs/core/class/extrafields.class.php

@@ -670,7 +670,14 @@ class ExtraFields
 		}
 		elseif ($type == 'select')
 		{
-			$out='<select class="flat" name="options_'.$key.'">';
+			$out = '';
+			if ($conf->use_javascript_ajax && $conf->global->COMPANY_USE_SEARCH_TO_SELECT && ! $forcecombo)
+			{
+				//$minLength = (is_numeric($conf->global->COMPANY_USE_SEARCH_TO_SELECT)?$conf->global->COMPANY_USE_SEARCH_TO_SELECT:2);
+				$out.= ajax_combobox('options_'.$key, $event, $conf->global->COMPANY_USE_SEARCH_TO_SELECT);
+			}
+
+			$out.='<select class="flat" name="options_'.$key.'" id="options_'.$key.'">';
 			foreach ($param['options'] as $key=>$val )
 			{
 				list($val, $parent) = explode('|', $val);
@@ -683,7 +690,14 @@ class ExtraFields
 		}
 		elseif ($type == 'sellist')
 		{
-			$out='<select class="flat" name="options_'.$key.'">';
+			$out = '';
+			if ($conf->use_javascript_ajax && $conf->global->COMPANY_USE_SEARCH_TO_SELECT && ! $forcecombo)
+			{
+				//$minLength = (is_numeric($conf->global->COMPANY_USE_SEARCH_TO_SELECT)?$conf->global->COMPANY_USE_SEARCH_TO_SELECT:2);
+				$out.= ajax_combobox('options_'.$key, $event, $conf->global->COMPANY_USE_SEARCH_TO_SELECT);
+			}
+
+			$out.='<select class="flat" name="options_'.$key.'" id="options_'.$key.'">';
 			if (is_array($param['options']))
 			{
 				$param_list=array_keys($param['options']);
@@ -753,6 +767,7 @@ class ExtraFields
 						$fields_label = explode('|',$InfoFieldList[1]);
 						if(is_array($fields_label))
 						{
+							$notrans = true;
 							foreach ($fields_label as $field_toshow)
 							{
 								$labeltoshow.= $obj->$field_toshow.' ';
@@ -778,12 +793,15 @@ class ExtraFields
 						}
 						else
 						{
-							$translabel=$langs->trans($obj->$InfoFieldList[1]);
+							if(!$notrans)
-							if ($translabel!=$obj->$InfoFieldList[1]) {
+							{
-								$labeltoshow=dol_trunc($translabel,18);
+								$translabel=$langs->trans($obj->$InfoFieldList[1]);
-							}
+								if ($translabel!=$obj->$InfoFieldList[1]) {
-							else {
+									$labeltoshow=dol_trunc($translabel,18);
-								$labeltoshow=dol_trunc($obj->$InfoFieldList[1],18);
+								}
+								else {
+									$labeltoshow=dol_trunc($obj->$InfoFieldList[1],18);
+								}
 							}
 							if (empty($labeltoshow)) $labeltoshow='(not defined)';
 							if ($value==$obj->rowid)
@@ -954,11 +972,11 @@ class ExtraFields
 				{
 					foreach ($fields_label as $field_toshow)
 					{
-						$translabel=$langs->trans($obj->$InfoFieldList[1]);
+						$translabel=$langs->trans($field_toshow);
-						if ($translabel!=$obj->$InfoFieldList[1]) {
+						if ($translabel!=$field_toshow) {
-							$value=dol_trunc($translabel,18).' ';
+							$value.=dol_trunc($translabel,18).' ';
 						}else {
-							$value=$obj->$InfoFieldList[1].' ';
+							$value.=$obj->$field_toshow.' ';
 						}
 					}
 				}

htdocs/includes/odtphp/odf.php

@@ -478,7 +478,8 @@ IMG;
 				header('Content-Disposition: attachment; filename="'.$name.'.pdf"');
 				readfile("$name.pdf");
 			}
-			unlink("$name.odt");
+			if (!empty($conf->global->MAIN_ODT_AS_PDF_DEL_SOURCE))
+				unlink("$name.odt");
 		} else {
 			dol_syslog(get_class($this).'::exportAsAttachedPDF $ret_val='.$retval, LOG_DEBUG);
 			dol_syslog(get_class($this).'::exportAsAttachedPDF $output_arr='.var_export($output_arr,true), LOG_DEBUG);

htdocs/langs/en_US/companies.lang

@@ -82,6 +82,7 @@ DefaultLang=Language by default
 VATIsUsed=VAT is used
 VATIsNotUsed=VAT is not used
 CopyAddressFromSoc=Fill address with thirdparty address
+NoEmailDefined=There is no email defined
 ##### Local Taxes #####
 LocalTax1IsUsedES= RE is used
 LocalTax1IsNotUsedES= RE is not used

htdocs/langs/en_US/compta.lang

@@ -160,9 +160,9 @@ AccountancyDashboard=Accountancy summary
 ByProductsAndServices=By products and services
 RefExt=External ref
 ToCreateAPredefinedInvoice=To create a predefined invoice, create a standard invoice then, without validating it, click onto button "Convert to predefined invoice".
-LinkedOrder=linked to command
+LinkedOrder=linked to order
 ReCalculate=Recalculate
-Mode1=Methode 1
+Mode1=Method 1
 Mode2=Method 2
 CalculationRuleDesc=To calculate total VAT, there is two methods:<br>Method 1 is rounding vat on each line, then summing them.<br>Method 2 is summing all vat on each line, then rounding result.<br>Final result may differs from few cents. Default mode is mode <b>%s</b>.
 CalculationRuleDescSupplier=according to supplier, choose appropriate method to apply same calculation rule and get same result expected by your supplier.

htdocs/main.inc.php

@@ -968,8 +968,8 @@ function top_htmlhead($head, $title='', $disablejs=0, $disablehead=0, $arrayofjs
         $appli='Dolibarr';
         if (!empty($conf->global->MAIN_APPLICATION_TITLE)) $appli=$conf->global->MAIN_APPLICATION_TITLE;
 
-        if ($title) print '<title>'.$appli.' - '.$title.'</title>';
+        if ($title) print '<title>'.dol_htmlentities($appli.' - '.$title).'</title>';
-        else print "<title>".$appli."</title>";
+        else print "<title>".dol_htmlentities($appli)."</title>";
         print "\n";
 
         if (! defined('DISABLE_JQUERY') && ! $disablejs && $conf->use_javascript_ajax)

scripts/odt2pdf/odt2pdf.sh

@@ -22,7 +22,7 @@ if [ -f "$1.odt" ]
   nbprocess=$(pgrep -c soffice)
   if [ $nbprocess -ne 1 ]
    then
-    soffice --invisible --accept="socket,host=127.0.0.1,port=8100;urp;" --nofirststartwizard --headless
+    soffice --invisible --accept="socket,host=127.0.0.1,port=8100;urp;" --nofirststartwizard --headless&
     retcode=$?
     if [ $retcode -ne 0 ]
      then