Merge pull request #9332 from frederic34/functionClosingBrace

PSR2 FunctionClosingBrace
This commit is contained in:
Laurent Destailleur 2018-09-01 12:06:08 +02:00 committed by GitHub
commit 482ddd548a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
400 changed files with 47 additions and 618 deletions

View File

@ -374,6 +374,9 @@
</rule> </rule>
<rule ref="PEAR.NamingConventions.ValidVariableName" /> <rule ref="PEAR.NamingConventions.ValidVariableName" />
<rule ref="PSR2.Classes.ClassDeclaration" />
<rule ref="PSR2.Methods.FunctionClosingBrace" />
<!-- This is not in PSR2 --> <!-- This is not in PSR2 -->
<rule ref="PEAR.NamingConventions.ValidVariableName.PrivateNoUnderscore"> <rule ref="PEAR.NamingConventions.ValidVariableName.PrivateNoUnderscore">
<severity>0</severity> <severity>0</severity>

View File

@ -65,7 +65,6 @@ class autoTranslator
//ini_set('default_charset','UTF-8'); //ini_set('default_charset','UTF-8');
ini_set('default_charset',$this->_outputpagecode); ini_set('default_charset',$this->_outputpagecode);
$this->parse_refLangTranslationFiles(); $this->parse_refLangTranslationFiles();
} }
/** /**
@ -346,5 +345,4 @@ class autoTranslator
return $rep; return $rep;
} }
} }

View File

@ -28,7 +28,7 @@ require_once DOL_DOCUMENT_ROOT . '/core/lib/accounting.lib.php';
/** /**
* Class to manage categories of an accounting account * Class to manage categories of an accounting account
*/ */
class AccountancyCategory // extends CommonObject class AccountancyCategory // extends CommonObject
{ {
/** /**
* @var DoliDB Database handler. * @var DoliDB Database handler.
@ -824,5 +824,4 @@ class AccountancyCategory // extends CommonObject
return -1; return -1;
} }
} }
} }

View File

@ -277,5 +277,4 @@ abstract class ActionsAdherentCardCommon
} }
} }
} }
} }

View File

@ -117,7 +117,6 @@ class ActionsAdherentCardDefault extends ActionsAdherentCardCommon
{ {
$this->LoadListDatas($limit, $offset, $sortfield, $sortorder); $this->LoadListDatas($limit, $offset, $sortfield, $sortorder);
} }
} }

View File

@ -690,7 +690,6 @@ class Adherent extends CommonObject
$this->db->rollback(); $this->db->rollback();
return -1; return -1;
} }
} }
/** /**
@ -2107,7 +2106,6 @@ class Adherent extends CommonObject
$this->error=$this->db->error(); $this->error=$this->db->error();
return -1; return -1;
} }
} }
/** /**
@ -2671,5 +2669,4 @@ class Adherent extends CommonObject
return 0; return 0;
} }
} }

View File

@ -555,5 +555,4 @@ class AdherentType extends CommonObject
return ''; return '';
} }
} }

View File

@ -181,5 +181,4 @@ class AdherentStats extends Stats
return $this->_getAllByYear($sql); return $this->_getAllByYear($sql);
} }
} }

View File

@ -409,5 +409,4 @@ class Members extends DolibarrApi
return $result; return $result;
} }
} }

View File

@ -320,5 +320,4 @@ class MembersTypes extends DolibarrApi
return $object; return $object;
} }
} }

View File

@ -181,7 +181,6 @@ function create_script_table($list)
print '</tr>'; print '</tr>';
} }
print '</table>'; print '</table>';
} }
/** /**

View File

@ -196,6 +196,5 @@ class DolibarrApiAccess implements iAuthenticate
return $requires return $requires
? static::$role == 'admin' || in_array(static::$role, (array) $requires) ? static::$role == 'admin' || in_array(static::$role, (array) $requires)
: true; : true;
} }
} }

View File

@ -918,5 +918,4 @@ class Setup extends DolibarrApi
return array('resultcode'=>$resultcode, 'resultcomment'=>$resultcomment, 'expectedchecksum'=> $outexpectedchecksum, 'currentchecksum'=> $outcurrentchecksum, 'out'=>$out); return array('resultcode'=>$resultcode, 'resultcomment'=>$resultcomment, 'expectedchecksum'=> $outexpectedchecksum, 'currentchecksum'=> $outcurrentchecksum, 'out'=>$out);
} }
} }

View File

@ -437,5 +437,4 @@ class AssetType extends CommonObject
{ {
return ''; return '';
} }
} }

View File

@ -54,7 +54,6 @@ class BlockedLogAuthority
{ {
$this->db = $db; $this->db = $db;
} }
/** /**
@ -90,7 +89,6 @@ class BlockedLogAuthority
{ {
return md5($this->signature.$this->blockchain); return md5($this->signature.$this->blockchain);
} }
/** /**
@ -103,7 +101,6 @@ class BlockedLogAuthority
{ {
return ($hash === $this->getBlockchainHash() ); return ($hash === $this->getBlockchainHash() );
} }
/** /**
@ -116,7 +113,6 @@ class BlockedLogAuthority
{ {
$this->blockchain.=$block; $this->blockchain.=$block;
} }
/** /**
@ -197,7 +193,6 @@ class BlockedLogAuthority
$this->error=$this->db->error(); $this->error=$this->db->error();
return -1; return -1;
} }
} }
/** /**
@ -252,7 +247,6 @@ class BlockedLogAuthority
$this->db->rollback(); $this->db->rollback();
return -1; return -1;
} }
} }
/** /**
@ -291,7 +285,6 @@ class BlockedLogAuthority
$this->db->rollback(); $this->db->rollback();
return -1; return -1;
} }
} }
/** /**
@ -340,5 +333,4 @@ class BlockedLogAuthority
return 1; return 1;
} }
} }

View File

@ -283,7 +283,6 @@ class BlockedLog
} }
return '<i class="opacitymedium">'.$langs->trans('ImpossibleToReloadObject', $this->element, $this->fk_object).'</i>'; return '<i class="opacitymedium">'.$langs->trans('ImpossibleToReloadObject', $this->element, $this->fk_object).'</i>';
} }
/** /**
@ -676,7 +675,6 @@ class BlockedLog
$this->error=$this->db->error(); $this->error=$this->db->error();
return -1; return -1;
} }
} }
@ -716,8 +714,6 @@ class BlockedLog
if($res===false) return false; if($res===false) return false;
return true; return true;
} }
/** /**
@ -1060,5 +1056,4 @@ class BlockedLog
return $result; return $result;
} }
} }

View File

@ -226,7 +226,6 @@ class Bookmark extends CommonObject
$this->error=$this->db->lasterror(); $this->error=$this->db->lasterror();
return -1; return -1;
} }
} }
/** /**
@ -256,5 +255,4 @@ class Bookmark extends CommonObject
{ {
return ''; return '';
} }
} }

View File

@ -138,6 +138,5 @@ class Auth
return $ret; return $ret;
} }
} }

View File

@ -167,7 +167,6 @@ class Facturation
$_SESSION['poscart']=$newcartarray; $_SESSION['poscart']=$newcartarray;
$this->raz(); $this->raz();
} }
/** /**
@ -269,7 +268,6 @@ class Facturation
$this->prixTotalHt('RESET'); $this->prixTotalHt('RESET');
$this->montantTva('RESET'); $this->montantTva('RESET');
$this->prixTotalTtc('RESET'); $this->prixTotalTtc('RESET');
} }
@ -324,7 +322,6 @@ class Facturation
{ {
$this->ref = $aRef; $this->ref = $aRef;
} }
} }
/** /**
@ -348,7 +345,6 @@ class Facturation
{ {
$this->qte = $aQte; $this->qte = $aQte;
} }
} }
/** /**
@ -372,7 +368,6 @@ class Facturation
{ {
$this->stock = $aStock; $this->stock = $aStock;
} }
} }
/** /**
@ -396,7 +391,6 @@ class Facturation
{ {
$this->remise_percent = $aRemisePercent; $this->remise_percent = $aRemisePercent;
} }
} }
/** /**
@ -421,7 +415,6 @@ class Facturation
$this->montant_remise = $aMontantRemise; $this->montant_remise = $aMontantRemise;
} }
} }
/** /**
@ -446,7 +439,6 @@ class Facturation
$this->prix = $aPrix; $this->prix = $aPrix;
} }
} }
/** /**
@ -470,7 +462,6 @@ class Facturation
$this->tva = $aTva; $this->tva = $aTva;
} }
} }
/** /**
@ -518,7 +509,6 @@ class Facturation
$this->mode_reglement = $aModeReglement; $this->mode_reglement = $aModeReglement;
} }
} }
/** /**
@ -543,7 +533,6 @@ class Facturation
$this->montant_encaisse = $aMontantEncaisse; $this->montant_encaisse = $aMontantEncaisse;
} }
} }
/** /**
@ -567,7 +556,6 @@ class Facturation
$this->montant_rendu = $aMontantRendu; $this->montant_rendu = $aMontantRendu;
} }
} }
/** /**
@ -637,7 +625,6 @@ class Facturation
$this->montant_tva = $aMontantTva; $this->montant_tva = $aMontantTva;
} }
} }
/** /**
@ -661,5 +648,4 @@ class Facturation
$this->prix_total_ttc = $aTotalTtc; $this->prix_total_ttc = $aTotalTtc;
} }
} }
} }

View File

@ -437,7 +437,6 @@ class ActionComm extends CommonObject
$this->error=$this->db->lasterror(); $this->error=$this->db->lasterror();
return -1; return -1;
} }
} }
/** /**
@ -648,7 +647,6 @@ class ActionComm extends CommonObject
} }
return $num; return $num;
} }
/** /**
@ -1690,5 +1688,4 @@ class ActionComm extends CommonObject
return $error; return $error;
} }
} }

View File

@ -227,6 +227,5 @@ class ActionCommReminder extends CommonObject
{ {
$this->initAsSpecimenCommon(); $this->initAsSpecimenCommon();
} }
} }

View File

@ -293,7 +293,6 @@ class AgendaEvents extends DolibarrApi
'message' => 'Agenda Event deleted' 'message' => 'Agenda Event deleted'
) )
); );
} }
/** /**

View File

@ -225,5 +225,4 @@ class CActionComm
$transcode=$langs->trans("Action".$this->code); $transcode=$langs->trans("Action".$this->code);
if ($transcode != "Action".$this->code) return $transcode; if ($transcode != "Action".$this->code) return $transcode;
} }
} }

View File

@ -44,7 +44,6 @@ class ICal
*/ */
public function __construct() public function __construct()
{ {
} }
/** /**

View File

@ -970,6 +970,4 @@ class AdvanceTargetingMailing extends CommonObject
return $return_sql_criteria; return $return_sql_criteria;
} }
} }

View File

@ -93,7 +93,6 @@ class Mailing extends CommonObject
$this->statut_dest[1] = 'MailingStatusSent'; $this->statut_dest[1] = 'MailingStatusSent';
$this->statut_dest[2] = 'MailingStatusRead'; $this->statut_dest[2] = 'MailingStatusRead';
$this->statut_dest[3] = 'MailingStatusReadAndUnsubscribe'; // Read but ask to not be contacted anymore $this->statut_dest[3] = 'MailingStatusReadAndUnsubscribe'; // Read but ask to not be contacted anymore
} }
/** /**
@ -644,6 +643,5 @@ class Mailing extends CommonObject
if ($statut==3) return $langs->trans("MailingStatusNotContact").' '.img_picto($langs->trans("MailingStatusNotContact"),'statut3'); if ($statut==3) return $langs->trans("MailingStatusNotContact").' '.img_picto($langs->trans("MailingStatusNotContact"),'statut3');
} }
} }
} }

View File

@ -491,7 +491,6 @@ class Proposals extends DolibarrApi
'message' => 'Commercial Proposal deleted' 'message' => 'Commercial Proposal deleted'
) )
); );
} }
/** /**

View File

@ -4236,6 +4236,5 @@ class PropaleLigne extends CommonObjectLine
return -2; return -2;
} }
} }
} }

View File

@ -473,7 +473,6 @@ class Orders extends DolibarrApi
'message' => 'Order deleted' 'message' => 'Order deleted'
) )
); );
} }
/** /**

View File

@ -3411,7 +3411,6 @@ class Commande extends CommonOrder
if ($statut==self::STATUS_CLOSED && ($billed && empty($conf->global->WORKFLOW_BILL_ON_SHIPMENT))) return '<span class="hideonsmartphone">'.$langs->trans('StatusOrderProcessed').$billedtext.' </span>'.img_picto($langs->trans('StatusOrderProcessed').$billedtext,'statut6'); if ($statut==self::STATUS_CLOSED && ($billed && empty($conf->global->WORKFLOW_BILL_ON_SHIPMENT))) return '<span class="hideonsmartphone">'.$langs->trans('StatusOrderProcessed').$billedtext.' </span>'.img_picto($langs->trans('StatusOrderProcessed').$billedtext,'statut6');
if ($statut==self::STATUS_CLOSED && (! empty($conf->global->WORKFLOW_BILL_ON_SHIPMENT))) return '<span class="hideonsmartphone">'.$langs->trans('StatusOrderDelivered').' </span>'.img_picto($langs->trans('StatusOrderDelivered'),'statut6'); if ($statut==self::STATUS_CLOSED && (! empty($conf->global->WORKFLOW_BILL_ON_SHIPMENT))) return '<span class="hideonsmartphone">'.$langs->trans('StatusOrderDelivered').' </span>'.img_picto($langs->trans('StatusOrderDelivered'),'statut6');
} }
} }

View File

@ -222,6 +222,5 @@ class CommandeStats extends Stats
return $this->_getAllByProduct($sql); return $this->_getAllByProduct($sql);
} }
} }

View File

@ -1170,7 +1170,6 @@ class Account extends CommonObject
} }
return $solde; return $solde;
} }
/** /**
@ -1513,7 +1512,6 @@ class Account extends CommonObject
*/ */
function info($id) function info($id)
{ {
} }
/** /**
@ -1558,7 +1556,6 @@ class Account extends CommonObject
//Get the order the properties are shown //Get the order the properties are shown
return $fieldarray; return $fieldarray;
} }
/** /**
@ -1632,7 +1629,6 @@ class Account extends CommonObject
$this->owner_address = 'Owner address'; $this->owner_address = 'Owner address';
$this->country_id = 1; $this->country_id = 1;
} }
} }
@ -2315,5 +2311,4 @@ class AccountLine extends CommonObject
} }
return 0; return 0;
} }
} }

View File

@ -339,5 +339,4 @@ class BankCateg // extends CommonObject
$this->id = 0; $this->id = 0;
$this->label = ''; $this->label = '';
} }
} }

View File

@ -599,5 +599,4 @@ class PaymentVarious extends CommonObject
dol_print_error($this->db); dol_print_error($this->db);
} }
} }
} }

View File

@ -154,7 +154,6 @@ class Deplacement extends CommonObject
$this->db->rollback(); $this->db->rollback();
return -1; return -1;
} }
} }
/** /**
@ -453,6 +452,5 @@ class Deplacement extends CommonObject
dol_print_error($this->db); dol_print_error($this->db);
} }
} }
} }

View File

@ -1259,5 +1259,4 @@ class Invoices extends DolibarrApi
} }
return $invoice; return $invoice;
} }
} }

View File

@ -1858,7 +1858,5 @@ class FactureLigneRec extends CommonInvoiceLine
$this->db->rollback(); $this->db->rollback();
return -2; return -2;
} }
} }
} }

View File

@ -1551,7 +1551,6 @@ class Facture extends CommonInvoice
} }
} }
} }
} }
/** /**

View File

@ -224,7 +224,5 @@ class FactureStats extends Stats
return $this->_getAllByProduct($sql); return $this->_getAllByProduct($sql);
} }
} }

View File

@ -482,5 +482,4 @@ class PaymentTerm // extends CommonObject
$this->nbjour=''; $this->nbjour='';
$this->decalage=''; $this->decalage='';
} }
} }

View File

@ -648,5 +648,4 @@ class Localtax extends CommonObject
return ''; return '';
} }
} }

View File

@ -1100,5 +1100,4 @@ class RemiseCheque extends CommonObject
} }
return $langs->trans('Unknown'); return $langs->trans('Unknown');
} }
} }

View File

@ -369,8 +369,5 @@ class Cpaiement
$this->active = ''; $this->active = '';
$this->accountancy_code = ''; $this->accountancy_code = '';
$this->module = ''; $this->module = '';
} }
} }

View File

@ -164,7 +164,6 @@ class BonPrelevement extends CommonObject
} }
return $result; return $result;
} }
/** /**
@ -1457,7 +1456,6 @@ class BonPrelevement extends CommonObject
if (! empty($conf->global->MAIN_UMASK)) if (! empty($conf->global->MAIN_UMASK))
@chmod($this->file, octdec($conf->global->MAIN_UMASK)); @chmod($this->file, octdec($conf->global->MAIN_UMASK));
return $result; return $result;
} }
@ -1687,7 +1685,6 @@ class BonPrelevement extends CommonObject
fputs($this->file, substr(" ",0,5)); fputs($this->file, substr(" ",0,5));
fputs($this->file, "\n"); fputs($this->file, "\n");
} }
/** /**
@ -1940,6 +1937,5 @@ class BonPrelevement extends CommonObject
if ($statut==2) return $this->labelstatut[$statut].' '.img_picto($this->labelstatut[$statut],'statut6'); if ($statut==2) return $this->labelstatut[$statut].' '.img_picto($this->labelstatut[$statut],'statut6');
} }
} }
} }

View File

@ -69,7 +69,6 @@ class RejetPrelevement
$this->facturer[0]=$langs->trans("NoInvoiceRefused"); $this->facturer[0]=$langs->trans("NoInvoiceRefused");
$this->facturer[1]=$langs->trans("InvoiceRefused"); $this->facturer[1]=$langs->trans("InvoiceRefused");
} }
/** /**
@ -198,7 +197,6 @@ class RejetPrelevement
dol_syslog("RejetPrelevement::Create Rollback"); dol_syslog("RejetPrelevement::Create Rollback");
$this->db->rollback(); $this->db->rollback();
} }
} }
/** /**
@ -327,7 +325,6 @@ class RejetPrelevement
} }
return $arr; return $arr;
} }
/** /**
@ -371,6 +368,5 @@ class RejetPrelevement
return -2; return -2;
} }
} }
} }

View File

@ -627,5 +627,4 @@ class PaymentSalary extends CommonObject
}*/ }*/
return ''; return '';
} }
} }

View File

@ -523,8 +523,5 @@ class Cchargesociales
$this->fk_pays = ''; $this->fk_pays = '';
$this->module = ''; $this->module = '';
$this->accountancy_code = ''; $this->accountancy_code = '';
} }
} }

View File

@ -289,7 +289,6 @@ class ChargeSociales extends CommonObject
$this->db->rollback(); $this->db->rollback();
return -1; return -1;
} }
} }

View File

@ -501,8 +501,6 @@ class PaymentSocialContribution extends CommonObject
$this->fk_bank=''; $this->fk_bank='';
$this->fk_user_creat=''; $this->fk_user_creat='';
$this->fk_user_modif=''; $this->fk_user_modif='';
} }

View File

@ -316,6 +316,5 @@ abstract class ActionsContactCardCommon
$this->object->country = $langs->trans("Country".$obj->code)?$langs->trans("Country".$obj->code):$obj->label; $this->object->country = $langs->trans("Country".$obj->code)?$langs->trans("Country".$obj->code):$obj->label;
} }
} }
} }

View File

@ -116,7 +116,6 @@ class ActionsContactCardDefault extends ActionsContactCardCommon
{ {
$this->LoadListDatas($limit, $offset, $sortfield, $sortorder); $this->LoadListDatas($limit, $offset, $sortfield, $sortorder);
} }
} }

View File

@ -537,7 +537,6 @@ class Contracts extends DolibarrApi
'message' => 'Contract deleted' 'message' => 'Contract deleted'
) )
); );
} }
/** /**

View File

@ -45,22 +45,22 @@ class Contrat extends CommonObject
* @var string ID to identify managed object * @var string ID to identify managed object
*/ */
public $element='contrat'; public $element='contrat';
/** /**
* @var string Name of table without prefix where object is stored * @var string Name of table without prefix where object is stored
*/ */
public $table_element='contrat'; public $table_element='contrat';
public $table_element_line='contratdet'; public $table_element_line='contratdet';
public $fk_element='fk_contrat'; public $fk_element='fk_contrat';
public $picto='contract'; public $picto='contract';
/** /**
* 0=No test on entity, 1=Test with field entity, 2=Test with link by societe * 0=No test on entity, 1=Test with field entity, 2=Test with link by societe
* @var int * @var int
*/ */
public $ismultientitymanaged = 1; public $ismultientitymanaged = 1;
/** /**
* 0=Default, 1=View may be restricted to sales representative only if no permission to see all or to company of external user if external user * 0=Default, 1=View may be restricted to sales representative only if no permission to see all or to company of external user if external user
* @var integer * @var integer
@ -520,7 +520,6 @@ class Contrat extends CommonObject
$this->db->rollback(); $this->db->rollback();
return -1; return -1;
} }
} }
/** /**
@ -699,7 +698,6 @@ class Contrat extends CommonObject
$this->error=$this->db->error(); $this->error=$this->db->error();
return -1; return -1;
} }
} }
/** /**
@ -2465,7 +2463,7 @@ class ContratLigne extends CommonObjectLine
* @var string ID to identify managed object * @var string ID to identify managed object
*/ */
public $element='contratdet'; public $element='contratdet';
/** /**
* @var string Name of table without prefix where object is stored * @var string Name of table without prefix where object is stored
*/ */
@ -2475,7 +2473,7 @@ class ContratLigne extends CommonObjectLine
* @var int ID * @var int ID
*/ */
public $id; public $id;
var $ref; var $ref;
var $tms; var $tms;

View File

@ -260,6 +260,5 @@ class box_actions extends ModeleBoxes
return ''; return '';
} }
} }

View File

@ -161,6 +161,5 @@ class box_bookmarks extends ModeleBoxes
{ {
return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput); return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput);
} }
} }

View File

@ -163,7 +163,6 @@ class box_clients extends ModeleBoxes
'text' => $langs->trans("ReadPermissionNotAllowed") 'text' => $langs->trans("ReadPermissionNotAllowed")
); );
} }
} }
/** /**
@ -178,6 +177,5 @@ class box_clients extends ModeleBoxes
{ {
return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput); return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput);
} }
} }

View File

@ -202,6 +202,5 @@ class box_commandes extends ModeleBoxes
{ {
return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput); return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput);
} }
} }

View File

@ -174,7 +174,6 @@ class box_comptes extends ModeleBoxes
'text' => $langs->trans("ReadPermissionNotAllowed") 'text' => $langs->trans("ReadPermissionNotAllowed")
); );
} }
} }
/** /**
@ -189,6 +188,5 @@ class box_comptes extends ModeleBoxes
{ {
return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput); return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput);
} }
} }

View File

@ -189,6 +189,5 @@ class box_contacts extends ModeleBoxes
{ {
return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput); return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput);
} }
} }

View File

@ -185,6 +185,5 @@ class box_contracts extends ModeleBoxes
{ {
return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput); return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput);
} }
} }

View File

@ -198,6 +198,5 @@ class box_external_rss extends ModeleBoxes
{ {
return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput); return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput);
} }
} }

View File

@ -206,5 +206,4 @@ class box_factures extends ModeleBoxes
{ {
return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput); return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput);
} }
} }

View File

@ -218,6 +218,5 @@ class box_factures_fourn extends ModeleBoxes
{ {
return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput); return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput);
} }
} }

View File

@ -191,7 +191,6 @@ class box_factures_fourn_imp extends ModeleBoxes
'text' => $langs->trans("ReadPermissionNotAllowed") 'text' => $langs->trans("ReadPermissionNotAllowed")
); );
} }
} }
/** /**
@ -206,6 +205,5 @@ class box_factures_fourn_imp extends ModeleBoxes
{ {
return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput); return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput);
} }
} }

View File

@ -209,5 +209,4 @@ class box_factures_imp extends ModeleBoxes
{ {
return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput); return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput);
} }
} }

View File

@ -170,6 +170,5 @@ class box_ficheinter extends ModeleBoxes
{ {
return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput); return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput);
} }
} }

View File

@ -150,7 +150,6 @@ class box_fournisseurs extends ModeleBoxes
'text' => $langs->trans("ReadPermissionNotAllowed") 'text' => $langs->trans("ReadPermissionNotAllowed")
); );
} }
} }
/** /**
@ -165,6 +164,5 @@ class box_fournisseurs extends ModeleBoxes
{ {
return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput); return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput);
} }
} }

View File

@ -159,7 +159,6 @@ class box_goodcustomers extends ModeleBoxes
'text' => $langs->trans("ReadPermissionNotAllowed") 'text' => $langs->trans("ReadPermissionNotAllowed")
); );
} }
} }
/** /**

View File

@ -280,6 +280,5 @@ class box_graph_invoices_permonth extends ModeleBoxes
{ {
return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput); return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput);
} }
} }

View File

@ -279,6 +279,5 @@ class box_graph_invoices_supplier_permonth extends ModeleBoxes
{ {
return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput); return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput);
} }
} }

View File

@ -278,6 +278,5 @@ class box_graph_orders_permonth extends ModeleBoxes
{ {
return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput); return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput);
} }
} }

View File

@ -277,6 +277,5 @@ class box_graph_orders_supplier_permonth extends ModeleBoxes
{ {
return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput); return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput);
} }
} }

View File

@ -401,7 +401,6 @@ class box_graph_product_distribution extends ModeleBoxes
'text' => $mesg 'text' => $mesg
); );
} }
} }
/** /**
@ -416,6 +415,5 @@ class box_graph_product_distribution extends ModeleBoxes
{ {
return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput); return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput);
} }
} }

View File

@ -281,6 +281,5 @@ class box_graph_propales_permonth extends ModeleBoxes
{ {
return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput); return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput);
} }
} }

View File

@ -98,7 +98,6 @@ class box_lastlogin extends ModeleBoxes
'td' => '', 'td' => '',
'text' => $tmp, 'text' => $tmp,
); );
} }

View File

@ -168,7 +168,6 @@ class box_members extends ModeleBoxes
'text' => $langs->trans("ReadPermissionNotAllowed") 'text' => $langs->trans("ReadPermissionNotAllowed")
); );
} }
} }
/** /**
@ -183,6 +182,5 @@ class box_members extends ModeleBoxes
{ {
return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput); return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput);
} }
} }

View File

@ -230,6 +230,5 @@ class box_produits extends ModeleBoxes
{ {
return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput); return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput);
} }
} }

View File

@ -242,6 +242,5 @@ class box_produits_alerte_stock extends ModeleBoxes
{ {
return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput); return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput);
} }
} }

View File

@ -184,7 +184,6 @@ class box_project extends ModeleBoxes
'td' => '', 'td' => '',
'text' => "&nbsp;", 'text' => "&nbsp;",
); );
} }
/** /**

View File

@ -192,6 +192,5 @@ class box_propales extends ModeleBoxes
{ {
return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput); return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput);
} }
} }

View File

@ -180,6 +180,5 @@ class box_prospect extends ModeleBoxes
{ {
return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput); return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput);
} }
} }

View File

@ -222,7 +222,6 @@ class box_services_contracts extends ModeleBoxes
'text' => $langs->trans("ReadPermissionNotAllowed") 'text' => $langs->trans("ReadPermissionNotAllowed")
); );
} }
} }
/** /**
@ -237,6 +236,5 @@ class box_services_contracts extends ModeleBoxes
{ {
return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput); return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput);
} }
} }

View File

@ -184,6 +184,5 @@ class box_services_expired extends ModeleBoxes
{ {
return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput); return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput);
} }
}
}

View File

@ -188,6 +188,5 @@ class box_supplier_orders extends ModeleBoxes
{ {
return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput); return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput);
} }
} }

View File

@ -137,7 +137,6 @@ class box_task extends ModeleBoxes
$this->info_box_contents[$i][] = array('td' => 'align="right" ', 'text' => ConvertSecondToTime($totalplannedtot,'all',25200,5)); $this->info_box_contents[$i][] = array('td' => 'align="right" ', 'text' => ConvertSecondToTime($totalplannedtot,'all',25200,5));
$this->info_box_contents[$i][] = array('td' => 'align="right" ', 'text' => ConvertSecondToTime($totaldurationtot,'all',25200,5)); $this->info_box_contents[$i][] = array('td' => 'align="right" ', 'text' => ConvertSecondToTime($totaldurationtot,'all',25200,5));
$this->info_box_contents[$i][] = array('td' => '', 'text' => ""); $this->info_box_contents[$i][] = array('td' => '', 'text' => "");
} }
/** /**

View File

@ -31,7 +31,7 @@
* *
* Boxes parent class * Boxes parent class
*/ */
class ModeleBoxes // Can't be abtract as it is instantiated to build "empty" boxes class ModeleBoxes // Can't be abtract as it is instantiated to build "empty" boxes
{ {
/** /**
* @var DoliDB Database handler * @var DoliDB Database handler
@ -503,8 +503,6 @@ class ModeleBoxes // Can't be abtract as it is instantiated to build "empty"
} }
return $widget; return $widget;
} }
} }

View File

@ -471,7 +471,6 @@ class CMailFile
// -------------------------------------- // --------------------------------------
$this->error = 'Bad value for sendmode'; $this->error = 'Bad value for sendmode';
} }
} }

View File

@ -244,6 +244,5 @@ class CSMSFile
@chmod($outputfile, octdec($conf->global->MAIN_UMASK)); @chmod($outputfile, octdec($conf->global->MAIN_UMASK));
} }
} }
} }

View File

@ -179,6 +179,5 @@ class AntiVir
return $ret; return $ret;
} }
} }

View File

@ -208,5 +208,4 @@ class Canvas
return $ret; return $ret;
} }
} }
} }

View File

@ -333,5 +333,4 @@ class Ccountry // extends CommonObject
return 1; return 1;
} }
} }
} }

View File

@ -767,7 +767,6 @@ abstract class CommonDocGenerator
} }
return $array_to_fill; return $array_to_fill;
} }

View File

@ -1063,7 +1063,6 @@ abstract class CommonObject
dol_print_error($this->db); dol_print_error($this->db);
return -1; return -1;
} }
} }
/** /**
@ -2026,7 +2025,6 @@ abstract class CommonObject
$this->db->commit(); $this->db->commit();
return 1; return 1;
} }
} }
@ -4622,7 +4620,6 @@ abstract class CommonObject
if (isset($conf->global->$keyforfieldname)) return $conf->global->$keyforfieldname; if (isset($conf->global->$keyforfieldname)) return $conf->global->$keyforfieldname;
// TODO Ad here a scan into table llx_overwrite_default with a filter on $this->element and $fieldname // TODO Ad here a scan into table llx_overwrite_default with a filter on $this->element and $fieldname
} }
@ -7243,5 +7240,4 @@ abstract class CommonObject
{ {
return count($this->comments); return count($this->comments);
} }
} }

View File

@ -144,6 +144,5 @@ abstract class CommonOrderLine extends CommonObjectLine
public $info_bits = 0; public $info_bits = 0;
public $special_code = 0; public $special_code = 0;
} }

View File

@ -266,5 +266,4 @@ abstract class CommonStickerGenerator
$this->_Height = $this->_Convert_Metric($format['height'], $this->_Metric, $this->_Metric_Doc); $this->_Height = $this->_Convert_Metric($format['height'], $this->_Metric, $this->_Metric_Doc);
$this->Set_Char_Size($pdf, $format['font-size']); $this->Set_Char_Size($pdf, $format['font-size']);
} }
} }

View File

@ -666,7 +666,6 @@ class Conf
$this->loghandlers[$handler] = $loghandlerinstance; $this->loghandlers[$handler] = $loghandlerinstance;
} }
} }
} }
} }

View File

@ -75,7 +75,6 @@ class CoreObject extends CommonObject
{ {
return false; return false;
} }
} }
/** /**
@ -271,7 +270,6 @@ class CoreObject extends CommonObject
$this->db->rollback(); $this->db->rollback();
return -1; return -1;
} }
} }
/** /**
@ -437,5 +435,4 @@ class CoreObject extends CommonObject
return 1; return 1;
} }
} }

View File

@ -317,5 +317,4 @@ class Cstate // extends CommonObject
return 1; return 1;
} }
} }
} }

View File

@ -333,5 +333,4 @@ class Ctypent // extends CommonObject
return 1; return 1;
} }
} }
} }

View File

@ -463,7 +463,6 @@ class Ctyperesource
$this->label = ''; $this->label = '';
$this->active = ''; $this->active = '';
} }
} }
/** /**
@ -486,5 +485,4 @@ class CtyperesourceLine
/** /**
* @var mixed Sample line property 2 * @var mixed Sample line property 2
*/ */
} }

Some files were not shown because too many files have changed in this diff Show More