lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
Conflicts:
	htdocs/adherents/class/adherent.class.php
	htdocs/core/actions_massactions.inc.php
	htdocs/core/tpl/massactions_pre.tpl.php
This commit is contained in:
Laurent Destailleur 2019-06-24 16:12:20 +02:00
commit 3d185b6818
2 changed files with 981 additions and 958 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1938
htdocs/core/actions_massactions.inc.php
View File

File diff suppressed because it is too large Load Diff

1
htdocs/core/class/html.formmail.class.php
View File

@ -1030,7 +1030,6 @@ class FormMail extends Form
$defaultmessage=preg_replace("/^(<br>)+/","",$defaultmessage);
$defaultmessage=preg_replace("/^\n+/","",$defaultmessage);
}
$out.= '<tr>';
$out.= '<td valign="top">';
$out.=$form->textwithpicto($langs->trans('MailText'), $helpforsubstitution, 1, 'help', '', 0, 2, 'substittooltipfrombody');