Merge pull request #25042 from Hystepik/develop#2
Fix : php8.1 warnings with strict mode
This commit is contained in:
commit
e2d987bf1b
5 changed files with 5 additions and 5 deletions
|
|
@ -1674,7 +1674,7 @@ class Propal extends CommonObject
|
|||
$this->cond_reglement_doc = $obj->cond_reglement_libelle_doc;
|
||||
$this->deposit_percent = $obj->deposit_percent;
|
||||
|
||||
$this->extraparams = (array) json_decode($obj->extraparams, true);
|
||||
$this->extraparams = !empty($obj->extraparams) ? (array) json_decode($obj->extraparams, true) : array();
|
||||
|
||||
$this->user_author_id = $obj->fk_user_author;
|
||||
$this->user_valid_id = $obj->fk_user_valid;
|
||||
|
|
|
|||
|
|
@ -1980,7 +1980,7 @@ class Commande extends CommonOrder
|
|||
$this->multicurrency_total_tva = $obj->multicurrency_total_tva;
|
||||
$this->multicurrency_total_ttc = $obj->multicurrency_total_ttc;
|
||||
|
||||
$this->extraparams = (array) json_decode($obj->extraparams, true);
|
||||
$this->extraparams = !empty($obj->extraparams) ? (array) json_decode($obj->extraparams, true) : array();
|
||||
|
||||
$this->lines = array();
|
||||
|
||||
|
|
|
|||
|
|
@ -2244,7 +2244,7 @@ class Facture extends CommonInvoice
|
|||
$this->retained_warranty_date_limit = $this->db->jdate($obj->retained_warranty_date_limit);
|
||||
$this->retained_warranty_fk_cond_reglement = $obj->retained_warranty_fk_cond_reglement;
|
||||
|
||||
$this->extraparams = (array) json_decode($obj->extraparams, true);
|
||||
$this->extraparams = !empty($obj->extraparams) ? (array) json_decode($obj->extraparams, true) : array();
|
||||
|
||||
//Incoterms
|
||||
$this->fk_incoterms = $obj->fk_incoterms;
|
||||
|
|
|
|||
|
|
@ -283,7 +283,7 @@ abstract class DoliDB implements Database
|
|||
* @param string $sortorder Sort order, separated by comma. Example: 'ASC,DESC'. Note: If the quantity fo sortorder values is lower than sortfield, we used the last value for missing values.
|
||||
* @return string String to provide syntax of a sort sql string
|
||||
*/
|
||||
public function order($sortfield = null, $sortorder = null)
|
||||
public function order($sortfield = '', $sortorder = '')
|
||||
{
|
||||
if (!empty($sortfield)) {
|
||||
$oldsortorder = '';
|
||||
|
|
|
|||
|
|
@ -285,7 +285,7 @@ if (empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) {
|
|||
}
|
||||
}
|
||||
if ($mysoc->useLocalTax(2)) {
|
||||
if (($seller->country_code == $buyer->thirdparty->country_code) || $line->total_localtax2 || $seller->useLocalTax(2)) {
|
||||
if (( isset($seller->country_code) && isset($buyer->thirdparty->country_code) && $seller->country_code == $buyer->thirdparty->country_code) || $line->total_localtax2 || $seller->useLocalTax(2)) {
|
||||
$tooltiponprice .= '<br>'.$langs->transcountry("TotalLT2", $seller->country_code).'='.price($line->total_localtax2);
|
||||
} else {
|
||||
$tooltiponprice .= '<br>'.$langs->transcountry("TotalLT2", $seller->country_code).'=<span class="opacitymedium">'.$langs->trans($senderissupplier ? "NotUsedForThisVendor" : "NotUsedForThisCustomer").'</span>';
|
||||
|
|
|
|||
Loading…
Reference in a new issue