Merge

htdocs/accountancy/class/accountingaccount.class.php

@@ -842,7 +842,7 @@ class AccountingAccount extends CommonObject
 					}
 					$suggestedid = $accountingAccount['dom']; // There is a doubt for this case. Is it an error on vat or we just forgot to fill vat number ?
 					$suggestedaccountingaccountfor = 'eecwithoutvatnumber';
-				} elseif ($isSellerInEEC && $isBuyerInEEC && !empty($product->accountancy_code_sell_intra)) {
+				} elseif ($isSellerInEEC && $isBuyerInEEC) {
 					// European intravat sale
 					if ($type == 'customer' && !empty($product->accountancy_code_sell_intra)) {
 						$code_p = $product->accountancy_code_sell_intra;

htdocs/compta/facture/class/facture.class.php

@@ -727,7 +727,7 @@ class Facture extends CommonInvoice
 		$sql .= ", ".(empty($this->date_pointoftax) ? "null" : "'".$this->db->idate($this->date_pointoftax)."'");
 		$sql .= ", ".($this->note_private ? "'".$this->db->escape($this->note_private)."'" : "null");
 		$sql .= ", ".($this->note_public ? "'".$this->db->escape($this->note_public)."'" : "null");
-		$sql .= ", ".($this->ref_client ? "'".$this->db->escape($this->ref_client)."'" : "null");
+		$sql .= ", ".($this->ref_customer ? "'".$this->db->escape($this->ref_customer)."'" : ($this->ref_client ? "'".$this->db->escape($this->ref_client)."'" : "null"));
 		$sql .= ", ".($this->fk_account > 0 ? $this->fk_account : 'NULL');
 		$sql .= ", ".($this->module_source ? "'".$this->db->escape($this->module_source)."'" : "null");
 		$sql .= ", ".($this->pos_source != '' ? "'".$this->db->escape($this->pos_source)."'" : "null");

htdocs/core/class/CMailFile.class.php

@@ -264,12 +264,23 @@ class CMailFile
 				// This convert an embedd file with src="/viewimage.php?modulepart... into a cid link
 				// TODO Exclude viewimage used for the read tracker ?
 				$findimg = $this->findHtmlImages($dolibarr_main_data_root.'/medias');
+				if ($findimg<0) {
+					dol_syslog("CMailFile::CMailfile: Error on findHtmlImages");
+					$this->error = 'ErrorInAddAttachementsImageBaseOnMedia';
+					return;
+				}
 			}
 
 			if (!empty($conf->global->MAIN_MAIL_ADD_INLINE_IMAGES_IF_DATA)) {
 				// Search into the body for <img src="data:image/ext;base64,..." to replace them with an embedded file
 				// This convert an embedded file with src="data:image... into a cid link + attached file
-				$findimg = $this->findHtmlImagesIsSrcData($upload_dir_tmp);
+				$resultImageData = $this->findHtmlImagesIsSrcData($upload_dir_tmp);
+				if ($resultImageData<0) {
+					dol_syslog("CMailFile::CMailfile: Error on findHtmlImagesInSrcData");
+					$this->error = 'ErrorInAddAttachementsImageBaseOnMedia';
+					return;
+				}
+				$findimg += $resultImageData;
 			}
 
 			// Set atleastoneimage if there is at least one embedded file (into ->html_images)
@@ -1892,7 +1903,7 @@ class CMailFile
 
 		// We search (into mail body this->html), if we find some strings like "... file=xxx.img"
 		// For example when:
-		// <img alt="" src="/viewimage.php?modulepart=medias&amp;entity=1&amp;file=image/picture.jpg" style="height:356px; width:1040px" />
+		// <img alt="" src="/src="data:image....;base64,...." />
 		$matches = array();
 		preg_match_all('/src="data:image\/('.implode('|', $extensions).');base64,([^"]+)"/Ui', $this->html, $matches); // If "xxx.ext" or 'xxx.ext' found
 
@@ -1903,7 +1914,7 @@ class CMailFile
 				return -1;
 			}
 
-			$i = 0;
+			$i = count($this->html_images);
 			foreach ($matches[1] as $key => $ext) {
 				// We save the image to send in disk
 				$filecontent = $matches[2][$key];

htdocs/don/list.php

@@ -135,7 +135,10 @@ $sql .= " p.rowid as pid, p.ref, p.title, p.public";
 $sqlfields = $sql; // $sql fields to remove for count total
 
 $sql .= " FROM ".MAIN_DB_PREFIX."don as d LEFT JOIN ".MAIN_DB_PREFIX."projet AS p";
-$sql .= " ON p.rowid = d.fk_projet WHERE d.entity IN (".getEntity('donation').")";
+$sql .= " ON p.rowid = d.fk_projet";
+$sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "societe AS s ON s.rowid = d.fk_soc";
+$sql .= " WHERE d.entity IN (". getEntity('donation') . ")";
+
 if ($search_status != '' && $search_status != '-4') {
 	$sql .= " AND d.fk_statut IN (".$db->sanitize($search_status).")";
 }
@@ -148,6 +151,9 @@ if (trim($search_all) != '') {
 if (trim($search_company) != '') {
 	$sql .= natural_search('d.societe', $search_company);
 }
+if (trim($search_thirdparty) != '') {
+	$sql .= natural_search("s.nom", $search_thirdparty);
+}
 if (trim($search_name) != '') {
 	$sql .= natural_search(array('d.lastname', 'd.firstname'), $search_name);
 }

htdocs/includes/odtphp/odf.php

@@ -246,23 +246,23 @@ class Odf
 						break;
 					case 'strong':
 					case 'b':
-						$odtResult .= '<text:span text:style-name="boldText">' . ($tag['children'] != null ? $this->_replaceHtmlWithOdtTag($tag['children'], $customStyles, $fontDeclarations) : $this->encode_chars($tag['innerText'], $encode, $charset)) . '</text:span>';
+						$odtResult .= '<text:span text:style-name="boldText">' . ($tag['children'] != null ? $this->_replaceHtmlWithOdtTag($tag['children'], $customStyles, $fontDeclarations, $encode) : $this->encode_chars($tag['innerText'], $encode, $charset)) . '</text:span>';
 						break;
 					case 'i':
 					case 'em':
-						$odtResult .= '<text:span text:style-name="italicText">' . ($tag['children'] != null ? $this->_replaceHtmlWithOdtTag($tag['children'], $customStyles, $fontDeclarations) : $this->encode_chars($tag['innerText'], $encode, $charset)) . '</text:span>';
+						$odtResult .= '<text:span text:style-name="italicText">' . ($tag['children'] != null ? $this->_replaceHtmlWithOdtTag($tag['children'], $customStyles, $fontDeclarations, $encode) : $this->encode_chars($tag['innerText'], $encode, $charset)) . '</text:span>';
 						break;
 					case 'u':
-						$odtResult .= '<text:span text:style-name="underlineText">' . ($tag['children'] != null ? $this->_replaceHtmlWithOdtTag($tag['children'], $customStyles, $fontDeclarations) : $this->encode_chars($tag['innerText'], $encode, $charset)) . '</text:span>';
+						$odtResult .= '<text:span text:style-name="underlineText">' . ($tag['children'] != null ? $this->_replaceHtmlWithOdtTag($tag['children'], $customStyles, $fontDeclarations, $encode) : $this->encode_chars($tag['innerText'], $encode, $charset)) . '</text:span>';
 						break;
 					case 's':
-						$odtResult .= '<text:span text:style-name="strikethroughText">' . ($tag['children'] != null ? $this->_replaceHtmlWithOdtTag($tag['children'], $customStyles, $fontDeclarations) : $this->encode_chars($tag['innerText'], $encode, $charset)) . '</text:span>';
+						$odtResult .= '<text:span text:style-name="strikethroughText">' . ($tag['children'] != null ? $this->_replaceHtmlWithOdtTag($tag['children'], $customStyles, $fontDeclarations, $encode) : $this->encode_chars($tag['innerText'], $encode, $charset)) . '</text:span>';
 						break;
 					case 'sub':
-						$odtResult .= '<text:span text:style-name="subText">' . ($tag['children'] != null ? $this->_replaceHtmlWithOdtTag($tag['children'], $customStyles, $fontDeclarations) : $this->encode_chars($tag['innerText'], $encode, $charset)) . '</text:span>';
+						$odtResult .= '<text:span text:style-name="subText">' . ($tag['children'] != null ? $this->_replaceHtmlWithOdtTag($tag['children'], $customStyles, $fontDeclarations, $encode) : $this->encode_chars($tag['innerText'], $encode, $charset)) . '</text:span>';
 						break;
 					case 'sup':
-						$odtResult .= '<text:span text:style-name="supText">' . ($tag['children'] != null ? $this->_replaceHtmlWithOdtTag($tag['children'], $customStyles, $fontDeclarations) : $this->encode_chars($tag['innerText'], $encode, $charset)) . '</text:span>';
+						$odtResult .= '<text:span text:style-name="supText">' . ($tag['children'] != null ? $this->_replaceHtmlWithOdtTag($tag['children'], $customStyles, $fontDeclarations, $encode) : $this->encode_chars($tag['innerText'], $encode, $charset)) . '</text:span>';
 						break;
 					case 'span':
 						if (isset($tag['attributes']['style'])) {
@@ -299,12 +299,12 @@ class Odf
 								// Generate a unique id for the style (using microtime and random because some CPUs are really fast...)
 								$key = floatval(str_replace('.', '', microtime(true))) + rand(0, 10);
 								$customStyles[$key] = $odtStyles;
-								$odtResult .= '<text:span text:style-name="customStyle' . $key . '">' . ($tag['children'] != null ? $this->_replaceHtmlWithOdtTag($tag['children'], $customStyles, $fontDeclarations) : $this->encode_chars($tag['innerText'], $encode, $charset)) . '</text:span>';
+								$odtResult .= '<text:span text:style-name="customStyle' . $key . '">' . ($tag['children'] != null ? $this->_replaceHtmlWithOdtTag($tag['children'], $customStyles, $fontDeclarations, $encode) : $this->encode_chars($tag['innerText'], $encode, $charset)) . '</text:span>';
 							}
 						}
 						break;
 					default:
-						$odtResult .= $this->_replaceHtmlWithOdtTag($tag['children'], $customStyles, $fontDeclarations);
+						$odtResult .= $this->_replaceHtmlWithOdtTag($tag['children'], $customStyles, $fontDeclarations, $encode);
 						break;
 				}
 			}

htdocs/theme/eldy/global.inc.php

@@ -5133,6 +5133,7 @@ div.ui-tooltip.mytooltip {
 	color: var(--tooltipfontcolor);
 	line-height: 1.6em;
 	min-width: 550px;
+	pointer-events: none;
 }
 
 <?php

test/phpunit/CMailFileTest.php

@@ -29,6 +29,7 @@ global $conf,$user,$langs,$db;
 //require_once 'PHPUnit/Autoload.php';
 require_once dirname(__FILE__) . '/../../htdocs/master.inc.php';
 require_once dirname(__FILE__) . '/../../htdocs/core/class/CMailFile.class.php';
+require_once dirname(__FILE__) . '/../../htdocs/core/lib/files.lib.php';
 
 if (empty($user->id)) {
 	print "Load permissions for admin user nb 1\n";
@@ -118,6 +119,7 @@ class CMailFileTest extends PHPUnit\Framework\TestCase
 
 		print __METHOD__ . "\n";
 	}
+
 	/**
 	 * End phpunit tests
 	 *
@@ -207,4 +209,65 @@ class CMailFileTest extends PHPUnit\Framework\TestCase
 
 		return $result;
 	}
+
+	/**
+	 * testCMailFileHTMLWithImage
+	 *
+	 * @return int
+	 */
+	public function testCMailFileHTMLWithImage()
+	{
+		global $conf, $user, $langs, $db;
+
+		$conf = $this->savconf;
+		$user = $this->savuser;
+		$langs = $this->savlangs;
+		$db = $this->savdb;
+		$conf->global->MAIN_MAIL_ADD_INLINE_IMAGES_IF_IN_MEDIAS = 1;
+		$conf->global->MAIN_MAIL_ADD_INLINE_IMAGES_IF_DATA = 1;
+
+		dol_delete_dir_recursive(DOL_DATA_ROOT . '/medias/image');
+		dol_mkdir(DOL_DATA_ROOT . '/medias/image');
+		dol_copy(dirname(__FILE__) . '/img250x20.png', DOL_DATA_ROOT . '/medias/image/img250x20.png');
+
+		$msg = '<html><body>';
+		$msg .= '<img alt="" src="/viewimage.php?modulepart=medias&amp;entity=1&amp;file=image/img250x20.png" style="height:39px; width:150px" />';
+		$msg .= ' <p>From wikipedia</p> <img src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAUAAAAFCAYAAACNbyblAAAAHElEQVQI12P4//8/w38GIAXDIBKE0DHxgljNBAAO9TXL0Y4OHwAAAABJRU5ErkJggg==" alt="Red dot" />';
+		$msg .= '</body></html>';
+
+
+		$localobject = new CMailFile('Test', 'test@test.com', 'from@from.com', $msg, array(), array(), array(), '', '', 0, -1, '', '', '', '', 'standard', '', '/tmp');
+
+		$result = count($localobject->html_images);
+		print __METHOD__ . " result count image detected in the mail=" . $result . "\n";
+		$this->assertEquals($result, 2);
+
+
+		foreach ($localobject->html_images as $i => $val)
+		if ($localobject->html_images[$i]) {
+			if (preg_match('/img250x20\.png/i', $localobject->html_images[$i]['fullpath'])) {
+				print __METHOD__ . " content type must be image png =" . $localobject->html_images[$i]['content_type'] . "\n";
+				$this->assertEquals($localobject->html_images[$i]['content_type'], 'image/png');
+
+				print __METHOD__ . " type must be cidfromurl =" . $localobject->html_images[$i]['type'] . "\n";
+				$this->assertEquals($localobject->html_images[$i]['type'], 'cidfromurl');
+
+				$fileSize = 9744;
+				print __METHOD__ . " File size must be =" . $fileSize . "\n";
+				$this->assertEquals(dol_filesize($localobject->html_images[$i]['fullpath']), $fileSize);
+			} elseif (preg_match('/\.png/i', $localobject->html_images[$i]['fullpath'])) {
+				print __METHOD__ . " content type must be image png =" . $localobject->html_images[$i]['content_type'] . "\n";
+				$this->assertEquals($localobject->html_images[$i]['content_type'], 'image/png');
+
+				print __METHOD__ . " type must be cidfromdata =" . $localobject->html_images[$i]['type'] . "\n";
+				$this->assertEquals($localobject->html_images[$i]['type'], 'cidfromdata');
+
+				$fileSize = 85;
+				print __METHOD__ . " File size must be =" . $fileSize . "\n";
+				$this->assertEquals(dol_filesize($localobject->html_images[$i]['fullpath']), $fileSize);
+			}
+		}
+
+		return $result;
+	}
 }