Mirrors/dolibarr
1
0
Fork 0
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-02-20 13:46:52 +01:00
Code Issues Packages Projects Releases Wiki Activity

Debug v17

Browse Source
This commit is contained in:
Laurent Destailleur 2022-12-22 16:21:25 +01:00
parent b0bf5d8298
commit 68ebd850f4
16 changed files with 26 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
htdocs/adherents/subscription/list.php
View File

@ -242,16 +242,16 @@ if ($num == 1 && !empty($conf->global->MAIN_SEARCH_DIRECT_OPEN_IF_ONLY_ONE) && $
exit;
}
$help_url = 'EN:Module_Foundations|FR:Module_Adhérents|ES:Módulo_Miembros';
llxHeader('', $langs->trans("ListOfSubscriptions"), $help_url);
$i = 0;
$title = $langs->trans("ListOfSubscriptions");
$title = $langs->trans("Subscriptions");
if (!empty($date_select)) {
$title .= ' ('.$langs->trans("Year").' '.$date_select.')';
}
$help_url = 'EN:Module_Foundations|FR:Module_Adhérents|ES:Módulo_Miembros';
llxHeader('', $title, $help_url);
$i = 0;
$param = '';
if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) {
$param .= '&contextpage='.urlencode($contextpage);

2
htdocs/bookmarks/list.php
View File

@ -99,7 +99,7 @@ if ($action == 'delete') {
$form = new Form($db);
$title = $langs->trans("ListOfBookmarks");
$title = $langs->trans("Bookmarks");
llxHeader('', $title);

2
htdocs/comm/mailing/list.php
View File

@ -187,7 +187,7 @@ $resql = $db->query($sql);
if ($resql) {
$num = $db->num_rows($resql);
$title = $langs->trans("ListOfEMailings");
$title = $langs->trans("EMailings");
if ($filteremail) {
$title .= ' ('.$langs->trans("SentTo", $filteremail).')';
}

2
htdocs/compta/clients.php
View File

@ -133,7 +133,7 @@ if ($resql) {
$langs->load('commercial');
print_barre_liste($langs->trans("ListOfCustomers"), $page, $_SERVER["PHP_SELF"], "", $sortfield, $sortorder, '', $num);
print_barre_liste($langs->trans("Customers"), $page, $_SERVER["PHP_SELF"], "", $sortfield, $sortorder, '', $num);
print '<form method="GET" action="'.$_SERVER["PHP_SELF"].'">';

2
htdocs/compta/deplacement/index.php
View File

@ -68,7 +68,7 @@ $childids[] = $user->id;
//$help_url='EN:Module_Donations|FR:Module_Dons|ES:M&oacute;dulo_Donaciones';
$help_url = '';
llxHeader('', $langs->trans("ListOfFees"), $help_url);
llxHeader('', $langs->trans("TripsAndExpenses"), $help_url);

2
htdocs/compta/deplacement/list.php
View File

@ -131,7 +131,7 @@ $resql = $db->query($sql);
if ($resql) {
$num = $db->num_rows($resql);
print_barre_liste($langs->trans("ListOfFees"), $page, $_SERVER["PHP_SELF"], "&socid=$socid", $sortfield, $sortorder, '', $num);
print_barre_liste($langs->trans("TripsAndExpenses"), $page, $_SERVER["PHP_SELF"], "&socid=$socid", $sortfield, $sortorder, '', $num);
$i = 0;
print '<form method="get" action="'.$_SERVER["PHP_SELF"].'">'."\n";

4
htdocs/core/boxes/box_members_by_type.php
View File

@ -99,7 +99,8 @@ class box_members_by_type extends ModeleBoxes
$MembersResiliated = array();
$SumToValidate = 0;
$SumValidated = 0;
$SumPending = 0;
$SumExpired = 0;
$SumUpToDate = 0;
$SumResiliated = 0;
$SumExcluded = 0;
@ -233,6 +234,7 @@ class box_members_by_type extends ModeleBoxes
'text' => $labelstatus
);
$line++;
foreach ($AdherentType as $key => $adhtype) {
$SumToValidate += isset($MembersToValidate[$key]) ? $MembersToValidate[$key] : 0;
$SumPending += isset($MembersPending[$key]) ? $MembersPending[$key] : 0;

4
htdocs/eventorganization/conferenceorbooth_list.php
View File

@ -257,7 +257,7 @@ if ($projectid > 0 || $projectref) {
}
$help_url = "EN:Module_Projects|FR:Module_Projets|ES:M&oacute;dulo_Proyectos";
$title = $langs->trans("Project") . ' - ' . $langs->trans("ListOfConferencesOrBooths") . ' - ' . $project->ref . ' ' . $project->name;
$title = $langs->trans("Project") . ' - ' . $langs->trans("EventOrganizationConfOrBoothes") . ' - ' . $project->ref . ' ' . $project->name;
if (!empty($conf->global->MAIN_HTML_TITLE) && preg_match('/projectnameonly/', $conf->global->MAIN_HTML_TITLE) && $project->name) {
$title = $project->ref . ' ' . $project->name . ' - ' . $langs->trans("ListOfConferencesOrBooths");
}
@ -675,7 +675,7 @@ print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
print '<input type="hidden" name="contextpage" value="'.$contextpage.'">';
print '<input type="hidden" name="page_y" value="">';
$title = $langs->trans("ListOfConferencesOrBooths");
$title = $langs->trans("EventOrganizationConfOrBoothes");
$newcardbutton = dolGetButtonTitle($langs->trans('New'), '', 'fa fa-plus-circle', DOL_URL_ROOT.'/eventorganization/conferenceorbooth_card.php?action=create'.(!empty($project->id)?'&withproject=1&fk_project='.$project->id:'').(!empty($project->socid)?'&fk_soc='.$project->socid:'').'&backtopage='.urlencode($_SERVER['PHP_SELF']).(!empty($project->id)?'?projectid='.$project->id:''), '', $permissiontoadd);

2
htdocs/expensereport/index.php
View File

@ -78,7 +78,7 @@ $childids[] = $user->id;
$help_url = "EN:Module_Expense_Reports|FR:Module_Notes_de_frais";
llxHeader('', $langs->trans("ListOfFees"), $help_url);
llxHeader('', $langs->trans("TripsAndExpenses"), $help_url);
$label = $somme = $nb = array();

2
htdocs/expensereport/list.php
View File

@ -254,7 +254,7 @@ $formexpensereport = new FormExpenseReport($db);
$fuser = new User($db);
$title = $langs->trans("ListOfTrips");
$title = $langs->trans("TripsAndExpenses");
llxHeader('', $title);
$max_year = 5;

2
htdocs/fichinter/list.php
View File

@ -213,7 +213,7 @@ if (isModEnabled('contrat')) {
$now = dol_now();
$help_url = '';
$title = $langs->trans("ListOfInterventions");
$title = $langs->trans("Interventions");
$morejs = array();
$morecss = array();

5
htdocs/langs/en_US/eventorganization.lang
View File

@ -54,6 +54,7 @@ EVENTORGANIZATION_FILTERATTENDEES_TYPE = In the form to create/add an attendee,
# Object
#
EventOrganizationConfOrBooth= Conference Or Booth
EventOrganizationConfOrBoothes=Conferences or Boothes
ManageOrganizeEvent = Manage the organization of an event
ConferenceOrBooth = Conference Or Booth
ConferenceOrBoothTab = Conference Or Booth
@ -114,8 +115,8 @@ EvntOrgRegistrationHelpMessage = Here, you can vote for a conference or suggest
EvntOrgRegistrationConfHelpMessage = Here, you can suggest a new conference to animate during the event.
EvntOrgRegistrationBoothHelpMessage = Here, you can apply to have a booth during the event.
ListOfSuggestedConferences = List of suggested conferences
ListOfSuggestedBooths = List of suggested booths
ListOfConferencesOrBooths=List of conferences or booths of event project
ListOfSuggestedBooths=Suggested booths
ListOfConferencesOrBooths=Conferences or booths of event project
SuggestConference = Suggest a new conference
SuggestBooth = Suggest a booth
ViewAndVote = View and vote for suggested events

2
htdocs/langs/en_US/expensereports.lang
View File

@ -108,7 +108,7 @@ TripId=Id expense report
TripNDF=Informations expense report
TripSociete=Information company
Trips=Expense reports
TripsAndExpenses=Expenses reports
TripsAndExpenses=Expense reports
TripsAndExpensesStatistics=Expense reports statistics
TypeFees=Types of fees
UploadANewFileNow=Upload a new document now

2
htdocs/product/stock/list.php
View File

@ -194,7 +194,7 @@ $warehouse = new Entrepot($db);
$now = dol_now();
$help_url = 'EN:Module_Stocks_En|FR:Module_Stock|ES:M&oacute;dulo_Stocks';
$title = $langs->trans("ListOfWarehouses");
$title = $langs->trans("Warehouses");
$totalarray = array();
$totalarray['nbfield'] = 0;

3
htdocs/ticket/card.php
View File

@ -827,9 +827,6 @@ if ($action == 'create' || $action == 'presend') {
// Confirmation abandon
if ($action == 'abandon') {
print $form->formconfirm($url_page_current."?track_id=".$object->track_id, $langs->trans("AbandonTicket"), $langs->trans("ConfirmAbandonTicket"), "confirm_abandon", '', '', 1);
if ($ret == 'html') {
print '<br>';
}
}
// Confirmation delete
if ($action == 'delete') {

4
htdocs/user/group/list.php
View File

@ -121,7 +121,7 @@ if (empty($reshook)) {
/*
* View
*/
$title = $langs->trans("ListOfGroups");
$title = $langs->trans("UserGroups");
$help_url="";
llxHeader('', $title, $help_url);
@ -156,7 +156,7 @@ if ($resql) {
$param .= '&amp;optioncss='.$optioncss;
}
$text = $langs->trans("ListOfGroups");
$text = $langs->trans("UserGroups");
$newcardbutton = '';
if ($caneditperms) {