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

Fix scrutinizer

Browse Source
This commit is contained in:
Laurent Destailleur 2018-02-08 17:22:07 +01:00
parent b5c12b346c
commit d10d9f0fb2
6 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/compta/paiement/class/paiement.class.php
View File

@ -1047,7 +1047,7 @@ class Paiement extends CommonObject
*/
function getNomUrl($withpicto=0, $option='', $mode='withlistofinvoices', $notooltip=0)
{
global $langs;
global $conf, $langs;
if (! empty($conf->dol_no_mouse_hover)) $notooltip=1; // Force disable tooltips

3
htdocs/compta/tva/class/tva.class.php
View File

@ -652,9 +652,10 @@ class Tva extends CommonObject
* @param int $withpicto 0=No picto, 1=Include picto into link, 2=Only picto
* @param string $option link option
* @param int $notooltip 1=Disable tooltip
* @param string $morecss More CSS
* @return string Chaine with URL
*/
function getNomUrl($withpicto=0, $option='', $notooltip=0)
function getNomUrl($withpicto=0, $option='', $notooltip=0, morecss='')
{
global $langs, $conf;

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

@ -1205,7 +1205,7 @@ class Contrat extends CommonObject
* @param int $notrigger 0=launch triggers after, 1=disable triggers
* @return int <0 if KO, >0 if OK
*/
function update($user=null, $notrigger=0)
function update($user, $notrigger=0)
{
global $conf, $langs;
$error=0;

1
htdocs/fichinter/class/api_interventions.class.php
View File

@ -162,6 +162,7 @@ class Interventions extends DolibarrApi
{
$num = $db->num_rows($result);
$min = min($num, ($limit <= 0 ? $num : $limit));
$i = 0;
while ($i < $min)
{
$obj = $db->fetch_object($result);

2
htdocs/societe/class/api_thirdparties.class.php
View File

@ -261,6 +261,8 @@ class Thirdparties extends DolibarrApi
{
global $db, $hookmanager;
$error = 0;
if ($id == $idtodelete)
{
throw new RestException(400, 'Try to merge a thirdparty into itself');

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

@ -3780,7 +3780,7 @@ class Societe extends CommonObject
*/
public static function replaceThirdparty(DoliDB $db, $origin_id, $dest_id)
{
if ($origin_id == $id)
if ($origin_id == $dest_id)
{
dol_syslog('Error: Try to merge a thirdparty into itself');
return false;