Merge branch 'develop' into phpstan/actioncomm
This commit is contained in:
commit
b403170c67
7 changed files with 29 additions and 21 deletions
|
|
@ -2029,6 +2029,7 @@ Notify_MEMBER_MODIFY
|
|||
Notify_MEMBER_RESILIATE
|
||||
Notify_MEMBER_SUBSCRIPTION
|
||||
Notify_MEMBER_VALIDATE
|
||||
Notify_ORDER_CANCEL
|
||||
Notify_ORDER_CLOSE
|
||||
Notify_ORDER_SENTBYMAIL
|
||||
Notify_ORDER_SUPPLIER_APPROVE
|
||||
|
|
|
|||
|
|
@ -189,35 +189,25 @@ print '<form method="post" action="'.$_SERVER["PHP_SELF"].'">';
|
|||
print '<input type="hidden" name="token" value="'.newToken().'">';
|
||||
print '<input type="hidden" name="action" value="setvalue">';
|
||||
|
||||
print '<div class="div-table-responsive">';
|
||||
print '<div class="div-table-responsive-no-min">';
|
||||
print '<table class="noborder centpercent">';
|
||||
print '<tr class="liste_titre">';
|
||||
print '<td>'.$langs->trans("Parameter").'</td>';
|
||||
print '<td>'.$langs->trans("Value").'</td>';
|
||||
print "</tr>\n";
|
||||
|
||||
|
||||
print '<tr class="oddeven"><td>';
|
||||
print $langs->trans("NotificationEMailFrom").'</td>';
|
||||
print '<td>';
|
||||
print img_picto('', 'email', 'class="pictofixedwidth"');
|
||||
print '<input class="width150 quatrevingtpercentminusx" type="email" name="email_from" value="'.getDolGlobalString('NOTIFICATION_EMAIL_FROM').'">';
|
||||
if (getDolGlobalString('NOTIFICATION_EMAIL_FROM') && !isValidEmail($conf->global->NOTIFICATION_EMAIL_FROM)) {
|
||||
if (getDolGlobalString('NOTIFICATION_EMAIL_FROM') && !isValidEmail(getDolGlobalString('NOTIFICATION_EMAIL_FROM'))) {
|
||||
print ' '.img_warning($langs->trans("ErrorBadEMail"));
|
||||
}
|
||||
print '</td>';
|
||||
print '</tr>';
|
||||
|
||||
print '<tr class="oddeven"><td>';
|
||||
print $langs->trans("NotificationDisableConfirmMessageContact").'</td>';
|
||||
print '<td>';
|
||||
if ($conf->use_javascript_ajax) {
|
||||
print ajax_constantonoff('NOTIFICATION_EMAIL_DISABLE_CONFIRM_MESSAGE_CONTACT');
|
||||
} else {
|
||||
$arrval = array('0' => $langs->trans("No"), '1' => $langs->trans("Yes"));
|
||||
print $form->selectarray("NOTIFICATION_EMAIL_DISABLE_CONFIRM_MESSAGE_CONTACT", $arrval, getDolGlobalString('NOTIFICATION_EMAIL_DISABLE_CONFIRM_MESSAGE_CONTACT'));
|
||||
}
|
||||
print '</td>';
|
||||
print '</tr>';
|
||||
|
||||
print '<tr class="oddeven"><td>';
|
||||
print $langs->trans("NotificationDisableConfirmMessageUser").'</td>';
|
||||
|
|
@ -231,6 +221,20 @@ if ($conf->use_javascript_ajax) {
|
|||
print '</td>';
|
||||
print '</tr>';
|
||||
|
||||
|
||||
print '<tr class="oddeven"><td>';
|
||||
print $langs->trans("NotificationDisableConfirmMessageContact").'</td>';
|
||||
print '<td>';
|
||||
if ($conf->use_javascript_ajax) {
|
||||
print ajax_constantonoff('NOTIFICATION_EMAIL_DISABLE_CONFIRM_MESSAGE_CONTACT');
|
||||
} else {
|
||||
$arrval = array('0' => $langs->trans("No"), '1' => $langs->trans("Yes"));
|
||||
print $form->selectarray("NOTIFICATION_EMAIL_DISABLE_CONFIRM_MESSAGE_CONTACT", $arrval, getDolGlobalString('NOTIFICATION_EMAIL_DISABLE_CONFIRM_MESSAGE_CONTACT'));
|
||||
}
|
||||
print '</td>';
|
||||
print '</tr>';
|
||||
|
||||
|
||||
print '<tr class="oddeven"><td>';
|
||||
print $langs->trans("NotificationDisableConfirmMessageFix").'</td>';
|
||||
print '<td>';
|
||||
|
|
@ -242,6 +246,8 @@ if ($conf->use_javascript_ajax) {
|
|||
}
|
||||
print '</td>';
|
||||
print '</tr>';
|
||||
|
||||
|
||||
print '</table>';
|
||||
print '</div>';
|
||||
|
||||
|
|
|
|||
|
|
@ -120,7 +120,7 @@ if ($action == 'update' && !GETPOST("cancel") && $user->hasRight('societe', 'con
|
|||
|
||||
$now = dol_now();
|
||||
|
||||
$title = (getDolGlobalString('SOCIETE_ADDRESSES_MANAGEMENT') ? $langs->trans("Contacts") : $langs->trans("ContactsAddresses"));
|
||||
$title = $langs->trans("ContactPersonalData");
|
||||
if (getDolGlobalString('MAIN_HTML_TITLE') && preg_match('/contactnameonly/', getDolGlobalString('MAIN_HTML_TITLE')) && $object->lastname) {
|
||||
$title = $object->lastname;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -646,7 +646,7 @@ class Notify
|
|||
if (getDolGlobalString('MAIN_APPLICATION_TITLE')) {
|
||||
$application = getDolGlobalString('MAIN_APPLICATION_TITLE');
|
||||
}
|
||||
$replyto = $conf->notification->email_from;
|
||||
$from = getDolGlobalString('NOTIFICATION_EMAIL_FROM');
|
||||
$object_type = '';
|
||||
$link = '';
|
||||
$num = 0;
|
||||
|
|
@ -945,7 +945,7 @@ class Notify
|
|||
$sendto = preg_replace('/[\s,]+$/', '', $sendto); // Clean end of string
|
||||
}
|
||||
|
||||
$parameters = array('notifcode' => $notifcode, 'sendto' => $sendto, 'replyto' => $replyto, 'file' => $filename_list, 'mimefile' => $mimetype_list, 'filename' => $mimefilename_list, 'outputlangs' => $outputlangs, 'labeltouse' => $labeltouse);
|
||||
$parameters = array('notifcode' => $notifcode, 'sendto' => $sendto, 'from' => $from, 'file' => $filename_list, 'mimefile' => $mimetype_list, 'filename' => $mimefilename_list, 'outputlangs' => $outputlangs, 'labeltouse' => $labeltouse);
|
||||
if (!isset($action)) {
|
||||
$action = '';
|
||||
}
|
||||
|
|
@ -968,7 +968,7 @@ class Notify
|
|||
$mailfile = new CMailFile(
|
||||
$subject,
|
||||
$sendto,
|
||||
$replyto,
|
||||
$from,
|
||||
$message,
|
||||
$filename_list,
|
||||
$mimetype_list,
|
||||
|
|
@ -1211,7 +1211,7 @@ class Notify
|
|||
}
|
||||
|
||||
if ($sendto) {
|
||||
$parameters = array('notifcode' => $notifcode, 'sendto' => $sendto, 'replyto' => $replyto, 'file' => $filename_list, 'mimefile' => $mimetype_list, 'filename' => $mimefilename_list, 'subject' => &$subject, 'message' => &$message);
|
||||
$parameters = array('notifcode' => $notifcode, 'sendto' => $sendto, 'from' => $from, 'file' => $filename_list, 'mimefile' => $mimetype_list, 'filename' => $mimefilename_list, 'subject' => &$subject, 'message' => &$message);
|
||||
$reshook = $hookmanager->executeHooks('formatNotificationMessage', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
|
||||
if (empty($reshook)) {
|
||||
if (!empty($hookmanager->resArray['files'])) {
|
||||
|
|
@ -1229,7 +1229,7 @@ class Notify
|
|||
$mailfile = new CMailFile(
|
||||
$subject,
|
||||
$sendto,
|
||||
$replyto,
|
||||
$from,
|
||||
$message,
|
||||
$filename_list,
|
||||
$mimetype_list,
|
||||
|
|
|
|||
|
|
@ -187,7 +187,7 @@ class ExpenseReports extends DolibarrApi
|
|||
continue;
|
||||
}
|
||||
|
||||
$this->expensereport->$field = $this->_checkValForAPI($field, $value, $this->epensereport);
|
||||
$this->expensereport->$field = $this->_checkValForAPI($field, $value, $this->expensereport);
|
||||
}
|
||||
/*if (isset($request_data["lines"])) {
|
||||
$lines = array();
|
||||
|
|
|
|||
|
|
@ -42,6 +42,7 @@ notiftouserandtofixedemail=To user and fixed mail
|
|||
Notify_ORDER_VALIDATE=Sales order validated
|
||||
Notify_ORDER_SENTBYMAIL=Sales order sent by mail
|
||||
Notify_ORDER_CLOSE=Sales order delivered
|
||||
Notify_ORDER_CANCEL=Sales order canceled
|
||||
Notify_ORDER_SUPPLIER_SENTBYMAIL=Purchase order sent by email
|
||||
Notify_ORDER_SUPPLIER_VALIDATE=Purchase order recorded
|
||||
Notify_ORDER_SUPPLIER_APPROVE=Purchase order approved
|
||||
|
|
|
|||
|
|
@ -212,7 +212,7 @@ class MyModuleApi extends DolibarrApi
|
|||
|
||||
if ($field == 'array_options' && is_array($value)) {
|
||||
foreach ($value as $index => $val) {
|
||||
$this->contact->array_options[$index] = $this->_checkValForAPI('extrafields', $val, $this->contact);
|
||||
$this->myobject->array_options[$index] = $this->_checkValForAPI('extrafields', $val, $this->myobject);
|
||||
}
|
||||
continue;
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in a new issue