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

move phpcs:ignore

Browse Source
This commit is contained in:
Frédéric FRANCE 2018-09-03 19:00:37 +02:00
parent e4946cc8eb
commit 5f4a922c1d
No known key found for this signature in database
GPG Key ID: 06809324E4B2ABC1
6 changed files with 66 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -217,6 +217,7 @@ class pdf_crabe extends ModelePDFFactures
}
// phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
/**
* Function to build pdf onto disk
*
@ -228,9 +229,9 @@ class pdf_crabe extends ModelePDFFactures
* @param int $hideref Do not show ref
* @return int 1=OK, 0=KO
*/
// phpcs:ignore PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
function write_file($object,$outputlangs,$srctemplatepath='',$hidedetails=0,$hidedesc=0,$hideref=0)
{
// phpcs:enable
global $user,$langs,$conf,$mysoc,$db,$hookmanager,$nblignes;
if (! is_object($outputlangs)) $outputlangs=$langs;
@ -774,6 +775,7 @@ class pdf_crabe extends ModelePDFFactures
}
// phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
/**
* Show payments table
*
@ -783,9 +785,9 @@ class pdf_crabe extends ModelePDFFactures
* @param Translate $outputlangs Object langs for output
* @return int <0 if KO, >0 if OK
*/
// phpcs:ignore PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
function _tableau_versements(&$pdf, $object, $posy, $outputlangs)
{
// phpcs:enable
global $conf;
$sign=1;
@ -915,6 +917,7 @@ class pdf_crabe extends ModelePDFFactures
}
// phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
/**
* Show miscellaneous information (payment mode, payment term, ...)
*
@ -924,9 +927,9 @@ class pdf_crabe extends ModelePDFFactures
* @param Translate $outputlangs Langs object
* @return void
*/
// phpcs:ignore PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
function _tableau_info(&$pdf, $object, $posy, $outputlangs)
{
// phpcs:enable
global $conf;
$default_font_size = pdf_getPDFFontSize($outputlangs);
@ -1073,6 +1076,7 @@ class pdf_crabe extends ModelePDFFactures
}
// phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
/**
* Show total to pay
*
@ -1083,9 +1087,9 @@ class pdf_crabe extends ModelePDFFactures
* @param Translate $outputlangs Objet langs
* @return int Position pour suite
*/
// phpcs:ignore PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
function _tableau_tot(&$pdf, $object, $deja_regle, $posy, $outputlangs)
{
// phpcs:enable
global $conf,$mysoc;
$sign=1;

5
htdocs/core/modules/project/doc/pdf_baleine.modules.php
View File

@ -165,16 +165,17 @@ class pdf_baleine extends ModelePDFProjects
}
// phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
/**
* Fonction generant le projet sur le disque
* Fonction generant le projet sur le disque
*
* @param Project $object Object project a generer
* @param Translate $outputlangs Lang output object
* @return int 1 if OK, <=0 if KO
*/
// phpcs:ignore PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
function write_file($object,$outputlangs)
{
// phpcs:enable
global $conf, $hookmanager, $langs, $user;
if (! is_object($outputlangs)) $outputlangs=$langs;

32
htdocs/fourn/class/fournisseur.commande.class.php
View File

@ -336,15 +336,16 @@ class CommandeFournisseur extends CommonOrder
}
}
// phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
/**
* Load array lines
*
* @param int $only_product Return only physical products
* @return int <0 if KO, >0 if OK
*/
// phpcs:ignore PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
function fetch_lines($only_product=0)
{
// phpcs:enable
//$result=$this->fetch_lines();
$this->lines=array();
@ -576,6 +577,7 @@ class CommandeFournisseur extends CommonOrder
return $this->LibStatut($this->statut,$mode,$this->billed);
}
// phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
/**
* Return label of a status
*
@ -584,9 +586,9 @@ class CommandeFournisseur extends CommonOrder
* @param int $billed 1=Billed
* @return string Label of status
*/
// phpcs:ignore PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
function LibStatut($statut,$mode=0,$billed=0)
{
// phpcs:enable
global $conf, $langs;
if (empty($this->statuts) || empty($this->statutshort))
@ -1039,6 +1041,7 @@ class CommandeFournisseur extends CommonOrder
return $result ;
}
// phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
/**
* Cancel an approved order.
* The cancellation is done after approval
@ -1047,9 +1050,9 @@ class CommandeFournisseur extends CommonOrder
* @param int $idwarehouse Id warehouse to use for stock change (not used for supplier orders).
* @return int >0 if Ok, <0 if Ko
*/
// phpcs:ignore PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
function Cancel($user, $idwarehouse=-1)
{
// phpcs:enable
global $langs,$conf;
$error=0;
@ -1101,6 +1104,7 @@ class CommandeFournisseur extends CommonOrder
}
// phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
/**
* Submit a supplier order to supplier
*
@ -1110,9 +1114,9 @@ class CommandeFournisseur extends CommonOrder
* @param string $comment Comment
* @return int <0 if KO, >0 if OK
*/
// phpcs:ignore PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
public function commande($user, $date, $methode, $comment='')
{
// phpcs:enable
global $langs;
dol_syslog(get_class($this)."::commande");
$error = 0;
@ -1960,14 +1964,15 @@ class CommandeFournisseur extends CommonOrder
}
}
// phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
/**
* Get list of order methods
*
* @return 0 if Ok, <0 if Ko
*/
// phpcs:ignore PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
function get_methodes_commande()
{
// phpcs:enable
$sql = "SELECT rowid, libelle";
$sql.= " FROM ".MAIN_DB_PREFIX."c_input_method";
$sql.= " WHERE active = 1";
@ -2046,6 +2051,7 @@ class CommandeFournisseur extends CommonOrder
}
// phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
/**
* Set a delivery in database for this supplier order
*
@ -2055,9 +2061,9 @@ class CommandeFournisseur extends CommonOrder
* @param string $comment Comment
* @return int <0 if KO, >0 if OK
*/
// phpcs:ignore PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
function Livraison($user, $date, $type, $comment)
{
// phpcs:enable
global $conf, $langs;
$result = 0;
@ -2163,7 +2169,8 @@ class CommandeFournisseur extends CommonOrder
return $result ;
}
/**
// phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
/**
* Set the planned delivery date
*
* @param User $user Objet user making change
@ -2171,9 +2178,9 @@ class CommandeFournisseur extends CommonOrder
* @param int $notrigger 1=Does not execute triggers, 0= execute triggers
* @return int <0 if KO, >0 if OK
*/
// phpcs:ignore PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
function set_date_livraison($user, $date_livraison, $notrigger=0)
{
// phpcs:enable
if ($user->rights->fournisseur->commande->creer)
{
$error=0;
@ -2228,6 +2235,7 @@ class CommandeFournisseur extends CommonOrder
}
}
// phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
/**
* Set the id projet
*
@ -2236,9 +2244,9 @@ class CommandeFournisseur extends CommonOrder
* @param int $notrigger 1=Does not execute triggers, 0= execute triggers
* @return int <0 si ko, >0 si ok
*/
// phpcs:ignore PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
function set_id_projet($user, $id_projet, $notrigger=0)
{
// phpcs:enable
if ($user->rights->fournisseur->commande->creer)
{
$error=0;
@ -2688,14 +2696,15 @@ class CommandeFournisseur extends CommonOrder
}
}
// phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
/**
* Charge indicateurs this->nb de tableau de bord
*
* @return int <0 si ko, >0 si ok
*/
// phpcs:ignore PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
function load_state_board()
{
// phpcs:enable
global $conf, $user;
$this->nb=array();
@ -2730,15 +2739,16 @@ class CommandeFournisseur extends CommonOrder
}
}
// phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
/**
* Load indicators for dashboard (this->nbtodo and this->nbtodolate)
*
* @param User $user Objet user
* @return WorkboardResponse|int <0 if KO, WorkboardResponse if OK
*/
// phpcs:ignore PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
function load_board($user)
{
// phpcs:enable
global $conf, $langs;
$clause = " WHERE";

13
htdocs/fourn/class/fournisseur.commande.dispatch.class.php
View File

@ -479,6 +479,7 @@ class CommandeFournisseurDispatch extends CommonObject
return $this->LibStatut($this->status,$mode);
}
// phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
/**
* Return label of a status
*
@ -486,9 +487,9 @@ class CommandeFournisseurDispatch extends CommonObject
* @param int $mode 0=Long label, 1=Short label, 2=Picto + Short label, 3=Picto, 4=Picto + Long label, 5=Short label + Picto
* @return string Label of status
*/
// phpcs:ignore PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
function LibStatut($statut,$mode=0)
{
// phpcs:enable
global $langs;
$langs->load('orders');
@ -496,27 +497,27 @@ class CommandeFournisseurDispatch extends CommonObject
{
return $langs->trans($this->statuts[$statut]);
}
if ($mode == 1)
elseif ($mode == 1)
{
return $langs->trans($this->statutshort[$statut]);
}
if ($mode == 2)
elseif ($mode == 2)
{
return $langs->trans($this->statuts[$statut]);
}
if ($mode == 3)
elseif ($mode == 3)
{
if ($statut==0) return img_picto($langs->trans($this->statuts[$statut]),'statut0');
if ($statut==1) return img_picto($langs->trans($this->statuts[$statut]),'statut4');
if ($statut==2) return img_picto($langs->trans($this->statuts[$statut]),'statut8');
}
if ($mode == 4)
elseif ($mode == 4)
{
if ($statut==0) return img_picto($langs->trans($this->statuts[$statut]),'statut0').' '.$langs->trans($this->statuts[$statut]);
if ($statut==1) return img_picto($langs->trans($this->statuts[$statut]),'statut4').' '.$langs->trans($this->statuts[$statut]);
if ($statut==2) return img_picto($langs->trans($this->statuts[$statut]),'statut8').' '.$langs->trans($this->statuts[$statut]);
}
if ($mode == 5)
elseif ($mode == 5)
{
if ($statut==0) return '<span class="hideonsmartphone">'.$langs->trans($this->statutshort[$statut]).' </span>'.img_picto($langs->trans($this->statuts[$statut]),'statut0');
if ($statut==1) return '<span class="hideonsmartphone">'.$langs->trans($this->statutshort[$statut]).' </span>'.img_picto($langs->trans($this->statuts[$statut]),'statut4');

10
htdocs/fourn/class/paiementfourn.class.php
View File

@ -39,12 +39,12 @@ class PaiementFourn extends Paiement
* @var string ID to identify managed object
*/
public $element='payment_supplier';
/**
* @var string Name of table without prefix where object is stored
*/
public $table_element='paiementfourn';
public $picto = 'payment';
var $statut; //Status of payment. 0 = unvalidated; 1 = validated
@ -505,6 +505,7 @@ class PaiementFourn extends Paiement
return $this->LibStatut($this->statut,$mode);
}
// phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
/**
* Renvoi le libelle d'un statut donne
*
@ -512,9 +513,9 @@ class PaiementFourn extends Paiement
* @param int $mode 0=libelle long, 1=libelle court, 2=Picto + Libelle court, 3=Picto, 4=Picto + Libelle long, 5=Libelle court + Picto
* @return string Libelle du statut
*/
// phpcs:ignore PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
function LibStatut($status,$mode=0)
{
// phpcs:enable
global $langs;
$langs->load('compta');
@ -770,15 +771,16 @@ class PaiementFourn extends Paiement
}
// phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
/**
* Load the third party of object, from id into this->thirdparty
*
* @param int $force_thirdparty_id Force thirdparty id
* @return int <0 if KO, >0 if OK
*/
// phpcs:ignore PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
function fetch_thirdparty($force_thirdparty_id=0)
{
// phpcs:enable
require_once DOL_DOCUMENT_ROOT . '/fourn/class/fournisseur.facture.class.php';
if (empty($force_thirdparty_id))

35
htdocs/projet/class/project.class.php
View File

@ -476,15 +476,16 @@ class Project extends CommonObject
}
}
// phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
/**
* Return list of projects
*
* @param int $socid To filter on a particular third party
* @return array List of projects
*/
// phpcs:ignore PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
function liste_array($socid='')
{
// phpcs:enable
global $conf;
$projects = array();
@ -518,6 +519,7 @@ class Project extends CommonObject
}
}
// phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
/**
* Return list of elements for type, linked to a project
*
@ -529,9 +531,9 @@ class Project extends CommonObject
* @param string $projectkey Equivalent key to fk_projet for actual type
* @return mixed Array list of object ids linked to project, < 0 or string if error
*/
// phpcs:ignore PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
function get_element_list($type, $tablename, $datefieldname='', $dates='', $datee='', $projectkey='fk_projet')
{
// phpcs:enable
$elements = array();
if ($this->id <= 0) return $elements;
@ -907,6 +909,7 @@ class Project extends CommonObject
return $this->LibStatut($this->statut, $mode);
}
// phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
/**
* Renvoi status label for a status
*
@ -914,9 +917,9 @@ class Project extends CommonObject
* @param int $mode 0=long label, 1=short label, 2=Picto + short label, 3=Picto, 4=Picto + long label, 5=Short label + Picto
* @return string Label
*/
// phpcs:ignore PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
function LibStatut($statut, $mode=0)
{
// phpcs:enable
global $langs;
if ($mode == 0)
@ -1580,16 +1583,17 @@ class Project extends CommonObject
}
/**
* Associate element to a project
*
* @param string $tableName Table of the element to update
* @param int $elementSelectId Key-rowid of the line of the element to update
* @return int 1 if OK or < 0 if KO
*/
// phpcs:ignore PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
// phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
/**
* Associate element to a project
*
* @param string $tableName Table of the element to update
* @param int $elementSelectId Key-rowid of the line of the element to update
* @return int 1 if OK or < 0 if KO
*/
function update_element($tableName, $elementSelectId)
{
// phpcs:enable
$sql="UPDATE ".MAIN_DB_PREFIX.$tableName;
if ($tableName == "actioncomm")
@ -1613,6 +1617,7 @@ class Project extends CommonObject
}
}
// phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
/**
* Associate element to a project
*
@ -1620,9 +1625,9 @@ class Project extends CommonObject
* @param int $elementSelectId Key-rowid of the line of the element to update
* @return int 1 if OK or < 0 if KO
*/
// phpcs:ignore PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
function remove_element($tableName, $elementSelectId)
{
// phpcs:enable
$sql="UPDATE ".MAIN_DB_PREFIX.$tableName;
if ($TableName=="actioncomm")
@ -1744,15 +1749,16 @@ class Project extends CommonObject
}
// phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
/**
* Load indicators for dashboard (this->nbtodo and this->nbtodolate)
*
* @param User $user Objet user
* @return WorkboardResponse|int <0 if KO, WorkboardResponse if OK
*/
// phpcs:ignore PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
function load_board($user)
{
// phpcs:enable
global $conf, $langs;
// For external user, no check is done on company because readability is managed by public status of project and assignement.
@ -1829,14 +1835,15 @@ class Project extends CommonObject
}
// phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
/**
* Charge indicateurs this->nb pour le tableau de bord
*
* @return int <0 if KO, >0 if OK
*/
// phpcs:ignore PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
function load_state_board()
{
// phpcs:enable
global $user;
$this->nb=array();