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

Merge pull request #15335 from Dolibarr/scrutinizer-patch-2

Browse Source 
Scrutinizer Auto-Fixes
This commit is contained in:
Laurent Destailleur 2020-11-09 15:19:36 +01:00 committed by GitHub
commit 62f694931d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
14 changed files with 30 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3918,7 +3918,7 @@ class Commande extends CommonOrder
if (!dol_strlen($modele)) { if (!dol_strlen($modele)) {
$modele = 'einstein'; $modele = 'einstein';
if (! empty($this->modelpdf)) { if (!empty($this->modelpdf)) {
$modele = $this->modelpdf; $modele = $this->modelpdf;
} elseif (!empty($conf->global->COMMANDE_ADDON_PDF)) { } elseif (!empty($conf->global->COMMANDE_ADDON_PDF)) {
$modele = $conf->global->COMMANDE_ADDON_PDF; $modele = $conf->global->COMMANDE_ADDON_PDF;

2
htdocs/compta/bank/list.php
View File

@ -262,7 +262,7 @@ print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sort
$topicmail = "Information"; $topicmail = "Information";
//$modelmail="subscription"; //$modelmail="subscription";
$objecttmp = new Account($db); $objecttmp = new Account($db);
$trackid='bank'.$object->id; $trackid = 'bank'.$object->id;
include DOL_DOCUMENT_ROOT.'/core/tpl/massactions_pre.tpl.php'; include DOL_DOCUMENT_ROOT.'/core/tpl/massactions_pre.tpl.php';
if ($sall) if ($sall)

4
htdocs/compta/facture/class/facture.class.php
View File

@ -627,7 +627,7 @@ class Facture extends CommonInvoice
$sql .= ", ".($this->remise_absolue > 0 ? $this->remise_absolue : 'NULL'); $sql .= ", ".($this->remise_absolue > 0 ? $this->remise_absolue : 'NULL');
$sql .= ", ".($this->remise_percent > 0 ? $this->remise_percent : 'NULL'); $sql .= ", ".($this->remise_percent > 0 ? $this->remise_percent : 'NULL');
$sql .= ", '".$this->db->idate($this->date)."'"; $sql .= ", '".$this->db->idate($this->date)."'";
$sql .= ", ".(empty($this->date_pointoftax) ? "null": "'".$this->db->idate($this->date_pointoftax)."'"); $sql .= ", ".(empty($this->date_pointoftax) ? "null" : "'".$this->db->idate($this->date_pointoftax)."'");
$sql .= ", ".($this->note_private ? "'".$this->db->escape($this->note_private)."'" : "null"); $sql .= ", ".($this->note_private ? "'".$this->db->escape($this->note_private)."'" : "null");
$sql .= ", ".($this->note_public ? "'".$this->db->escape($this->note_public)."'" : "null"); $sql .= ", ".($this->note_public ? "'".$this->db->escape($this->note_public)."'" : "null");
$sql .= ", ".($this->ref_client ? "'".$this->db->escape($this->ref_client)."'" : "null"); $sql .= ", ".($this->ref_client ? "'".$this->db->escape($this->ref_client)."'" : "null");
@ -4338,7 +4338,7 @@ class Facture extends CommonInvoice
$modele = 'crabe'; $modele = 'crabe';
$thisTypeConfName = 'FACTURE_ADDON_PDF_'.$this->type; $thisTypeConfName = 'FACTURE_ADDON_PDF_'.$this->type;
if (! empty($this->modelpdf)) { if (!empty($this->modelpdf)) {
$modele = $this->modelpdf; $modele = $this->modelpdf;
} elseif (!empty($conf->global->$thisTypeConfName)) { } elseif (!empty($conf->global->$thisTypeConfName)) {
$modele = $conf->global->$thisTypeConfName; $modele = $conf->global->$thisTypeConfName;

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

@ -2419,7 +2419,7 @@ class Contrat extends CommonObject
if (!dol_strlen($modele)) { if (!dol_strlen($modele)) {
$modele = 'strato'; $modele = 'strato';
if (! empty($this->modelpdf)) { if (!empty($this->modelpdf)) {
$modele = $this->modelpdf; $modele = $this->modelpdf;
} elseif (!empty($conf->global->CONTRACT_ADDON_PDF)) { } elseif (!empty($conf->global->CONTRACT_ADDON_PDF)) {
$modele = $conf->global->CONTRACT_ADDON_PDF; $modele = $conf->global->CONTRACT_ADDON_PDF;

2
htdocs/core/modules/modProduct.class.php
View File

@ -628,7 +628,7 @@ class modProduct extends DolibarrModules
$this->import_label[$r] = "SuppliersPricesOfProductsOrServices"; // Translation key $this->import_label[$r] = "SuppliersPricesOfProductsOrServices"; // Translation key
$this->import_icon[$r] = $this->picto; $this->import_icon[$r] = $this->picto;
$this->import_entities_array[$r] = array(); // We define here only fields that use another icon that the one defined into import_icon $this->import_entities_array[$r] = array(); // We define here only fields that use another icon that the one defined into import_icon
$this->import_tables_array[$r] = array('sp'=>MAIN_DB_PREFIX.'product_fournisseur_price','extra'=>MAIN_DB_PREFIX.'product_fournisseur_price_extrafields'); $this->import_tables_array[$r] = array('sp'=>MAIN_DB_PREFIX.'product_fournisseur_price', 'extra'=>MAIN_DB_PREFIX.'product_fournisseur_price_extrafields');
$this->import_tables_creator_array[$r] = array('sp'=>'fk_user'); $this->import_tables_creator_array[$r] = array('sp'=>'fk_user');
$this->import_fields_array[$r] = array(//field order as per structure of table llx_product_fournisseur_price, without optional fields $this->import_fields_array[$r] = array(//field order as per structure of table llx_product_fournisseur_price, without optional fields
'sp.fk_product'=>"ProductOrService*", 'sp.fk_product'=>"ProductOrService*",

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

@ -2495,7 +2495,7 @@ class Expedition extends CommonObject
if (!dol_strlen($modele)) { if (!dol_strlen($modele)) {
$modele = 'rouget'; $modele = 'rouget';
if (! empty($this->modelpdf)) { if (!empty($this->modelpdf)) {
$modele = $this->modelpdf; $modele = $this->modelpdf;
} elseif (!empty($conf->global->EXPEDITION_ADDON_PDF)) { } elseif (!empty($conf->global->EXPEDITION_ADDON_PDF)) {
$modele = $conf->global->EXPEDITION_ADDON_PDF; $modele = $conf->global->EXPEDITION_ADDON_PDF;

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

@ -2207,7 +2207,7 @@ class ExpenseReport extends CommonObject
$langs->load("trips"); $langs->load("trips");
if (!dol_strlen($modele)) { if (!dol_strlen($modele)) {
if (! empty($this->modelpdf)) { if (!empty($this->modelpdf)) {
$modele = $this->modelpdf; $modele = $this->modelpdf;
} elseif (!empty($conf->global->EXPENSEREPORT_ADDON_PDF)) { } elseif (!empty($conf->global->EXPENSEREPORT_ADDON_PDF)) {
$modele = $conf->global->EXPENSEREPORT_ADDON_PDF; $modele = $conf->global->EXPENSEREPORT_ADDON_PDF;

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

@ -689,7 +689,7 @@ class Fichinter extends CommonObject
if (!dol_strlen($modele)) { if (!dol_strlen($modele)) {
$modele = 'soleil'; $modele = 'soleil';
if (! empty($this->modelpdf)) { if (!empty($this->modelpdf)) {
$modele = $this->modelpdf; $modele = $this->modelpdf;
} elseif (!empty($conf->global->FICHEINTER_ADDON_PDF)) { } elseif (!empty($conf->global->FICHEINTER_ADDON_PDF)) {
$modele = $conf->global->FICHEINTER_ADDON_PDF; $modele = $conf->global->FICHEINTER_ADDON_PDF;

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

@ -1900,7 +1900,7 @@ class Task extends CommonObject
if (!dol_strlen($modele)) { if (!dol_strlen($modele)) {
$modele = 'nodefault'; $modele = 'nodefault';
if (! empty($this->modelpdf)) { if (!empty($this->modelpdf)) {
$modele = $this->modelpdf; $modele = $this->modelpdf;
} elseif (!empty($conf->global->PROJECT_TASK_ADDON_PDF)) { } elseif (!empty($conf->global->PROJECT_TASK_ADDON_PDF)) {
$modele = $conf->global->PROJECT_TASK_ADDON_PDF; $modele = $conf->global->PROJECT_TASK_ADDON_PDF;

12
htdocs/user/class/user.class.php
View File

@ -949,15 +949,15 @@ class User extends CommonObject
$perms = $obj->perms; $perms = $obj->perms;
$subperms = $obj->subperms; $subperms = $obj->subperms;
if (! empty($perms)) { if (!empty($perms)) {
if (!isset($this->rights) || !is_object($this->rights)) { if (!isset($this->rights) || !is_object($this->rights)) {
$this->rights = new stdClass(); // For avoid error $this->rights = new stdClass(); // For avoid error
} }
if (! empty($module)) { if (!empty($module)) {
if (!isset($this->rights->$module) || !is_object($this->rights->$module)) { if (!isset($this->rights->$module) || !is_object($this->rights->$module)) {
$this->rights->$module = new stdClass(); $this->rights->$module = new stdClass();
} }
if (! empty($subperms)) { if (!empty($subperms)) {
if (!isset($this->rights->$module->$perms) || !is_object($this->rights->$module->$perms)) { if (!isset($this->rights->$module->$perms) || !is_object($this->rights->$module->$perms)) {
$this->rights->$module->$perms = new stdClass(); $this->rights->$module->$perms = new stdClass();
} }
@ -1015,15 +1015,15 @@ class User extends CommonObject
$perms = $obj->perms; $perms = $obj->perms;
$subperms = $obj->subperms; $subperms = $obj->subperms;
if (! empty($perms)) { if (!empty($perms)) {
if (!isset($this->rights) || !is_object($this->rights)) { if (!isset($this->rights) || !is_object($this->rights)) {
$this->rights = new stdClass(); // For avoid error $this->rights = new stdClass(); // For avoid error
} }
if (! empty($module)) { if (!empty($module)) {
if (!isset($this->rights->$module) || !is_object($this->rights->$module)) { if (!isset($this->rights->$module) || !is_object($this->rights->$module)) {
$this->rights->$module = new stdClass(); $this->rights->$module = new stdClass();
} }
if (! empty($subperms)) { if (!empty($subperms)) {
if (!isset($this->rights->$module->$perms) || !is_object($this->rights->$module->$perms)) { if (!isset($this->rights->$module->$perms) || !is_object($this->rights->$module->$perms)) {
$this->rights->$module->$perms = new stdClass(); $this->rights->$module->$perms = new stdClass();
} }