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

Conflicts:
	htdocs/langs/en_US/admin.lang

htdocs/admin/mails.php

@@ -526,11 +526,17 @@ else
 	print '<tr class="liste_titre"><td class="titlefieldmiddle">'.$langs->trans("Parameter").'</td><td>'.$langs->trans("Value").'</td></tr>';
 
 	// Disable
-	print '<tr class="oddeven"><td>'.$langs->trans("MAIN_DISABLE_ALL_MAILS").'</td><td>'.yn($conf->global->MAIN_DISABLE_ALL_MAILS).'</td></tr>';
+	print '<tr class="oddeven"><td>'.$langs->trans("MAIN_DISABLE_ALL_MAILS").'</td><td>'.yn($conf->global->MAIN_DISABLE_ALL_MAILS);
+	if (! empty($conf->global->MAIN_DISABLE_ALL_MAILS)) print img_warning($langs->trans("Disabled"));
+	print '</td></tr>';
 
 	// Force e-mail recipient
 	print '<tr class="oddeven"><td>'.$langs->trans("MAIN_MAIL_FORCE_SENDTO").'</td><td>'.$conf->global->MAIN_MAIL_FORCE_SENDTO;
-	if (! empty($conf->global->MAIN_MAIL_FORCE_SENDTO) && ! isValidEmail($conf->global->MAIN_MAIL_FORCE_SENDTO)) print img_warning($langs->trans("ErrorBadEMail"));
+	if (! empty($conf->global->MAIN_MAIL_FORCE_SENDTO))
+	{
+		if (! isValidEmail($conf->global->MAIN_MAIL_FORCE_SENDTO)) print img_warning($langs->trans("ErrorBadEMail"));
+		else print img_warning($langs->trans("RecipientEmailsWillBeReplacedWithThisValue"));
+	}
 	print '</td></tr>';
 
 	//Add user to select destinaries list

htdocs/comm/action/list.php

@@ -43,7 +43,7 @@ $action=GETPOST('action', 'alpha');
 $contextpage=GETPOST('contextpage', 'aZ')?GETPOST('contextpage', 'aZ'):'actioncommlist';   // To manage different context of search
 $resourceid=GETPOST("search_resourceid", "int")?GETPOST("search_resourceid", "int"):GETPOST("resourceid", "int");
 $pid=GETPOST("search_projectid", 'int', 3)?GETPOST("search_projectid", 'int', 3):GETPOST("projectid", 'int', 3);
-$status=GETPOST("search_status", 'alpha')?GETPOST("search_status", 'alpha'):GETPOST("status", 'alpha');
+$status=(GETPOST("search_status", 'alpha') != '')?GETPOST("search_status", 'alpha'):GETPOST("status", 'alpha');
 $type=GETPOST('search_type', 'alphanohtml')?GETPOST('search_type', 'alphanohtml'):GETPOST('type', 'alphanohtml');
 $optioncss = GETPOST('optioncss', 'alpha');
 $year=GETPOST("year", 'int');

htdocs/compta/prelevement/card.php

@@ -63,78 +63,86 @@ $object = new BonPrelevement($db, "");
 // Load object
 include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php';  // Must be include, not include_once  // Must be include, not include_once. Include fetch and fetch_thirdparty but not fetch_optionals
 
+$hookmanager->initHooks(array('directdebitprevcard','globalcard'));
 
 /*
  * Actions
  */
 
-if ( $action == 'confirm_delete' )
+$parameters = array('socid' => $socid);
+$reshook = $hookmanager->executeHooks('doActions', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
+if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+
+if (empty($reshook))
 {
-	$res=$object->delete($user);
+    if ( $action == 'confirm_delete' )
-	if ($res > 0)
+    {
+        $res=$object->delete($user);
+        if ($res > 0)
+        {
+            header("Location: index.php");
+            exit;
+        }
+    }
+
+    // Seems to no be used and replaced with $action == 'infocredit'
+    if ( $action == 'confirm_credite' && GETPOST('confirm','alpha') == 'yes')
+    {
+        $res=$object->set_credite();
+        if ($res >= 0)
+        {
+            header("Location: card.php?id=".$id);
+            exit;
+        }
+    }
+
+    if ($action == 'infotrans' && $user->rights->prelevement->bons->send)
+    {
+        require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
+
+		$dt = dol_mktime(12, 0, 0, GETPOST('remonth', 'int'), GETPOST('reday', 'int'), GETPOST('reyear', 'int'));
+
+        /*
+        if ($_FILES['userfile']['name'] && basename($_FILES['userfile']['name'],".ps") == $object->ref)
+        {
+            $dir = $conf->prelevement->dir_output.'/receipts';
+
+            if (dol_move_uploaded_file($_FILES['userfile']['tmp_name'], $dir . "/" . dol_unescapefile($_FILES['userfile']['name']),1) > 0)
+            {
+                $object->set_infotrans($user, $dt, GETPOST('methode','alpha'));
+            }
+
+            header("Location: card.php?id=".$id);
+            exit;
+        }
+        else
+        {
+            dol_syslog("Fichier invalide",LOG_WARNING);
+            $mesg='BadFile';
+        }*/
+
+		$error = $object->set_infotrans($user, $dt, GETPOST('methode', 'alpha'));
+
+        if ($error)
+        {
+            header("Location: card.php?id=".$id."&error=$error");
+            exit;
+        }
+    }
+
+	// Set direct debit order to credited, create payment and close invoices
+	if ($action == 'infocredit' && $user->rights->prelevement->bons->credit)
 	{
-		header("Location: index.php");
+		$dt = dol_mktime(12, 0, 0, GETPOST('remonth', 'int'), GETPOST('reday', 'int'), GETPOST('reyear', 'int'));
-		exit;
-	}
-}
 
-// Seems to no be used and replaced with $action == 'infocredit
+        $error = $object->set_infocredit($user, $dt);
-if ( $action == 'confirm_credite' && GETPOST('confirm', 'alpha') == 'yes')
-{
-	$res=$object->set_credite();
-	if ($res >= 0)
-	{
-    	header("Location: card.php?id=".$id);
-	    exit;
-	}
-}
 
-if ($action == 'infotrans' && $user->rights->prelevement->bons->send)
+        if ($error)
-{
+        {
-	require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
+            header("Location: card.php?id=".$id."&error=$error");
-
+            exit;
-	$dt = dol_mktime(12, 0, 0, GETPOST('remonth', 'int'), GETPOST('reday', 'int'), GETPOST('reyear', 'int'));
+        }
-
+    }
-	/*
-	if ($_FILES['userfile']['name'] && basename($_FILES['userfile']['name'],".ps") == $object->ref)
-	{
-		$dir = $conf->prelevement->dir_output.'/receipts';
-
-		if (dol_move_uploaded_file($_FILES['userfile']['tmp_name'], $dir . "/" . dol_unescapefile($_FILES['userfile']['name']),1) > 0)
-		{
-			$object->set_infotrans($user, $dt, GETPOST('methode','alpha'));
-		}
-
-		header("Location: card.php?id=".$id);
-        exit;
-	}
-	else
-	{
-		dol_syslog("Fichier invalide",LOG_WARNING);
-		$mesg='BadFile';
-	}*/
-
-	$error = $object->set_infotrans($user, $dt, GETPOST('methode', 'alpha'));
-
-	if ($error)
-	{
-		header("Location: card.php?id=".$id."&error=$error");
-		exit;
-	}
-}
-
-// Set direct debit order to credited, create payment and close invoices
-if ($action == 'infocredit' && $user->rights->prelevement->bons->credit)
-{
-	$dt = dol_mktime(12, 0, 0, GETPOST('remonth', 'int'), GETPOST('reday', 'int'), GETPOST('reyear', 'int'));
-
-	$error = $object->set_infocredit($user, $dt);
-
-	if ($error)
-	{
-		header("Location: card.php?id=".$id."&error=$error");
-		exit;
-	}
 }
 
 

htdocs/compta/sociales/card.php

@@ -655,7 +655,7 @@ if ($id > 0)
 			else
 			{
 
-				print '<tr class="oddeven"><td class="opacitymedium">'.$langs->trans("None").'</td>';
+				print '<tr class="oddeven"><td><span class="opacitymedium">'.$langs->trans("None").'</span></td>';
 				print '<td></td><td></td><td></td><td></td>';
 				print '</tr>';
 			}

htdocs/core/modules/expedition/doc/doc_generic_shipment_odt.modules.php

@@ -414,7 +414,11 @@ class doc_generic_shipment_odt extends ModelePdfExpedition
 					}
 				}
 				// Make substitutions into odt of thirdparty
-				$tmparray=$this->get_substitutionarray_thirdparty($socobject, $outputlangs);
+                if ($socobject->element == 'contact') {
+                    $tmparray = $this->get_substitutionarray_contact($socobject, $outputlangs);
+                } else {
+                    $tmparray = $this->get_substitutionarray_thirdparty($socobject, $outputlangs);
+                }
 				foreach($tmparray as $key=>$value)
 				{
 					try {

htdocs/langs/en_US/admin.lang

@@ -1930,3 +1930,4 @@ YouWillFindItOnYourIFTTTAccount=You will find it on your IFTTT account
 EndPointFor=End point for %s : %s
 DeleteEmailCollector=Delete email collector
 ConfirmDeleteEmailCollector=Are you sure you want to delete this email collector?
+RecipientEmailsWillBeReplacedWithThisValue=Recipient emails will be always replaced with this value