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

Merge branch 'develop' into patch-1

Browse source
This commit is contained in:
Laurent Destailleur 2025-12-22 17:42:29 +01:00 committed by GitHub
commit e8d9c2da58
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
8 changed files with 19 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
htdocs/admin/limits.php
View file

@ -107,7 +107,7 @@ if ($action == 'update' && !$cancel) {
if (! $error && ((float) $valmainmaxdecimalsshown < $valmainmaxdecimalsunit || (float) $valmainmaxdecimalsshown < $valmainmaxdecimalstot)) {
$langs->load("errors");
$error++;
setEventMessages($langs->trans("ErrorValueForTooLow", dol_trunc(dol_string_nohtmltag($langs->transnoentitiesnoconv("MAIN_MAX_DECIMALS_SHOWN")), 40)), null, 'errors');
setEventMessages($langs->trans("ErrorMaxDecimalsShownTooLowComparedToUnitOrTotal", $valmainmaxdecimalsshown, $valmainmaxdecimalsunit, $valmainmaxdecimalstot), null, 'errors');
$action = 'edit';
}

2
htdocs/compta/cashcontrol/cashcontrol_card.php
View file

@ -395,7 +395,7 @@ if ($action == "create" || $action == "start" || $action == 'close') {
dol_print_error(null, 'Value for key = '.$key.' not supported');
exit;
}
$sql .= " AND datep BETWEEN '".$db->idate($datestart)."' AND '".$db->idate($dateend)."'";
$sql .= " AND datep BETWEEN '".$db->idate((int) $datestart)."' AND '".$db->idate((int) $dateend)."'";
$resql = $db->query($sql);
if ($resql) {

15
htdocs/core/class/html.form.class.php
View file

@ -6685,20 +6685,21 @@ class Form
* Output HTML form to select list of input reason (events that triggered an object creation, like after sending an emailing, making an advert, ...)
* List found into table c_input_reason loaded by loadCacheInputReason
*
* @param string $page Page
* @param string $selected Id condition pre-selectionne
* @param string $htmlname Name of select html field
* @param int $addempty Add empty entry
* @return void
* @param string $page Page
* @param string $selected Id condition pre-selectionne
* @param string $htmlname Name of select html field
* @param int $addempty Add empty entry
* @param string $morecss More CSS
* @return void
*/
public function formInputReason($page, $selected = '', $htmlname = 'demandreason', $addempty = 0)
public function formInputReason($page, $selected = '', $htmlname = 'demandreason', $addempty = 0, $morecss = '')
{
global $langs;
if ($htmlname != "none") {
print '<form method="post" action="' . $page . '">';
print '<input type="hidden" name="action" value="setdemandreason">';
print '<input type="hidden" name="token" value="' . newToken() . '">';
$this->selectInputReason($selected, $htmlname, '-1', $addempty);
$this->selectInputReason($selected, $htmlname, '-1', $addempty, $morecss);
print '<input type="submit" class="button smallpaddingimp" value="' . $langs->trans("Modify") . '">';
print '</form>';
} else {

1
htdocs/core/lib/files.lib.php
View file

@ -3889,6 +3889,7 @@ function getFilesUpdated(&$file_list, SimpleXMLElement $dir, $path = '', $pathre
//$exclude = 'install';
$entry = array();
$algo = '';
if (!empty($dir->md5file)) {
$entry = $dir->md5file;
$algo = 'md5';

5
htdocs/core/modules/action/doc/pdf_standard_actions.class.php
View file

@ -53,6 +53,11 @@ class pdf_standard_actions
*/
public $errors;
/**
* @var string[] array of warnings messages
*/
public $warnings;
/**
* @var string description
*/

1
htdocs/langs/en_US/errors.lang
View file

@ -373,6 +373,7 @@ ErrorBlockLogNeedAmountsValue=The unalterbale log object needs amounts values to
ErrorBlockLogNeedElement=The unalterbale log object needs element type to be set
ErrorBlockLogNeedObject=The unalterbale log object needs object to be set
ErrorBadParameterWhenCallingCreateOfBlockedLog=Bad parameter when calling create of blocked log
ErrorMaxDecimalsShownTooLowComparedToUnitOrTotal=Value for 'Max. decimals for prices shown on screen' (%s) must be equal to or greater than both 'Max. decimals for unit prices' (%s) and 'Max. decimals for total prices' (%s). This is required to prevent rounding inconsistencies on documents.
# Warnings
WarningParamUploadMaxFileSizeHigherThanPostMaxSize=Your PHP parameter upload_max_filesize (%s) is higher than PHP parameter post_max_size (%s). This is not a consistent setup.

2
htdocs/takepos/invoice.php
View file

@ -352,7 +352,7 @@ if (empty($reshook)) {
} else {
//setEventMessages(null, $payment->warnings, 'warnings');
if (!empty($payment->warnings)) {
dol_htmloutput_mesg(null, $payment->warnings, 'warning', 1);
dol_htmloutput_mesg('', $payment->warnings, 'warning', 1);
}
$res = $payment->addPaymentToBank($user, 'payment', '(CustomerInvoicePayment)', $bankaccount, '', '');

2
htdocs/website/class/websitepage.class.php
View file

@ -123,7 +123,7 @@ class WebsitePage extends CommonObject
public $index = 1;
/**
* @var string Use meta robot tag "follow" (else "nofollow")
* @var int Use meta robot tag "follow" (else "nofollow")
*/
public $follow = 1;