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 15:16:01 +01:00
commit 17031fdad8
8 changed files with 30 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
htdocs/contrat/card.php
View File

@ -971,7 +971,10 @@ if (empty($reshook)) {
* View * View
*/ */
llxHeader('', $langs->trans("Contract"), "");
$help_url = 'EN:Module_Contracts|FR:Module_Contrat';
llxHeader('', $langs->trans("Contract"), $help_url);
$form = new Form($db); $form = new Form($db);
$formfile = new FormFile($db); $formfile = new FormFile($db);

4
htdocs/don/card.php
View File

@ -329,7 +329,9 @@ if ($action == 'builddoc')
* View * View
*/ */
llxHeader('', $langs->trans("Donation"), 'EN:Module_Donations|FR:Module_Dons|ES:Módulo_Donaciones'); $help_url = 'EN:Module_Donations|FR:Module_Dons|ES:Módulo_Donaciones';
llxHeader('', $langs->trans("Donation"), $help_url);
$form = new Form($db); $form = new Form($db);
$formfile = new FormFile($db); $formfile = new FormFile($db);

4
htdocs/expedition/card.php
View File

@ -784,7 +784,9 @@ if (empty($reshook)) {
* View * View
*/ */
llxHeader('', $langs->trans('Shipment'), 'Expedition'); $help_url = 'EN:Module_Shipments|FR:Module_Expéditions|ES:Módulo_Expediciones|DE:Modul_Lieferungen';
llxHeader('', $langs->trans('Shipment'), 'Expedition', $help_url);
$form = new Form($db); $form = new Form($db);
$formfile = new FormFile($db); $formfile = new FormFile($db);

4
htdocs/expensereport/card.php
View File

@ -1311,9 +1311,9 @@ if (empty($reshook)) {
*/ */
$title = $langs->trans("ExpenseReport")." - ".$langs->trans("Card"); $title = $langs->trans("ExpenseReport")." - ".$langs->trans("Card");
$helpurl = "EN:Module_Expense_Reports"; $help_url = "EN:Module_Expense_Reports|FR:Module_Notes_de_frais";
llxHeader("", $title, $helpurl); llxHeader("", $title, $help_url);
$form = new Form($db); $form = new Form($db);
$formfile = new FormFile($db); $formfile = new FormFile($db);

5
htdocs/exports/index.php
View File

@ -39,7 +39,10 @@ $export->load_arrays($user);
$form = new Form($db); $form = new Form($db);
llxHeader('', $langs->trans("ExportsArea"), 'EN:Module_Exports_En|FR:Module_Exports|ES:Módulo_Exportaciones');
$help_url = 'EN:Module_Exports_En|FR:Module_Exports|ES:Módulo_Exportaciones';
llxHeader('', $langs->trans("ExportsArea"), $help_url);
print load_fiche_titre($langs->trans("ExportsArea")); print load_fiche_titre($langs->trans("ExportsArea"));

5
htdocs/fichinter/card.php
View File

@ -759,7 +759,10 @@ if (!empty($conf->projet->enabled)) {
$formproject = new FormProjets($db); $formproject = new FormProjets($db);
} }
llxHeader('', $langs->trans("Intervention"));
$help_url = 'EN:Module_Interventions';
llxHeader('', $langs->trans("Intervention"), $help_url);
if ($action == 'create') { if ($action == 'create') {
// Create new intervention // Create new intervention

11
htdocs/imports/import.php
View File

@ -361,6 +361,9 @@ if ($action == 'saveorder') {
*/ */
$help_url = 'EN:Module_Imports_En|FR:Module_Imports|ES:Módulo_Importaciones';
// STEP 1: Page to select dataset to import // STEP 1: Page to select dataset to import
if ($step == 1 || !$datatoimport) { if ($step == 1 || !$datatoimport) {
// Clean saved file-database matching // Clean saved file-database matching
@ -382,7 +385,7 @@ if ($step == 1 || !$datatoimport) {
$param .= '&enclosure='.urlencode($enclosure); $param .= '&enclosure='.urlencode($enclosure);
} }
llxHeader('', $langs->trans("NewImport"), 'EN:Module_Imports_En|FR:Module_Imports|ES:Módulo_Importaciones'); llxHeader('', $langs->trans("NewImport"), $help_url);
$head = import_prepare_head($param, 1); $head = import_prepare_head($param, 1);
@ -449,7 +452,7 @@ if ($step == 2 && $datatoimport) {
$param .= '&enclosure='.urlencode($enclosure); $param .= '&enclosure='.urlencode($enclosure);
} }
llxHeader('', $langs->trans("NewImport"), 'EN:Module_Imports_En|FR:Module_Imports|ES:Módulo_Importaciones'); llxHeader('', $langs->trans("NewImport"), $help_url);
$head = import_prepare_head($param, 2); $head = import_prepare_head($param, 2);
@ -543,7 +546,7 @@ if ($step == 3 && $datatoimport) {
$list = $objmodelimport->liste_modeles($db); $list = $objmodelimport->liste_modeles($db);
llxHeader('', $langs->trans("NewImport"), 'EN:Module_Imports_En|FR:Module_Imports|ES:Módulo_Importaciones'); llxHeader('', $langs->trans("NewImport"), $help_url);
$head = import_prepare_head($param, 3); $head = import_prepare_head($param, 3);
@ -853,7 +856,7 @@ if ($step == 4 && $datatoimport) {
$param .= '&enclosure='.urlencode($enclosure); $param .= '&enclosure='.urlencode($enclosure);
} }
llxHeader('', $langs->trans("NewImport"), 'EN:Module_Imports_En|FR:Module_Imports|ES:Módulo_Importaciones'); llxHeader('', $langs->trans("NewImport"), $help_url);
$head = import_prepare_head($param, 4); $head = import_prepare_head($param, 4);

4
htdocs/societe/card.php
View File

@ -905,7 +905,9 @@ $title = $langs->trans("ThirdParty");
if (!empty($conf->global->MAIN_HTML_TITLE) && preg_match('/thirdpartynameonly/', $conf->global->MAIN_HTML_TITLE) && $object->name) { if (!empty($conf->global->MAIN_HTML_TITLE) && preg_match('/thirdpartynameonly/', $conf->global->MAIN_HTML_TITLE) && $object->name) {
$title = $object->name." - ".$langs->trans('Card'); $title = $object->name." - ".$langs->trans('Card');
} }
$help_url = 'EN:Module_Third_Parties|FR:Module_Tiers|ES:Empresas';
$help_url = 'EN:Module_Third_Parties|FR:Module_Tiers|ES:Empresas|DE:Modul_Geschäftspartner';
llxHeader('', $title, $help_url); llxHeader('', $title, $help_url);
$countrynotdefined = $langs->trans("ErrorSetACountryFirst").' ('.$langs->trans("SeeAbove").')'; $countrynotdefined = $langs->trans("ErrorSetACountryFirst").' ('.$langs->trans("SeeAbove").')';