Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2026-01-21 00:03:16 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' into phpstan_config

Browse Source
This commit is contained in:
Laurent Destailleur
2025-12-22 17:44:42 +01:00
committed by GitHub
parent 7717b0a35e 5eaa2b3265
commit 1b6263a672
6 changed files with 17 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -394,7 +394,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
*/

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;