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-04-19 21:11:07 +02:00
commit c03baad319
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
htdocs/admin/agenda.php
View File

@ -112,8 +112,11 @@ if ($action == "save" && empty($cancel)) {
* View * View
*/ */
$wikihelp = 'EN:Module_Agenda_En|FR:Module_Agenda|ES:Módulo_Agenda'; // $wikihelp = 'EN:Module_Agenda_En|FR:Module_Agenda|ES:Módulo_Agenda';
llxHeader('', $langs->trans("AgendaSetup"), $wikihelp);
$help_url = 'EN:Module_Agenda_En|FR:Module_Agenda|ES:Módulo_Agenda';
llxHeader('', $langs->trans("AgendaSetup"), $help_url);
$linkback = '<a href="'.DOL_URL_ROOT.'/admin/modules.php?restore_lastsearch_values=1">'.$langs->trans("BackToModuleList").'</a>'; $linkback = '<a href="'.DOL_URL_ROOT.'/admin/modules.php?restore_lastsearch_values=1">'.$langs->trans("BackToModuleList").'</a>';
print load_fiche_titre($langs->trans("AgendaSetup"), $linkback, 'title_setup'); print load_fiche_titre($langs->trans("AgendaSetup"), $linkback, 'title_setup');

4
htdocs/supplier_proposal/contact.php
View File

@ -78,7 +78,7 @@ if ($action == 'addcontact' && $permissiontoedit) {
if ($object->fetch($id)) { if ($object->fetch($id)) {
$result = $object->swapContactStatus(GETPOST('ligne', 'int')); $result = $object->swapContactStatus(GETPOST('ligne', 'int'));
} else { } else {
dol_print_error($db); setEventMessages($object->error, $object->errors, 'errors');
} }
} elseif ($action == 'deletecontact' && $permissiontoedit) { } elseif ($action == 'deletecontact' && $permissiontoedit) {
// Deleting a contact // Deleting a contact
@ -89,7 +89,7 @@ if ($action == 'addcontact' && $permissiontoedit) {
header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id); header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
exit; exit;
} else { } else {
dol_print_error($db); setEventMessages($object->error, $object->errors, 'errors');
} }
} }