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

ChangeLog

@@ -36,29 +36,40 @@ check you make a fetch on object before calling the delete.
 
 
 ***** ChangeLog for 4.0.1 compared to 4.0.0 *****
-FIX #2853
+FIX: #2853
-FIX #2991
+FIX: #2991
-FIX #3128
+FIX: #3128
 FIX: #5699
-FIX #5734
+FIX: #5734
-FIX : #5776
+FIX: #5742 error on project list if an extra field separator is added.
-FIX alignement of intervention status
+FIX: #5746 chrome php Try a fix. Not sure it solved all problems reported
-FIX Clean of search fields
+FIX: #5748 Bug: Error updating to 4.0.1 with Postgresql. Field must be varchar.
-FIX Creation of donation should go back on card after creation
+FIX: #5750 Bug: CmailFile::server_parse enters an infinite loop if $server_response is false
-FIX Date visible on project overview
+FIX: #5752 Bug VAT NPR not propagated during proposal cloning
-FIX Execute a dedicated job from its id may results of launching other jobs too.
+FIX: #5763 Bug: Cannot Create Supplier Price Request
+FIX: #5770 Dolibarr doesn't modify correctly the hour of a task
+FIX: #5776
+FIX: #5802 Incoterms not set
+FIX: #5813 Bug: Incoterms not being read correctly
+FIX: #5818
+FIX: alignement of intervention status
+FIX: Clean of search fields
+FIX: Creation of donation should go back on card after creation
+FIX: Date visible on project overview
+FIX: Execute a dedicated job from its id may results of launching other jobs too.
 FIX: Failed to export contact categories with contact extra fields
-FIX inversion customer/supplier price
+FIX: inversion customer/supplier price
-FIX link "back to list" was not visible.
+FIX: link "back to list" was not visible.
-FIX Lost filter on opportunities
+FIX: Lost filter on opportunities
-FIX Mandatory field payment term was not css highlighted.
+FIX: Mandatory field payment term was not css highlighted.
-FIX Menu users not visible on dolidroid.
+FIX: Menu users not visible on dolidroid.
-FIX SEC for HTB23302
+FIX: SEC for HTB23302
-FIX The email test sender in email setup was broken
+FIX: The email test sender in email setup was broken
-FIX Translation of "Name" is not a good choice for floow-up.
+FIX: Translation of "Name" is not a good choice for floow-up.
-FIX Update of maxnbrun on job list failed.
+FIX: Update of maxnbrun on job list failed.
-FIX Value of payment term and project are not set on correct default value when invoice generated from template.
+FIX: Value of payment term and project are not set on correct default value when invoice generated from template.
 FIX: vat dictionary should allow enter and edit multiple values for localtaxes, separated by: (ex -19:-15)
+FIX: Vat not visible in dictionnary
 
 ***** ChangeLog for 4.0.0 compared to 3.9.* *****
 For users:

build/makepack-dolibarr.pl

@@ -368,20 +368,23 @@ if ($nboftargetok) {
 		if (! $ret)
 		{
 			print "Error: The ChangeLogFile was not updated. Run the following command before building package for $MAJOR.$MINOR.$BUILD:\n";
-			if (! $BUILD || $BUILD eq '0-rc')	# For a major version
-			{
-				print 'cd ~/git/dolibarr_'.$MAJOR.'.'.$MINOR.'; git log `git rev-list --boundary '.$MAJOR.'.'.$MINOR.'..origin/develop | grep ^- | cut -c2- | head -n 1`.. --no-merges --pretty=short --oneline | sed -e "s/^[0-9a-z]* //" | grep -e \'^FIX\|NEW\' | sort -u | sed \'s/FIXED:/FIX:/g\' | sed \'s/FIXED :/FIX:/g\' | sed \'s/FIX :/FIX:/g\' | sed \'s/FIX /FIX: /g\' | sed \'s/NEW :/NEW:/g\' | sed \'s/NEW /NEW: /g\' > /tmp/aaa';
-			}
-			else			# For a maintenance release
-			{
-				print 'cd ~/git/dolibarr_'.$MAJOR.'.'.$MINOR.'; git log '.$MAJOR.'.'.$MINOR.'.'.($BUILD-1).'.. --no-merges --pretty=short --oneline | sed -e "s/^[0-9a-z]* //" | grep -e \'^FIX\|NEW\' | sort -u | sed \'s/FIXED:/FIX:/g\' | sed \'s/FIXED :/FIX:/g\' | sed \'s/FIX :/FIX:/g\' | sed \'s/FIX /FIX: /g\' | sed \'s/NEW :/NEW:/g\' | sed \'s/NEW /NEW: /g\' > /tmp/aaa';
-			}
-			print "\n";
-			exit;
 		}
 		else
 		{
-			print "ChangeLog for $MAJOR.$MINOR\.$BUILD was found into '$SOURCE/ChangeLog'\n";
+			print "ChangeLog for $MAJOR.$MINOR\.$BUILD was found into '$SOURCE/ChangeLog. But you can regenerate it with commande:'\n";
+		}
+		if (! $BUILD || $BUILD eq '0-rc')	# For a major version
+		{
+			print 'cd ~/git/dolibarr_'.$MAJOR.'.'.$MINOR.'; git log `git rev-list --boundary '.$MAJOR.'.'.$MINOR.'..origin/develop | grep ^- | cut -c2- | head -n 1`.. --no-merges --pretty=short --oneline | sed -e "s/^[0-9a-z]* //" | grep -e \'^FIX\|NEW\' | sort -u | sed \'s/FIXED:/FIX:/g\' | sed \'s/FIXED :/FIX:/g\' | sed \'s/FIX :/FIX:/g\' | sed \'s/FIX /FIX: /g\' | sed \'s/NEW :/NEW:/g\' | sed \'s/NEW /NEW: /g\' > /tmp/aaa';
+		}
+		else			# For a maintenance release
+		{
+			print 'cd ~/git/dolibarr_'.$MAJOR.'.'.$MINOR.'; git log '.$MAJOR.'.'.$MINOR.'.'.($BUILD-1).'.. --no-merges --pretty=short --oneline | sed -e "s/^[0-9a-z]* //" | grep -e \'^FIX\|NEW\' | sort -u | sed \'s/FIXED:/FIX:/g\' | sed \'s/FIXED :/FIX:/g\' | sed \'s/FIX :/FIX:/g\' | sed \'s/FIX /FIX: /g\' | sed \'s/NEW :/NEW:/g\' | sed \'s/NEW /NEW: /g\' > /tmp/aaa';
+		}
+		print "\n";
+		if (! $ret)
+		{
+			exit;
 		}
 			
 		print 'Run git tag -a -m "'.$MAJOR.'.'.$MINOR.'.'.$BUILD.'" "'.$MAJOR.'.'.$MINOR.'.'.$BUILD.'"'."\n";

htdocs/core/boxes/box_factures_fourn_imp.php

@@ -117,18 +117,12 @@ class box_factures_fourn_imp extends ModeleBoxes
                     }
 
                     $tooltip = $langs->trans('SupplierInvoice') . ': ' . ($objp->ref?$objp->ref:$objp->facid) . '<br>' . $langs->trans('RefSupplier') . ': ' . $objp->ref_supplier;
-                    $this->info_box_contents[$line][] = array(
-                        'td' => 'align="left" width="16"',
-                        'logo' => $this->boximg,
-                        'tooltip' => $tooltip,
-                        'url' => DOL_URL_ROOT."/fourn/facture/card.php?facid=".$objp->facid,
-                    );
 
                     $this->info_box_contents[$line][] = array(
                         'td' => 'align="left"',
                         'text' => $facturestatic->getNomUrl(1),
                         'text2'=> $late,
-                        'asisi' => 1
+                        'asis' => 1
                     );
 
                     $this->info_box_contents[$line][] = array(

htdocs/core/lib/company.lib.php

@@ -224,12 +224,12 @@ function societe_prepare_head(Societe $object)
     }
 
     $head[$h][0] = DOL_URL_ROOT.'/societe/agenda.php?socid='.$object->id;
+    $head[$h][1].= $langs->trans("Events");
     if (! empty($conf->agenda->enabled) && (!empty($user->rights->agenda->myactions->read) || !empty($user->rights->agenda->allactions->read) ))
     {
-        $head[$h][1] = $langs->trans("Events");
         $head[$h][1].= '/';
+        $head[$h][1].= $langs->trans("Agenda");
     }
-    $head[$h][1].= $langs->trans("Agenda");
     $head[$h][2] = 'agenda';
     $h++;
     

htdocs/holiday/card.php

@@ -326,6 +326,7 @@ if ($action == 'confirm_send')
 
             if (!$emailTo)
             {
+                dol_syslog("Expected validator has no email, so we redirect directly to finished page without sending email");
                 header('Location: '.$_SERVER["PHP_SELF"].'?id='.$cp->id);
                 exit;
             }
@@ -438,6 +439,7 @@ if ($action == 'confirm_valid')
 
             if (!$emailTo)
             {
+                dol_syslog("User that request leave has no email, so we redirect directly to finished page without sending email");
                 header('Location: '.$_SERVER["PHP_SELF"].'?id='.$cp->id);
                 exit;
             }