vignesh/dolibarr
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source
This commit is contained in:
Laurent Destailleur 2026-08-19 04:51:37 +02:00
commit c16e51ea4a
4 changed files with 16 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
htdocs/admin/expensereport.php
View file

@ -32,11 +32,6 @@
// Load Dolibarr environment
require '../main.inc.php';
require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
require_once DOL_DOCUMENT_ROOT.'/core/lib/pdf.lib.php';
require_once DOL_DOCUMENT_ROOT.'/core/lib/expensereport.lib.php';
require_once DOL_DOCUMENT_ROOT.'/expensereport/class/expensereport.class.php';
/**
* @var Conf $conf
* @var DoliDB $db
@ -44,6 +39,10 @@ require_once DOL_DOCUMENT_ROOT.'/expensereport/class/expensereport.class.php';
* @var Translate $langs
* @var User $user
*/
require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
require_once DOL_DOCUMENT_ROOT.'/core/lib/pdf.lib.php';
require_once DOL_DOCUMENT_ROOT.'/core/lib/expensereport.lib.php';
require_once DOL_DOCUMENT_ROOT.'/expensereport/class/expensereport.class.php';
// Load translation files required by the page
$langs->loadLangs(array('admin', 'errors', 'trips', 'other'));
@ -216,6 +215,7 @@ print dol_get_fiche_head($head, 'expensereport', $langs->trans("ExpenseReports")
print load_fiche_titre($langs->trans("ExpenseReportNumberingModules"), '', '');
print '<div class="div-table-responsive-no-min">';
print '<table class="noborder centpercent">';
print '<tr class="liste_titre">';
print '<td>'.$langs->trans("Name").'</td>';
@ -310,7 +310,7 @@ foreach ($dirmodels as $reldir) {
}
}
}
print "</table><br>\n";
print "</table></div><br>\n";
/*
* Documents models for ExpenseReport
@ -340,6 +340,7 @@ if ($resql) {
dol_print_error($db);
}
print '<div class="div-table-responsive-no-min">';
print '<table class="noborder centpercent">';
print '<tr class="liste_titre">';
print '<td>'.$langs->trans("Name").'</td>';
@ -450,7 +451,7 @@ foreach ($dirmodels as $reldir) {
}
print '</table>';
print '</div>';
print '<br>';
@ -465,6 +466,8 @@ print '<input type="hidden" name="token" value="'.newToken().'">';
print '<input type="hidden" name="action" value="setoptions">';
print load_fiche_titre($langs->trans("OtherOptions"), '', '');
print '<div class="div-table-responsive-no-min">';
print '<table class="noborder centpercent">';
print '<tr class="liste_titre">';
print '<td>'.$langs->trans("Parameter").'</td>';
@ -525,6 +528,7 @@ print $form->selectyesno('EXPENSEREPORT_BLOCK_LINE_CREATION_IF_NOT_BETWEEN_DATES
print '</td></tr>';
print '</table>';
print '</div>';
print $form->buttonsSaveCancel("Save", '');

4
htdocs/core/lib/functions.lib.php
View file

@ -11620,7 +11620,6 @@ function dol_htmloutput_errors($mesgstring = '', $mesgarray = array(), $keepembe
dol_htmloutput_mesg($mesgstring, $mesgarray, 'error', $keepembedded);
}
/**
* Sort an array using a user defined function. This function is a wrapper to usort without the callable parameter so we can use it into dol_eval().
* This function is not used in Dolibarr code.
@ -11630,7 +11629,8 @@ function dol_htmloutput_errors($mesgstring = '', $mesgarray = array(), $keepembe
*/
function dolSort($arraytosort)
{
return usort($arraytosort);
sort($arraytosort);
return $arraytosort;
}
/**

2
htdocs/langs/en_US/bills.lang
View file

@ -678,7 +678,7 @@ BILL_SUPPLIER_DELETEInDolibarr=Supplier invoice deleted
UnitPriceXQtyLessDiscount=Unit price x Qty - Discount
CustomersInvoicesArea=Customer billing area
SupplierInvoicesArea=Supplier billing area
SituationTotalRayToRest=Remainder to pay without tax
SituationTotalRayToRest=Remainder to pay
PDFSituationTitle=Situation n° %d
SituationTotalProgress=Total progress %d %%
SearchUnpaidInvoicesWithDueDate=Search unpaid invoices with a due date = %s

4
htdocs/public/users/view.php
View file

@ -409,7 +409,7 @@ if ($usersection) {
// Output payment summary form
print '<tr><td class="left">';
print '<div class="nowidthimp nopaddingtoponsmartphone" id="tablepublicpayment">';
print '<div class="nowidthimp" id="tablepublicpayment">';
print $usersection;
@ -507,7 +507,7 @@ if (!getDolUserInt('USER_PUBLIC_HIDE_COMPANY', 0, $object)) {
print '<tr><td class="left">';
if ($companysection || $mysoc->name) {
print '<div class="nowidthimp nopaddingtoponsmartphone" id="tablepublicpayment">';
print '<div class="nowidthimp" id="tablepublicpayment">';
// Add company info
if ($mysoc->name) {