Fix warning
This commit is contained in:
parent
8e0db1071a
commit
f85487b758
@ -6744,7 +6744,7 @@ abstract class CommonObject
|
|||||||
* Return HTML string to put an input field into a page
|
* Return HTML string to put an input field into a page
|
||||||
* Code very similar with showInputField of extra fields
|
* Code very similar with showInputField of extra fields
|
||||||
*
|
*
|
||||||
* @param array $val Array of properties for field to show (used only if ->fields not defined)
|
* @param array|null $val Array of properties for field to show (used only if ->fields not defined)
|
||||||
* @param string $key Key of attribute
|
* @param string $key Key of attribute
|
||||||
* @param string|array $value Preselected value to show (for date type it must be in timestamp format, for amount or price it must be a php numeric value, for array type must be array)
|
* @param string|array $value Preselected value to show (for date type it must be in timestamp format, for amount or price it must be a php numeric value, for array type must be array)
|
||||||
* @param string $moreparam To add more parameters on html input tag
|
* @param string $moreparam To add more parameters on html input tag
|
||||||
|
|||||||
@ -782,7 +782,7 @@ class FormOther
|
|||||||
*
|
*
|
||||||
* @param string $color String with hex (FFFFFF) or comma RGB ('255,255,255')
|
* @param string $color String with hex (FFFFFF) or comma RGB ('255,255,255')
|
||||||
* @param string $textifnotdefined Text to show if color not defined
|
* @param string $textifnotdefined Text to show if color not defined
|
||||||
* @return void
|
* @return string Show color string
|
||||||
* @see selectColor()
|
* @see selectColor()
|
||||||
*/
|
*/
|
||||||
public static function showColor($color, $textifnotdefined = '')
|
public static function showColor($color, $textifnotdefined = '')
|
||||||
@ -796,9 +796,9 @@ class FormOther
|
|||||||
$color = colorArrayToHex(colorStringToArray($color, array()), '');
|
$color = colorArrayToHex(colorStringToArray($color, array()), '');
|
||||||
|
|
||||||
if ($color) {
|
if ($color) {
|
||||||
print '<input type="text" class="colorthumb" disabled style="padding: 1px; margin-top: 0; margin-bottom: 0; color: #'.$textcolor.'; background-color: #'.$color.'" value="'.$color.'">';
|
return '<input type="text" class="colorthumb" disabled style="padding: 1px; margin-top: 0; margin-bottom: 0; color: #'.$textcolor.'; background-color: #'.$color.'" value="'.$color.'">';
|
||||||
} else {
|
} else {
|
||||||
print $textifnotdefined;
|
return $textifnotdefined;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@ -99,8 +99,10 @@ class SMTPs
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* Message Content
|
* Message Content
|
||||||
|
*
|
||||||
|
* @var array $_msgContent Array of messages
|
||||||
*/
|
*/
|
||||||
private $_msgContent = null;
|
private array $_msgContent = array();
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Custom X-Headers
|
* Custom X-Headers
|
||||||
@ -1841,7 +1843,7 @@ class SMTPs
|
|||||||
/**
|
/**
|
||||||
* Retrieves the Message X-Header Content
|
* Retrieves the Message X-Header Content
|
||||||
*
|
*
|
||||||
* @return string[] $_msgContent Message X-Header Content
|
* @return array $_msgContent Message X-Header Content
|
||||||
*/
|
*/
|
||||||
public function getXheader()
|
public function getXheader()
|
||||||
{
|
{
|
||||||
|
|||||||
@ -603,10 +603,10 @@ class pdf_standard extends ModelePDFSuppliersPayments
|
|||||||
/**
|
/**
|
||||||
* Show top header of page.
|
* Show top header of page.
|
||||||
*
|
*
|
||||||
* @param TCPDF $pdf Object PDF
|
* @param TCPDF $pdf Object PDF
|
||||||
* @param FactureFournisseur $object Object to show
|
* @param PaiementFourn $object Object to show
|
||||||
* @param int $showaddress 0=no, 1=yes
|
* @param int $showaddress 0=no, 1=yes
|
||||||
* @param Translate $outputlangs Object lang for output
|
* @param Translate $outputlangs Object lang for output
|
||||||
* @return void
|
* @return void
|
||||||
*/
|
*/
|
||||||
protected function _pagehead(&$pdf, $object, $showaddress, $outputlangs)
|
protected function _pagehead(&$pdf, $object, $showaddress, $outputlangs)
|
||||||
@ -814,11 +814,11 @@ class pdf_standard extends ModelePDFSuppliersPayments
|
|||||||
/**
|
/**
|
||||||
* Show footer of page. Need this->emetteur object
|
* Show footer of page. Need this->emetteur object
|
||||||
*
|
*
|
||||||
* @param TCPDF $pdf PDF
|
* @param TCPDF $pdf PDF
|
||||||
* @param FactureFournisseur $object Object to show
|
* @param PaiementFourn $object Object to show
|
||||||
* @param Translate $outputlangs Object lang for output
|
* @param Translate $outputlangs Object lang for output
|
||||||
* @param int $hidefreetext 1=Hide free text
|
* @param int $hidefreetext 1=Hide free text
|
||||||
* @return int Return height of bottom margin including footer text
|
* @return int Return height of bottom margin including footer text
|
||||||
*/
|
*/
|
||||||
protected function _pagefoot(&$pdf, $object, $outputlangs, $hidefreetext = 0)
|
protected function _pagefoot(&$pdf, $object, $outputlangs, $hidefreetext = 0)
|
||||||
{
|
{
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user