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

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

Browse Source
This commit is contained in:
Laurent Destailleur 2021-03-16 10:59:17 +01:00
commit 882a9c0792
5 changed files with 16 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
htdocs/categories/card.php
View File

@ -97,7 +97,7 @@ $error = 0;
// Add action // Add action
if ($action == 'add' && $user->rights->categorie->creer) { if ($action == 'add' && $user->rights->categorie->creer) {
// Action ajout d'une categorie // Action add a category
if ($cancel) { if ($cancel) {
if ($urlfrom) { if ($urlfrom) {
header("Location: ".$urlfrom); header("Location: ".$urlfrom);
@ -167,7 +167,7 @@ if ($action == 'add' && $user->rights->categorie->creer) {
// Confirm action // Confirm action
if (($action == 'add' || $action == 'confirmed') && $user->rights->categorie->creer) { if (($action == 'add' || $action == 'confirmed') && $user->rights->categorie->creer) {
// Action confirmation de creation categorie // Action confirmation of creation category
if ($action == 'confirmed') { if ($action == 'confirmed') {
if ($urlfrom) { if ($urlfrom) {
header("Location: ".$urlfrom); header("Location: ".$urlfrom);
@ -208,7 +208,7 @@ if (($action == 'add' || $action == 'confirmed') && $user->rights->categorie->cr
$form = new Form($db); $form = new Form($db);
$formother = new FormOther($db); $formother = new FormOther($db);
$helpurl = ''; $helpurl = 'EN:Module_Categories|FR:Module_Catégories';
llxHeader("", $langs->trans("Categories"), $helpurl); llxHeader("", $langs->trans("Categories"), $helpurl);
if ($user->rights->categorie->creer) { if ($user->rights->categorie->creer) {

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

@ -756,7 +756,7 @@ class FormMail extends Form
$out .= '<td>'; $out .= '<td>';
if ($this->withmaindocfile) { if ($this->withmaindocfile) {
// withmaindocfile is set to 1 or -1 to show the checkbox (-1 = checked or 1 = not checked) // withmaindocfile is set to 1 or -1 to show the checkbox (-1 = checked or 1 = not checked)
if (GETPOSTISSET('sendmail')) { if (GETPOSTISSET('sendmail')) {
$this->withmaindocfile = (GETPOST('addmaindocfile', 'alpha') ? -1 : 1); $this->withmaindocfile = (GETPOST('addmaindocfile', 'alpha') ? -1 : 1);
@ -1641,7 +1641,14 @@ class ModelMail
*/ */
public $label; public $label;
/**
* @var string Model mail topic
*/
public $topic; public $topic;
/**
* @var string Model mail content
*/
public $content; public $content;
public $content_lines; public $content_lines;
public $lang; public $lang;

2
htdocs/ftp/index.php
View File

@ -123,7 +123,7 @@ if (GETPOST("sendit") && !empty($conf->global->MAIN_UPLOAD_DOC)) {
} }
} }
} else { } else {
// Echec transfert (fichier depassant la limite ?) // Transfer failure (file exceeding the limit ?)
$langs->load("errors"); $langs->load("errors");
setEventMessages($langs->trans("ErrorFailToCreateDir", $upload_dir), null, 'errors'); setEventMessages($langs->trans("ErrorFailToCreateDir", $upload_dir), null, 'errors');
} }

4
htdocs/user/list.php
View File

@ -308,8 +308,8 @@ if (empty($reshook)) {
$formother = new FormOther($db); $formother = new FormOther($db);
//$help_url="EN:Module_MyObject|FR:Module_MyObject_FR|ES:Módulo_MyObject"; $help_url = 'EN:Module_Users|FR:Module_Utilisateurs|ES:M&oacute;dulo_Usuarios|DE:Modul_Benutzer';
$help_url = '';
if ($contextpage == 'employeelist' && $search_employee == 1) { if ($contextpage == 'employeelist' && $search_employee == 1) {
$text = $langs->trans("ListOfEmployees"); $text = $langs->trans("ListOfEmployees");
} else { } else {

4
htdocs/zapier/hook_document.php
View File

@ -96,8 +96,8 @@ include DOL_DOCUMENT_ROOT.'/core/actions_linkedfiles.inc.php';
$form = new Form($db); $form = new Form($db);
$title = $langs->trans("MyObject").' - '.$langs->trans("Files"); $title = $langs->trans("MyObject").' - '.$langs->trans("Files");
$help_url = ''; $help_url = 'EN:Module_Zapier|ES:Módulo Zapier|FR:Module_Zapier_FR|DE:Modul_Zapier';
//$help_url='EN:Module_Third_Parties|FR:Module_Tiers|ES:Empresas';
llxHeader('', $title, $help_url); llxHeader('', $title, $help_url);
if ($object->id) { if ($object->id) {