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

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

Browse Source 
Conflicts:
	htdocs/core/actions_massactions.inc.php
This commit is contained in:
Laurent Destailleur 2019-06-24 16:28:48 +02:00
commit 28024d5cd1
4 changed files with 982 additions and 956 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

File diff suppressed because it is too large Load Diff

2
htdocs/core/class/commonobject.class.php
View File

@ -6519,7 +6519,7 @@ abstract class CommonObject
jQuery(document).ready(function() { jQuery(document).ready(function() {
function showOptions(child_list, parent_list) function showOptions(child_list, parent_list)
{ {
var val = $("select[name=\"options_"+parent_list+"\"]").val(); var val = $("select[name=\""+parent_list+"\"]").val();
var parentVal = parent_list + ":" + val; var parentVal = parent_list + ":" + val;
if(val > 0) { if(val > 0) {
$("select[name=\""+child_list+"\"] option[parent]").hide(); $("select[name=\""+child_list+"\"] option[parent]").hide();

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

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

2
htdocs/user/card.php
View File

@ -1790,7 +1790,7 @@ else
if (! empty($object->email)) if (! empty($object->email))
{ {
$langs->load("mails"); $langs->load("mails");
print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&amp;action=presend&amp;mode=init#presend">'.$langs->trans('SendMail').'</a></div>'; print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&amp;action=presend&amp;mode=init#formmailbeforetitle">'.$langs->trans('SendMail').'</a></div>';
} }
else else
{ {