diff --git a/htdocs/compta/cashcontrol/cashcontrol_card.php b/htdocs/compta/cashcontrol/cashcontrol_card.php index 58c9fbd868e..590442b28b6 100644 --- a/htdocs/compta/cashcontrol/cashcontrol_card.php +++ b/htdocs/compta/cashcontrol/cashcontrol_card.php @@ -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) { diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php index 8994b516642..1bf5ab57db8 100644 --- a/htdocs/core/class/html.form.class.php +++ b/htdocs/core/class/html.form.class.php @@ -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 '
'; print ''; print ''; - $this->selectInputReason($selected, $htmlname, '-1', $addempty); + $this->selectInputReason($selected, $htmlname, '-1', $addempty, $morecss); print ''; print '
'; } else { diff --git a/htdocs/core/lib/files.lib.php b/htdocs/core/lib/files.lib.php index f05f0dbd0f0..036d59f70b8 100644 --- a/htdocs/core/lib/files.lib.php +++ b/htdocs/core/lib/files.lib.php @@ -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'; diff --git a/htdocs/core/modules/action/doc/pdf_standard_actions.class.php b/htdocs/core/modules/action/doc/pdf_standard_actions.class.php index a33f721ca56..cbe1babaf28 100644 --- a/htdocs/core/modules/action/doc/pdf_standard_actions.class.php +++ b/htdocs/core/modules/action/doc/pdf_standard_actions.class.php @@ -53,6 +53,11 @@ class pdf_standard_actions */ public $errors; + /** + * @var string[] array of warnings messages + */ + public $warnings; + /** * @var string description */ diff --git a/htdocs/takepos/invoice.php b/htdocs/takepos/invoice.php index aed8fe282ca..245bd4e639d 100644 --- a/htdocs/takepos/invoice.php +++ b/htdocs/takepos/invoice.php @@ -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, '', ''); diff --git a/htdocs/website/class/websitepage.class.php b/htdocs/website/class/websitepage.class.php index 77a7e77e1bf..70894b899cf 100644 --- a/htdocs/website/class/websitepage.class.php +++ b/htdocs/website/class/websitepage.class.php @@ -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;