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 fix_warning_php8

Browse Source
This commit is contained in:
Regis Houssin 2021-09-21 17:58:40 +02:00
commit 502c2a4505
3 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
htdocs/accountancy/class/bookkeeping.class.php
View File

@ -888,9 +888,11 @@ class BookKeeping extends CommonObject
// Affichage par compte comptable
if (!empty($option)) {
$sql .= ' AND t.subledger_account IS NOT NULL';
$sql .= ' ORDER BY t.subledger_account ASC';
$sortfield = 't.subledger_account'.($sortfield ? ','.$sortfield : '');
$sortorder = 'ASC'.($sortfield ? ','.$sortfield : '');
} else {
$sql .= ' ORDER BY t.numero_compte ASC';
$sortfield = 't.numero_compte'.($sortfield ? ','.$sortfield : '');
$sortorder = 'ASC'.($sortorder ? ','.$sortorder : '');
}
$sql .= $this->db->order($sortfield, $sortorder);

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

@ -48,6 +48,8 @@ AddEndHour=Add end hour
votes=vote(s)
NoCommentYet=No comments have been posted for this poll yet
CanComment=Voters can comment in the poll
YourVoteIsPrivate=This poll is private, nobody can see your vote.
YourVoteIsPublic=This poll is public, anybody with the link can see your vote.
CanSeeOthersVote=Voters can see other people's vote
SelectDayDesc=For each selected day, you can choose, or not, meeting hours in the following format:<br>- empty,<br>- "8h", "8H" or "8:00" to give a meeting's start hour,<br>- "8-11", "8h-11h", "8H-11H" or "8:00-11:00" to give a meeting's start and end hour,<br>- "8h15-11h15", "8H15-11H15" or "8:15-11:15" for the same thing but with minutes.
BackToCurrentMonth=Back to current month

8
htdocs/public/opensurvey/studs.php
View File

@ -274,7 +274,13 @@ $toutsujet = str_replace("°", "'", $toutsujet);
print '<div class="survey_invitation">'.$langs->trans("YouAreInivitedToVote").'</div>';
print $langs->trans("OpenSurveyHowTo").'<br><br>';
print $langs->trans("OpenSurveyHowTo").'<br>';
if (empty($object->allow_spy)) {
print '<span class="opacitymedium">'.$langs->trans("YourVoteIsPrivate").'</span><br>';
} else {
print $form->textwithpicto('<span class="opacitymedium">'.$langs->trans("YourVoteIsPublic").'</span>', $langs->trans("CanSeeOthersVote")).'<br>';
}
print '<br>';
print '<div class="corps"> '."\n";