lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix warning

Browse Source
This commit is contained in:
Laurent Destailleur 2022-12-28 16:40:03 +01:00
parent fc8c3c8980
commit c886bad8b6
30 changed files with 81 additions and 73 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
htdocs/admin/modules.php
View File

@ -65,9 +65,9 @@ $search_version = GETPOST('search_version', 'alpha');
// For dolistore search // For dolistore search
$options = array(); $options = array();
$options['per_page'] = 20; $options['per_page'] = 20;
$options['categorie'] = ((GETPOST('categorie', 'int') ?GETPOST('categorie', 'int') : 0) + 0); $options['categorie'] = ((int) (GETPOST('categorie', 'int') ? GETPOST('categorie', 'int') : 0));
$options['start'] = ((GETPOST('start', 'int') ?GETPOST('start', 'int') : 0) + 0); $options['start'] = ((int) (GETPOST('start', 'int') ?GETPOST('start', 'int') : 0));
$options['end'] = ((GETPOST('end', 'int') ?GETPOST('end', 'int') : 0) + 0); $options['end'] = ((int) (GETPOST('end', 'int') ?GETPOST('end', 'int') : 0));
$options['search'] = GETPOST('search_keyword', 'alpha'); $options['search'] = GETPOST('search_keyword', 'alpha');
$dolistore = new Dolistore(false); $dolistore = new Dolistore(false);

8
htdocs/core/class/html.form.class.php
View File

@ -2530,7 +2530,7 @@ class Form
* 'warehouseclosed' = count products from closed warehouses, * 'warehouseclosed' = count products from closed warehouses,
* 'warehouseinternal' = count products from warehouses for internal correct/transfer only * 'warehouseinternal' = count products from warehouses for internal correct/transfer only
* @param int $status_purchase Purchase status -1=Return all products, 0=Products not on purchase, 1=Products on purchase * @param int $status_purchase Purchase status -1=Return all products, 0=Products not on purchase, 1=Products on purchase
* @return array Array of keys for json * @return array|string Array of keys for json
*/ */
public function select_produits_list($selected = '', $htmlname = 'productid', $filtertype = '', $limit = 20, $price_level = 0, $filterkey = '', $status = 1, $finished = 2, $outputmode = 0, $socid = 0, $showempty = '1', $forcecombo = 0, $morecss = '', $hidepriceinlabel = 0, $warehouseStatus = '', $status_purchase = -1) public function select_produits_list($selected = '', $htmlname = 'productid', $filtertype = '', $limit = 20, $price_level = 0, $filterkey = '', $status = 1, $finished = 2, $outputmode = 0, $socid = 0, $showempty = '1', $forcecombo = 0, $morecss = '', $hidepriceinlabel = 0, $warehouseStatus = '', $status_purchase = -1)
{ {
@ -2859,10 +2859,13 @@ class Form
if (empty($outputmode)) { if (empty($outputmode)) {
return $out; return $out;
} }
return $outarray; return $outarray;
} else { } else {
dol_print_error($this->db); dol_print_error($this->db);
} }
return '';
} }
/** /**
@ -3665,8 +3668,9 @@ class Form
return $outarray; return $outarray;
} else { } else {
dol_print_error($this->db); dol_print_error($this->db);
return '';
} }
return '';
} }
// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps

2
htdocs/core/class/infobox.class.php
View File

@ -118,7 +118,7 @@ class InfoBox
$sql .= " WHERE d.entity IN (0, ".$conf->entity.")"; $sql .= " WHERE d.entity IN (0, ".$conf->entity.")";
} }
dol_syslog(get_class()."::listBoxes get default box list for mode=".$mode." userid=".(is_object($user) ? $user->id : '')."", LOG_DEBUG); dol_syslog(get_class()."::listBoxes get default box list for mode=".$mode." userid=".(is_object($user) ? $user->id : ''), LOG_DEBUG);
$resql = $dbs->query($sql); $resql = $dbs->query($sql);
if ($resql) { if ($resql) {
$num = $dbs->num_rows($resql); $num = $dbs->num_rows($resql);

2
htdocs/core/class/menubase.class.php
View File

@ -647,7 +647,7 @@ class Menubase
$sql .= " ORDER BY m.position, m.rowid"; $sql .= " ORDER BY m.position, m.rowid";
//print $sql; //print $sql;
//dol_syslog(get_class($this)."::menuLoad mymainmenu=".$mymainmenu." myleftmenu=".$myleftmenu." type_user=".$type_user." menu_handler=".$menu_handler." tabMenu size=".count($tabMenu)."", LOG_DEBUG); //dol_syslog(get_class($this)."::menuLoad mymainmenu=".$mymainmenu." myleftmenu=".$myleftmenu." type_user=".$type_user." menu_handler=".$menu_handler." tabMenu size=".count($tabMenu), LOG_DEBUG);
$resql = $this->db->query($sql); $resql = $this->db->query($sql);
if ($resql) { if ($resql) {
$numa = $this->db->num_rows($resql); $numa = $this->db->num_rows($resql);

4
htdocs/core/class/notify.class.php
View File

@ -225,7 +225,7 @@ class Notify
$sql .= " AND s.rowid = ".((int) $socid); $sql .= " AND s.rowid = ".((int) $socid);
} }
dol_syslog(__METHOD__." ".$notifcode.", ".$socid."", LOG_DEBUG); dol_syslog(__METHOD__." ".$notifcode.", ".$socid, LOG_DEBUG);
$resql = $this->db->query($sql); $resql = $this->db->query($sql);
if ($resql) { if ($resql) {
@ -263,7 +263,7 @@ class Notify
$sql .= " AND c.rowid = ".((int) $userid); $sql .= " AND c.rowid = ".((int) $userid);
} }
dol_syslog(__METHOD__." ".$notifcode.", ".$socid."", LOG_DEBUG); dol_syslog(__METHOD__." ".$notifcode.", ".$socid, LOG_DEBUG);
$resql = $this->db->query($sql); $resql = $this->db->query($sql);
if ($resql) { if ($resql) {

12
htdocs/core/class/stats.class.php
View File

@ -359,7 +359,7 @@ abstract class Stats
// phpcs:enable // phpcs:enable
$result = array(); $result = array();
dol_syslog(get_class($this).'::'.__FUNCTION__."", LOG_DEBUG); dol_syslog(get_class($this).'::'.__FUNCTION__, LOG_DEBUG);
$resql = $this->db->query($sql); $resql = $this->db->query($sql);
if ($resql) { if ($resql) {
$num = $this->db->num_rows($resql); $num = $this->db->num_rows($resql);
@ -388,7 +388,7 @@ abstract class Stats
// phpcs:enable // phpcs:enable
$result = array(); $result = array();
dol_syslog(get_class($this).'::'.__FUNCTION__."", LOG_DEBUG); dol_syslog(get_class($this).'::'.__FUNCTION__, LOG_DEBUG);
$resql = $this->db->query($sql); $resql = $this->db->query($sql);
if ($resql) { if ($resql) {
$num = $this->db->num_rows($resql); $num = $this->db->num_rows($resql);
@ -442,7 +442,7 @@ abstract class Stats
$result = array(); $result = array();
$res = array(); $res = array();
dol_syslog(get_class($this).'::'.__FUNCTION__."", LOG_DEBUG); dol_syslog(get_class($this).'::'.__FUNCTION__, LOG_DEBUG);
$resql = $this->db->query($sql); $resql = $this->db->query($sql);
if ($resql) { if ($resql) {
$num = $this->db->num_rows($resql); $num = $this->db->num_rows($resql);
@ -499,7 +499,7 @@ abstract class Stats
$result = array(); $result = array();
$res = array(); $res = array();
dol_syslog(get_class($this).'::'.__FUNCTION__."", LOG_DEBUG); dol_syslog(get_class($this).'::'.__FUNCTION__, LOG_DEBUG);
$resql = $this->db->query($sql); $resql = $this->db->query($sql);
if ($resql) { if ($resql) {
@ -557,7 +557,7 @@ abstract class Stats
$result = array(); $result = array();
$res = array(); $res = array();
dol_syslog(get_class($this).'::'.__FUNCTION__."", LOG_DEBUG); dol_syslog(get_class($this).'::'.__FUNCTION__, LOG_DEBUG);
$resql = $this->db->query($sql); $resql = $this->db->query($sql);
if ($resql) { if ($resql) {
$num = $this->db->num_rows($resql); $num = $this->db->num_rows($resql);
@ -613,7 +613,7 @@ abstract class Stats
$result = array(); $result = array();
dol_syslog(get_class($this).'::'.__FUNCTION__."", LOG_DEBUG); dol_syslog(get_class($this).'::'.__FUNCTION__, LOG_DEBUG);
$resql = $this->db->query($sql); $resql = $this->db->query($sql);
if ($resql) { if ($resql) {
$num = $this->db->num_rows($resql); $num = $this->db->num_rows($resql);

4
htdocs/core/lib/functions2.lib.php
View File

@ -1301,7 +1301,7 @@ function get_next_value($db, $mask, $table, $field, $where = '', $objsoc = '', $
} }
//print $sql.'<br>'; //print $sql.'<br>';
dol_syslog("functions2::get_next_value mode=".$mode."", LOG_DEBUG); dol_syslog("functions2::get_next_value mode=".$mode, LOG_DEBUG);
$resql = $db->query($sql); $resql = $db->query($sql);
if ($resql) { if ($resql) {
$obj = $db->fetch_object($resql); $obj = $db->fetch_object($resql);
@ -1360,7 +1360,7 @@ function get_next_value($db, $mask, $table, $field, $where = '', $objsoc = '', $
$sql .= " AND ".$sqlwhere; $sql .= " AND ".$sqlwhere;
} }
dol_syslog("functions2::get_next_value mode=".$mode."", LOG_DEBUG); dol_syslog("functions2::get_next_value mode=".$mode, LOG_DEBUG);
$resql = $db->query($sql); $resql = $db->query($sql);
if ($resql) { if ($resql) {
$obj = $db->fetch_object($resql); $obj = $db->fetch_object($resql);

6
htdocs/core/lib/pdf.lib.php
View File

@ -1178,7 +1178,7 @@ function pdf_pagefoot(&$pdf, $outputlangs, $paramfreetext, $fromcompany, $marge_
$mycustomfooterheight = pdfGetHeightForHtmlContent($pdf, dol_htmlentitiesbr($mycustomfooter, 1, 'UTF-8', 0)); $mycustomfooterheight = pdfGetHeightForHtmlContent($pdf, dol_htmlentitiesbr($mycustomfooter, 1, 'UTF-8', 0));
$marginwithfooter = $marge_basse + $freetextheight + $mycustomfooterheight; $marginwithfooter = $marge_basse + $freetextheight + $mycustomfooterheight;
$posy = $marginwithfooter + 0; $posy = (float) $marginwithfooter;
// Option for footer background color (without freetext zone) // Option for footer background color (without freetext zone)
if (getDolGlobalString('PDF_FOOTER_BACKGROUND_COLOR')) { if (getDolGlobalString('PDF_FOOTER_BACKGROUND_COLOR')) {
@ -1222,7 +1222,7 @@ function pdf_pagefoot(&$pdf, $outputlangs, $paramfreetext, $fromcompany, $marge_
} else { } else {
// Else default footer // Else default footer
$marginwithfooter = $marge_basse + $freetextheight + (!empty($line1) ? 3 : 0) + (!empty($line2) ? 3 : 0) + (!empty($line3) ? 3 : 0) + (!empty($line4) ? 3 : 0); $marginwithfooter = $marge_basse + $freetextheight + (!empty($line1) ? 3 : 0) + (!empty($line2) ? 3 : 0) + (!empty($line3) ? 3 : 0) + (!empty($line4) ? 3 : 0);
$posy = $marginwithfooter + 0; $posy = (float) $marginwithfooter;
// Option for footer background color (without freetext zone) // Option for footer background color (without freetext zone)
if (getDolGlobalString('PDF_FOOTER_BACKGROUND_COLOR')) { if (getDolGlobalString('PDF_FOOTER_BACKGROUND_COLOR')) {
@ -1652,7 +1652,7 @@ function pdf_getlinedesc($object, $i, $outputlangs, $hideref = 0, $hidedesc = 0,
} }
// Show information for lot // Show information for lot
if ($dbatch) { if (!empty($dbatch)) {
// $object is a shipment. // $object is a shipment.
//var_dump($object->lines[$i]->details_entrepot); // array from llx_expeditiondet (we can have seral lines for one fk_origin_line) //var_dump($object->lines[$i]->details_entrepot); // array from llx_expeditiondet (we can have seral lines for one fk_origin_line)
//var_dump($object->lines[$i]->detail_batch); // array from llx_expeditiondet_batch (each line with a lot is linked to llx_expeditiondet) //var_dump($object->lines[$i]->detail_batch); // array from llx_expeditiondet_batch (each line with a lot is linked to llx_expeditiondet)

4
htdocs/core/modules/DolibarrModules.class.php
View File

@ -461,7 +461,7 @@ class DolibarrModules // Can not be abstract, because we need to instantiate it
// Add current entity id // Add current entity id
$sql = str_replace('__ENTITY__', $conf->entity, $sql); $sql = str_replace('__ENTITY__', $conf->entity, $sql);
dol_syslog(get_class($this)."::_init ignoreerror=".$ignoreerror."", LOG_DEBUG); dol_syslog(get_class($this)."::_init ignoreerror=".$ignoreerror, LOG_DEBUG);
$result = $this->db->query($sql, $ignoreerror); $result = $this->db->query($sql, $ignoreerror);
if (!$result) { if (!$result) {
if (!$ignoreerror) { if (!$ignoreerror) {
@ -1327,7 +1327,7 @@ class DolibarrModules // Can not be abstract, because we need to instantiate it
$sql = "INSERT INTO ".MAIN_DB_PREFIX."boxes (box_id, position, box_order, fk_user, entity)"; $sql = "INSERT INTO ".MAIN_DB_PREFIX."boxes (box_id, position, box_order, fk_user, entity)";
$sql .= " VALUES (".((int) $lastid).", ".((int) $key2).", '0', 0, ".((int) $conf->entity).")"; $sql .= " VALUES (".((int) $lastid).", ".((int) $key2).", '0', 0, ".((int) $conf->entity).")";
dol_syslog(get_class($this)."::insert_boxes onto page ".$key2."=".$val2."", LOG_DEBUG); dol_syslog(get_class($this)."::insert_boxes onto page ".$key2."=".$val2, LOG_DEBUG);
$resql = $this->db->query($sql); $resql = $this->db->query($sql);
if (!$resql) { if (!$resql) {
$err++; $err++;

4
htdocs/core/modules/bank/doc/pdf_sepamandate.modules.php
View File

@ -526,7 +526,7 @@ class pdf_sepamandate extends ModeleBankAccountDoc
$tab_hl = 4; $tab_hl = 4;
$posx = $this->marge_gauche; $posx = $this->marge_gauche;
$pdf->SetXY($posx, $tab_top + 0); $pdf->SetXY($posx, $tab_top);
$pdf->SetFont('', '', $default_font_size - 2); $pdf->SetFont('', '', $default_font_size - 2);
@ -540,7 +540,7 @@ class pdf_sepamandate extends ModeleBankAccountDoc
$index = 0; $index = 0;
// Total HT // Total HT
$pdf->SetFillColor(255, 255, 255); $pdf->SetFillColor(255, 255, 255);
$pdf->SetXY($posx, $tab_top + 0); $pdf->SetXY($posx, $tab_top);
$pdf->MultiCell($largcol, $tab_hl, $outputlangs->transnoentitiesnoconv("Signature"), 0, 'L', 1); $pdf->MultiCell($largcol, $tab_hl, $outputlangs->transnoentitiesnoconv("Signature"), 0, 'L', 1);
$pdf->SetXY($posx, $tab_top + $tab_hl); $pdf->SetXY($posx, $tab_top + $tab_hl);

4
htdocs/core/modules/commande/doc/pdf_einstein.modules.php
View File

@ -935,11 +935,11 @@ class pdf_einstein extends ModelePDFCommandes
// Total HT // Total HT
$pdf->SetFillColor(255, 255, 255); $pdf->SetFillColor(255, 255, 255);
$pdf->SetXY($col1x, $tab2_top + 0); $pdf->SetXY($col1x, $tab2_top);
$pdf->MultiCell($col2x - $col1x, $tab2_hl, $outputlangs->transnoentities("TotalHT").(is_object($outputlangsbis) ? ' / '.$outputlangsbis->transnoentities("TotalHT") : ''), 0, 'L', 1); $pdf->MultiCell($col2x - $col1x, $tab2_hl, $outputlangs->transnoentities("TotalHT").(is_object($outputlangsbis) ? ' / '.$outputlangsbis->transnoentities("TotalHT") : ''), 0, 'L', 1);
$total_ht = ((isModEnabled("multicurrency") && isset($object->multicurrency_tx) && $object->multicurrency_tx != 1) ? $object->multicurrency_total_ht : $object->total_ht); $total_ht = ((isModEnabled("multicurrency") && isset($object->multicurrency_tx) && $object->multicurrency_tx != 1) ? $object->multicurrency_total_ht : $object->total_ht);
$pdf->SetXY($col2x, $tab2_top + 0); $pdf->SetXY($col2x, $tab2_top);
$pdf->MultiCell($largcol2, $tab2_hl, price($total_ht + (!empty($object->remise) ? $object->remise : 0), 0, $outputlangs), 0, 'R', 1); $pdf->MultiCell($largcol2, $tab2_hl, price($total_ht + (!empty($object->remise) ? $object->remise : 0), 0, $outputlangs), 0, 'R', 1);
// Show VAT by rates and total // Show VAT by rates and total

4
htdocs/core/modules/commande/doc/pdf_eratosthene.modules.php
View File

@ -1150,10 +1150,10 @@ class pdf_eratosthene extends ModelePDFCommandes
// Total HT // Total HT
$pdf->SetFillColor(255, 255, 255); $pdf->SetFillColor(255, 255, 255);
$pdf->SetXY($col1x, $tab2_top + 0); $pdf->SetXY($col1x, $tab2_top);
$pdf->MultiCell($col2x - $col1x, $tab2_hl, $outputlangs->transnoentities("TotalHT").(is_object($outputlangsbis) ? ' / '.$outputlangsbis->transnoentities("TotalHT") : ''), 0, 'L', 1); $pdf->MultiCell($col2x - $col1x, $tab2_hl, $outputlangs->transnoentities("TotalHT").(is_object($outputlangsbis) ? ' / '.$outputlangsbis->transnoentities("TotalHT") : ''), 0, 'L', 1);
$total_ht = ((isModEnabled("multicurrency") && isset($object->multicurrency_tx) && $object->multicurrency_tx != 1) ? $object->multicurrency_total_ht : $object->total_ht); $total_ht = ((isModEnabled("multicurrency") && isset($object->multicurrency_tx) && $object->multicurrency_tx != 1) ? $object->multicurrency_total_ht : $object->total_ht);
$pdf->SetXY($col2x, $tab2_top + 0); $pdf->SetXY($col2x, $tab2_top);
$pdf->MultiCell($largcol2, $tab2_hl, price($total_ht + (!empty($object->remise) ? $object->remise : 0), 0, $outputlangs), 0, 'R', 1); $pdf->MultiCell($largcol2, $tab2_hl, price($total_ht + (!empty($object->remise) ? $object->remise : 0), 0, $outputlangs), 0, 'R', 1);
// Show VAT by rates and total // Show VAT by rates and total

4
htdocs/core/modules/facture/doc/pdf_crabe.modules.php
View File

@ -1347,11 +1347,11 @@ class pdf_crabe extends ModelePDFFactures
// Total HT // Total HT
$pdf->SetFillColor(255, 255, 255); $pdf->SetFillColor(255, 255, 255);
$pdf->SetXY($col1x, $tab2_top + 0); $pdf->SetXY($col1x, $tab2_top);
$pdf->MultiCell($col2x - $col1x, $tab2_hl, $outputlangs->transnoentities(empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT) ? "TotalHT" : "Total").(is_object($outputlangsbis) ? ' / '.$outputlangsbis->transnoentities(empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT) ? "TotalHT" : "Total") : ''), 0, 'L', 1); $pdf->MultiCell($col2x - $col1x, $tab2_hl, $outputlangs->transnoentities(empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT) ? "TotalHT" : "Total").(is_object($outputlangsbis) ? ' / '.$outputlangsbis->transnoentities(empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT) ? "TotalHT" : "Total") : ''), 0, 'L', 1);
$total_ht = ((isModEnabled("multicurrency") && isset($object->multicurrency_tx) && $object->multicurrency_tx != 1) ? $object->multicurrency_total_ht : $object->total_ht); $total_ht = ((isModEnabled("multicurrency") && isset($object->multicurrency_tx) && $object->multicurrency_tx != 1) ? $object->multicurrency_total_ht : $object->total_ht);
$pdf->SetXY($col2x, $tab2_top + 0); $pdf->SetXY($col2x, $tab2_top);
$pdf->MultiCell($largcol2, $tab2_hl, price($sign * ($total_ht + (!empty($object->remise) ? $object->remise : 0)), 0, $outputlangs), 0, 'R', 1); $pdf->MultiCell($largcol2, $tab2_hl, price($sign * ($total_ht + (!empty($object->remise) ? $object->remise : 0)), 0, $outputlangs), 0, 'R', 1);
// Show VAT by rates and total // Show VAT by rates and total

4
htdocs/core/modules/facture/doc/pdf_sponge.modules.php
View File

@ -1640,9 +1640,9 @@ class pdf_sponge extends ModelePDFFactures
// Show total NET before discount // Show total NET before discount
if (!empty($conf->global->MAIN_SHOW_AMOUNT_BEFORE_DISCOUNT)) { if (!empty($conf->global->MAIN_SHOW_AMOUNT_BEFORE_DISCOUNT)) {
$pdf->SetFillColor(255, 255, 255); $pdf->SetFillColor(255, 255, 255);
$pdf->SetXY($col1x, $tab2_top + 0); $pdf->SetXY($col1x, $tab2_top);
$pdf->MultiCell($col2x - $col1x, $tab2_hl, $outputlangs->transnoentities("TotalHTBeforeDiscount").(is_object($outputlangsbis) ? ' / '.$outputlangsbis->transnoentities("TotalHTBeforeDiscount") : ''), 0, 'L', 1); $pdf->MultiCell($col2x - $col1x, $tab2_hl, $outputlangs->transnoentities("TotalHTBeforeDiscount").(is_object($outputlangsbis) ? ' / '.$outputlangsbis->transnoentities("TotalHTBeforeDiscount") : ''), 0, 'L', 1);
$pdf->SetXY($col2x, $tab2_top + 0); $pdf->SetXY($col2x, $tab2_top);
$pdf->MultiCell($largcol2, $tab2_hl, price($total_line_remise + $total_ht, 0, $outputlangs), 0, 'R', 1); $pdf->MultiCell($largcol2, $tab2_hl, price($total_line_remise + $total_ht, 0, $outputlangs), 0, 'R', 1);
$index++; $index++;

4
htdocs/core/modules/mrp/doc/pdf_vinci.modules.php
View File

@ -816,11 +816,11 @@ class pdf_vinci extends ModelePDFMo
// Total HT // Total HT
$pdf->SetFillColor(255, 255, 255); $pdf->SetFillColor(255, 255, 255);
$pdf->SetXY($col1x, $tab2_top + 0); $pdf->SetXY($col1x, $tab2_top);
$pdf->MultiCell($col2x - $col1x, $tab2_hl, $outputlangs->transnoentities("TotalHT"), 0, 'L', 1); $pdf->MultiCell($col2x - $col1x, $tab2_hl, $outputlangs->transnoentities("TotalHT"), 0, 'L', 1);
$total_ht = ((isModEnabled("multicurrency") && isset($object->multicurrency_tx) && $object->multicurrency_tx != 1) ? $object->multicurrency_total_ht : $object->total_ht); $total_ht = ((isModEnabled("multicurrency") && isset($object->multicurrency_tx) && $object->multicurrency_tx != 1) ? $object->multicurrency_total_ht : $object->total_ht);
$pdf->SetXY($col2x, $tab2_top + 0); $pdf->SetXY($col2x, $tab2_top);
$pdf->MultiCell($largcol2, $tab2_hl, price($total_ht + (!empty($object->remise) ? $object->remise : 0)), 0, 'R', 1); $pdf->MultiCell($largcol2, $tab2_hl, price($total_ht + (!empty($object->remise) ? $object->remise : 0)), 0, 'R', 1);
// Show VAT by rates and total // Show VAT by rates and total

6
htdocs/core/modules/propale/doc/pdf_azur.modules.php
View File

@ -1119,11 +1119,11 @@ class pdf_azur extends ModelePDFPropales
// Total HT // Total HT
$pdf->SetFillColor(255, 255, 255); $pdf->SetFillColor(255, 255, 255);
$pdf->SetXY($col1x, $tab2_top + 0); $pdf->SetXY($col1x, $tab2_top);
$pdf->MultiCell($col2x - $col1x, $tab2_hl, $outputlangs->transnoentities("TotalHT"), 0, 'L', 1); $pdf->MultiCell($col2x - $col1x, $tab2_hl, $outputlangs->transnoentities("TotalHT"), 0, 'L', 1);
$total_ht = ((isModEnabled("multicurrency") && isset($object->multicurrency_tx) && $object->multicurrency_tx != 1) ? $object->multicurrency_total_ht : $object->total_ht); $total_ht = ((isModEnabled("multicurrency") && isset($object->multicurrency_tx) && $object->multicurrency_tx != 1) ? $object->multicurrency_total_ht : $object->total_ht);
$pdf->SetXY($col2x, $tab2_top + 0); $pdf->SetXY($col2x, $tab2_top);
$pdf->MultiCell($largcol2, $tab2_hl, price($total_ht + (!empty($object->remise) ? $object->remise : 0), 0, $outputlangs), 0, 'R', 1); $pdf->MultiCell($largcol2, $tab2_hl, price($total_ht + (!empty($object->remise) ? $object->remise : 0), 0, $outputlangs), 0, 'R', 1);
// Show VAT by rates and total // Show VAT by rates and total
@ -1769,7 +1769,7 @@ class pdf_azur extends ModelePDFPropales
$index = 0; $index = 0;
// Total HT // Total HT
$pdf->SetFillColor(255, 255, 255); $pdf->SetFillColor(255, 255, 255);
$pdf->SetXY($posx, $tab_top + 0); $pdf->SetXY($posx, $tab_top);
$pdf->SetFont('', '', $default_font_size - 2); $pdf->SetFont('', '', $default_font_size - 2);
$pdf->MultiCell($largcol, $tab_hl, $outputlangs->transnoentities("ProposalCustomerSignature"), 0, 'L', 1); $pdf->MultiCell($largcol, $tab_hl, $outputlangs->transnoentities("ProposalCustomerSignature"), 0, 'L', 1);

6
htdocs/core/modules/propale/doc/pdf_cyan.modules.php
View File

@ -1244,11 +1244,11 @@ class pdf_cyan extends ModelePDFPropales
// Total HT // Total HT
$pdf->SetFillColor(255, 255, 255); $pdf->SetFillColor(255, 255, 255);
$pdf->SetXY($col1x, $tab2_top + 0); $pdf->SetXY($col1x, $tab2_top);
$pdf->MultiCell($col2x - $col1x, $tab2_hl, $outputlangs->transnoentities("TotalHT").(is_object($outputlangsbis) ? ' / '.$outputlangsbis->transnoentities("TotalHT") : ''), 0, 'L', 1); $pdf->MultiCell($col2x - $col1x, $tab2_hl, $outputlangs->transnoentities("TotalHT").(is_object($outputlangsbis) ? ' / '.$outputlangsbis->transnoentities("TotalHT") : ''), 0, 'L', 1);
$total_ht = ((isModEnabled("multicurrency") && isset($object->multicurrency_tx) && $object->multicurrency_tx != 1) ? $object->multicurrency_total_ht : $object->total_ht); $total_ht = ((isModEnabled("multicurrency") && isset($object->multicurrency_tx) && $object->multicurrency_tx != 1) ? $object->multicurrency_total_ht : $object->total_ht);
$pdf->SetXY($col2x, $tab2_top + 0); $pdf->SetXY($col2x, $tab2_top);
$pdf->MultiCell($largcol2, $tab2_hl, price($total_ht + (!empty($object->remise) ? $object->remise : 0), 0, $outputlangs), 0, 'R', 1); $pdf->MultiCell($largcol2, $tab2_hl, price($total_ht + (!empty($object->remise) ? $object->remise : 0), 0, $outputlangs), 0, 'R', 1);
// Show VAT by rates and total // Show VAT by rates and total
@ -1854,7 +1854,7 @@ class pdf_cyan extends ModelePDFPropales
$index = 0; $index = 0;
// Total HT // Total HT
$pdf->SetFillColor(255, 255, 255); $pdf->SetFillColor(255, 255, 255);
$pdf->SetXY($posx, $tab_top + 0); $pdf->SetXY($posx, $tab_top);
$pdf->SetFont('', '', $default_font_size - 2); $pdf->SetFont('', '', $default_font_size - 2);
$pdf->MultiCell($largcol, $tab_hl, $outputlangs->transnoentities("ProposalCustomerSignature"), 0, 'L', 1); $pdf->MultiCell($largcol, $tab_hl, $outputlangs->transnoentities("ProposalCustomerSignature"), 0, 'L', 1);

4
htdocs/core/modules/stocktransfer/doc/pdf_eagle_proforma.modules.php
View File

@ -1035,10 +1035,10 @@ class pdf_eagle_proforma extends ModelePDFCommandes
// Total HT // Total HT
/*$pdf->SetFillColor(255, 255, 255); /*$pdf->SetFillColor(255, 255, 255);
$pdf->SetXY($col1x, $tab2_top + 0); $pdf->SetXY($col1x, $tab2_top);
$pdf->MultiCell($col2x - $col1x, $tab2_hl, $outputlangs->transnoentities("TotalHT").(is_object($outputlangsbis) ? ' / '.$outputlangsbis->transnoentities("TotalHT") : ''), 0, 'L', 1); $pdf->MultiCell($col2x - $col1x, $tab2_hl, $outputlangs->transnoentities("TotalHT").(is_object($outputlangsbis) ? ' / '.$outputlangsbis->transnoentities("TotalHT") : ''), 0, 'L', 1);
$total_ht = ((isModEnabled("multicurrency") && isset($object->multicurrency_tx) && $object->multicurrency_tx != 1) ? $object->multicurrency_total_ht : $object->total_ht); $total_ht = ((isModEnabled("multicurrency") && isset($object->multicurrency_tx) && $object->multicurrency_tx != 1) ? $object->multicurrency_total_ht : $object->total_ht);
$pdf->SetXY($col2x, $tab2_top + 0); $pdf->SetXY($col2x, $tab2_top);
$pdf->MultiCell($largcol2, $tab2_hl, price($total_ht + (!empty($object->remise) ? $object->remise : 0), 0, $outputlangs), 0, 'R', 1);*/ $pdf->MultiCell($largcol2, $tab2_hl, price($total_ht + (!empty($object->remise) ? $object->remise : 0), 0, $outputlangs), 0, 'R', 1);*/
// Show VAT by rates and total // Show VAT by rates and total

4
htdocs/core/modules/supplier_invoice/doc/pdf_canelle.modules.php
View File

@ -680,11 +680,11 @@ class pdf_canelle extends ModelePDFSuppliersInvoices
// Total HT // Total HT
$pdf->SetFillColor(255, 255, 255); $pdf->SetFillColor(255, 255, 255);
$pdf->SetXY($col1x, $tab2_top + 0); $pdf->SetXY($col1x, $tab2_top);
$pdf->MultiCell($col2x - $col1x, $tab2_hl, $outputlangs->transnoentities("TotalHT"), 0, 'L', 1); $pdf->MultiCell($col2x - $col1x, $tab2_hl, $outputlangs->transnoentities("TotalHT"), 0, 'L', 1);
$total_ht = ((isModEnabled("multicurrency") && isset($object->multicurrency_tx) && $object->multicurrency_tx != 1) ? $object->multicurrency_total_ht : $object->total_ht); $total_ht = ((isModEnabled("multicurrency") && isset($object->multicurrency_tx) && $object->multicurrency_tx != 1) ? $object->multicurrency_total_ht : $object->total_ht);
$pdf->SetXY($col2x, $tab2_top + 0); $pdf->SetXY($col2x, $tab2_top);
$pdf->MultiCell($largcol2, $tab2_hl, price($sign * ($total_ht + (!empty($object->remise) ? $object->remise : 0)), 0, $outputlangs), 0, 'R', 1); $pdf->MultiCell($largcol2, $tab2_hl, price($sign * ($total_ht + (!empty($object->remise) ? $object->remise : 0)), 0, $outputlangs), 0, 'R', 1);
// Show VAT by rates and total // Show VAT by rates and total

4
htdocs/core/modules/supplier_order/doc/pdf_cornas.modules.php
View File

@ -972,11 +972,11 @@ class pdf_cornas extends ModelePDFSuppliersOrders
// Total HT // Total HT
$pdf->SetFillColor(255, 255, 255); $pdf->SetFillColor(255, 255, 255);
$pdf->SetXY($col1x, $tab2_top + 0); $pdf->SetXY($col1x, $tab2_top);
$pdf->MultiCell($col2x - $col1x, $tab2_hl, $outputlangs->transnoentities("TotalHT"), 0, 'L', 1); $pdf->MultiCell($col2x - $col1x, $tab2_hl, $outputlangs->transnoentities("TotalHT"), 0, 'L', 1);
$total_ht = ((isModEnabled("multicurrency") && isset($object->multicurrency_tx) && $object->multicurrency_tx != 1) ? $object->multicurrency_total_ht : $object->total_ht); $total_ht = ((isModEnabled("multicurrency") && isset($object->multicurrency_tx) && $object->multicurrency_tx != 1) ? $object->multicurrency_total_ht : $object->total_ht);
$pdf->SetXY($col2x, $tab2_top + 0); $pdf->SetXY($col2x, $tab2_top);
$pdf->MultiCell($largcol2, $tab2_hl, price($total_ht + (!empty($object->remise) ? $object->remise : 0)), 0, 'R', 1); $pdf->MultiCell($largcol2, $tab2_hl, price($total_ht + (!empty($object->remise) ? $object->remise : 0)), 0, 'R', 1);
// Show VAT by rates and total // Show VAT by rates and total

4
htdocs/core/modules/supplier_order/doc/pdf_muscadet.modules.php
View File

@ -853,11 +853,11 @@ class pdf_muscadet extends ModelePDFSuppliersOrders
// Total HT // Total HT
$pdf->SetFillColor(255, 255, 255); $pdf->SetFillColor(255, 255, 255);
$pdf->SetXY($col1x, $tab2_top + 0); $pdf->SetXY($col1x, $tab2_top);
$pdf->MultiCell($col2x - $col1x, $tab2_hl, $outputlangs->transnoentities("TotalHT"), 0, 'L', 1); $pdf->MultiCell($col2x - $col1x, $tab2_hl, $outputlangs->transnoentities("TotalHT"), 0, 'L', 1);
$total_ht = ((isModEnabled("multicurrency") && isset($object->multicurrency_tx) && $object->multicurrency_tx != 1) ? $object->multicurrency_total_ht : $object->total_ht); $total_ht = ((isModEnabled("multicurrency") && isset($object->multicurrency_tx) && $object->multicurrency_tx != 1) ? $object->multicurrency_total_ht : $object->total_ht);
$pdf->SetXY($col2x, $tab2_top + 0); $pdf->SetXY($col2x, $tab2_top);
$pdf->MultiCell($largcol2, $tab2_hl, price($total_ht + (!empty($object->remise) ? $object->remise : 0)), 0, 'R', 1); $pdf->MultiCell($largcol2, $tab2_hl, price($total_ht + (!empty($object->remise) ? $object->remise : 0)), 0, 'R', 1);
// Show VAT by rates and total // Show VAT by rates and total

7
htdocs/core/modules/supplier_proposal/doc/pdf_aurore.modules.php
View File

@ -925,11 +925,12 @@ class pdf_aurore extends ModelePDFSupplierProposal
// Total HT // Total HT
$pdf->SetFillColor(255, 255, 255); $pdf->SetFillColor(255, 255, 255);
$pdf->SetXY($col1x, $tab2_top + 0); $pdf->SetXY($col1x, $tab2_top);
$pdf->MultiCell($col2x - $col1x, $tab2_hl, $outputlangs->transnoentities("TotalHT"), 0, 'L', 1); $pdf->MultiCell($col2x - $col1x, $tab2_hl, $outputlangs->transnoentities("TotalHT"), 0, 'L', 1);
$pdf->SetXY($col2x, $tab2_top + 0); $total_ht = ((isModEnabled("multicurrency") && isset($object->multicurrency_tx) && $object->multicurrency_tx != 1) ? $object->multicurrency_total_ht : $object->total_ht);
$pdf->MultiCell($largcol2, $tab2_hl, price($object->total_ht + (!empty($object->remise) ? $object->remise : 0), 0, $outputlangs), 0, 'R', 1); $pdf->SetXY($col2x, $tab2_top);
$pdf->MultiCell($largcol2, $tab2_hl, price($total_ht + (!empty($object->remise) ? $object->remise : 0), 0, $outputlangs), 0, 'R', 1);
// Show VAT by rates and total // Show VAT by rates and total
$pdf->SetFillColor(248, 248, 248); $pdf->SetFillColor(248, 248, 248);

2
htdocs/expedition/class/expeditionlinebatch.class.php
View File

@ -194,7 +194,7 @@ class ExpeditionLineBatch extends CommonObject
} }
$sql .= " WHERE fk_expeditiondet=".(int) $id_line_expdet; $sql .= " WHERE fk_expeditiondet=".(int) $id_line_expdet;
dol_syslog(__METHOD__."", LOG_DEBUG); dol_syslog(__METHOD__, LOG_DEBUG);
$resql = $this->db->query($sql); $resql = $this->db->query($sql);
if ($resql) { if ($resql) {
$num = $this->db->num_rows($resql); $num = $this->db->num_rows($resql);

2
htdocs/product/class/product.class.php
View File

@ -1671,7 +1671,7 @@ class Product extends CommonObject
$sql .= "$field = '".$this->db->escape($value)."'"; $sql .= "$field = '".$this->db->escape($value)."'";
$sql .= " WHERE rowid = ".((int) $this->id); $sql .= " WHERE rowid = ".((int) $this->id);
dol_syslog(__METHOD__."", LOG_DEBUG); dol_syslog(__METHOD__, LOG_DEBUG);
$resql = $this->db->query($sql); $resql = $this->db->query($sql);
if ($resql) { if ($resql) {

2
htdocs/projet/class/projectstats.class.php
View File

@ -98,7 +98,7 @@ class ProjectStats extends Stats
$result = array(); $result = array();
dol_syslog(get_class($this).'::'.__METHOD__."", LOG_DEBUG); dol_syslog(get_class($this).'::'.__METHOD__, LOG_DEBUG);
$resql = $this->db->query($sql); $resql = $this->db->query($sql);
if ($resql) { if ($resql) {
$num = $this->db->num_rows($resql); $num = $this->db->num_rows($resql);

2
htdocs/projet/class/taskstats.class.php
View File

@ -70,7 +70,7 @@ class TaskStats extends Stats
$result = array(); $result = array();
$res = array(); $res = array();
dol_syslog(get_class($this).'::'.__METHOD__."", LOG_DEBUG); dol_syslog(get_class($this).'::'.__METHOD__, LOG_DEBUG);
$resql = $this->db->query($sql); $resql = $this->db->query($sql);
if ($resql) { if ($resql) {
$num = $this->db->num_rows($resql); $num = $this->db->num_rows($resql);

14
htdocs/stripe/class/stripe.class.php
View File

@ -1087,13 +1087,13 @@ class Stripe extends CommonObject
$ipaddress = getUserRemoteIP(); $ipaddress = getUserRemoteIP();
$metadata = array( $metadata = array(
"dol_id" => "".$item."", "dol_id" => (string) $item,
"dol_type" => "".$origin."", "dol_type" => (string) $origin,
"dol_thirdparty_id" => "".$societe->id."", "dol_thirdparty_id" => (string) $societe->id,
'dol_thirdparty_name' => $societe->name, 'dol_thirdparty_name' => $societe->name,
'dol_version'=>DOL_VERSION, 'dol_version' => DOL_VERSION,
'dol_entity'=>$conf->entity, 'dol_entity' => $conf->entity,
'ipaddress'=>$ipaddress 'ipaddress' => $ipaddress
); );
$return = new Stripe($this->db); $return = new Stripe($this->db);
try { try {
@ -1233,7 +1233,7 @@ class Stripe extends CommonObject
$return->message = $charge->source->card->brand." ....".$charge->source->card->last4; $return->message = $charge->source->card->brand." ....".$charge->source->card->last4;
} elseif ($charge->source->type == 'three_d_secure') { } elseif ($charge->source->type == 'three_d_secure') {
$stripe = new Stripe($this->db); $stripe = new Stripe($this->db);
$src = \Stripe\Source::retrieve("".$charge->source->three_d_secure->card."", array( $src = \Stripe\Source::retrieve("".$charge->source->three_d_secure->card, array(
"stripe_account" => $stripe->getStripeAccount($service) "stripe_account" => $stripe->getStripeAccount($service)
)); ));
$return->message = $src->card->brand." ....".$src->card->last4; $return->message = $src->card->brand." ....".$src->card->last4;

10
htdocs/stripe/payout.php
View File

@ -215,15 +215,15 @@ if (!$rowid) {
// Status // Status
print "<td class='right'>"; print "<td class='right'>";
if ($payout->status == 'paid') { if ($payout->status == 'paid') {
print img_picto($langs->trans("".$payout->status.""), 'statut4'); print img_picto($langs->trans($payout->status), 'statut4');
} elseif ($payout->status == 'pending') { } elseif ($payout->status == 'pending') {
print img_picto($langs->trans("".$payout->status.""), 'statut7'); print img_picto($langs->trans($payout->status), 'statut7');
} elseif ($payout->status == 'in_transit') { } elseif ($payout->status == 'in_transit') {
print img_picto($langs->trans("".$payout->status.""), 'statut7'); print img_picto($langs->trans($payout->status), 'statut7');
} elseif ($payout->status == 'failed') { } elseif ($payout->status == 'failed') {
print img_picto($langs->trans("".$payout->status.""), 'statut7'); print img_picto($langs->trans($payout->status), 'statut7');
} elseif ($payout->status == 'canceled') { } elseif ($payout->status == 'canceled') {
print img_picto($langs->trans("".$payout->status.""), 'statut8'); print img_picto($langs->trans($payout->status), 'statut8');
} }
print '</td>'; print '</td>';
print "</tr>\n"; print "</tr>\n";

6
htdocs/stripe/transaction.php
View File

@ -220,11 +220,11 @@ if (!$rowid) {
// Status // Status
print "<td class='right'>"; print "<td class='right'>";
if ($txn->status == 'available') { if ($txn->status == 'available') {
print img_picto($langs->trans("".$txn->status.""), 'statut4'); print img_picto($langs->trans($txn->status), 'statut4');
} elseif ($txn->status == 'pending') { } elseif ($txn->status == 'pending') {
print img_picto($langs->trans("".$txn->status.""), 'statut7'); print img_picto($langs->trans($txn->status), 'statut7');
} elseif ($txn->status == 'failed') { } elseif ($txn->status == 'failed') {
print img_picto($langs->trans("".$txn->status.""), 'statut8'); print img_picto($langs->trans($txn->status), 'statut8');
} }
print '</td>'; print '</td>';
print "</tr>\n"; print "</tr>\n";

9
qodana.yaml
View File

@ -52,9 +52,12 @@ exclude:
- name: PhpInArrayCanBeReplacedWithComparisonInspection - name: PhpInArrayCanBeReplacedWithComparisonInspection
- name: PhpUnusedAliasInspection - name: PhpUnusedAliasInspection
- name: PhpPossiblePolymorphicInvocationInspection - name: PhpPossiblePolymorphicInvocationInspection
- name: PhpReturnValueOfMethodIsNeverUsedInspection
- name: PhpPregReplaceWithEmptyReplacementInspection - name: PhpPregReplaceWithEmptyReplacementInspection
- name: PhpFieldImmediatelyRewrittenInspection - name: PhpFieldImmediatelyRewrittenInspection
- name: PhpIllegalStringOffsetInspection - name: PhpIllegalStringOffsetInspection
- name: PhpWrongForeachArgumentTypeInspection
- name: PhpRegExpRedundantModifierInspection - name: PhpRegExpRedundantModifierInspection
- name: PhpClassConstantAccessedViaChildClassInspection
- name: RegExpUnnecessaryNonCapturingGroup