move phpcs:ignore

This commit is contained in:
Frédéric FRANCE 2018-09-04 20:00:09 +02:00
parent bdcac95761
commit fd6281b364
No known key found for this signature in database
GPG Key ID: 06809324E4B2ABC1
14 changed files with 79 additions and 55 deletions

View File

@ -250,6 +250,7 @@ class Fiscalyear extends CommonObject
return $this->LibStatut($this->statut,$mode);
}
// phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
/**
* Give a label from a status
*
@ -257,38 +258,38 @@ class Fiscalyear 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)
{
return $langs->trans($this->statuts[$statut]);
}
if ($mode == 1)
elseif ($mode == 1)
{
return $langs->trans($this->statuts_short[$statut]);
}
if ($mode == 2)
elseif ($mode == 2)
{
if ($statut==0) return img_picto($langs->trans($this->statuts_short[$statut]),'statut4').' '.$langs->trans($this->statuts_short[$statut]);
if ($statut==1) return img_picto($langs->trans($this->statuts_short[$statut]),'statut8').' '.$langs->trans($this->statuts_short[$statut]);
elseif ($statut==1) return img_picto($langs->trans($this->statuts_short[$statut]),'statut8').' '.$langs->trans($this->statuts_short[$statut]);
}
if ($mode == 3)
elseif ($mode == 3)
{
if ($statut==0 && ! empty($this->statuts_short[$statut])) return img_picto($langs->trans($this->statuts_short[$statut]),'statut4');
if ($statut==1 && ! empty($this->statuts_short[$statut])) return img_picto($langs->trans($this->statuts_short[$statut]),'statut8');
elseif ($statut==1 && ! empty($this->statuts_short[$statut])) return img_picto($langs->trans($this->statuts_short[$statut]),'statut8');
}
if ($mode == 4)
elseif ($mode == 4)
{
if ($statut==0 && ! empty($this->statuts_short[$statut])) return img_picto($langs->trans($this->statuts_short[$statut]),'statut4').' '.$langs->trans($this->statuts[$statut]);
if ($statut==1 && ! empty($this->statuts_short[$statut])) return img_picto($langs->trans($this->statuts_short[$statut]),'statut8').' '.$langs->trans($this->statuts[$statut]);
elseif ($statut==1 && ! empty($this->statuts_short[$statut])) return img_picto($langs->trans($this->statuts_short[$statut]),'statut8').' '.$langs->trans($this->statuts[$statut]);
}
if ($mode == 5)
elseif ($mode == 5)
{
if ($statut==0 && ! empty($this->statuts_short[$statut])) return $langs->trans($this->statuts_short[$statut]).' '.img_picto($langs->trans($this->statuts_short[$statut]),'statut4');
if ($statut==1 && ! empty($this->statuts_short[$statut])) return $langs->trans($this->statuts_short[$statut]).' '.img_picto($langs->trans($this->statuts_short[$statut]),'statut6');
elseif ($statut==1 && ! empty($this->statuts_short[$statut])) return $langs->trans($this->statuts_short[$statut]).' '.img_picto($langs->trans($this->statuts_short[$statut]),'statut6');
}
}

View File

@ -37,6 +37,7 @@ abstract class ModeleBankAccountDoc extends CommonDocGenerator
public $error='';
// phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
/**
* Return list of active generation modules
*
@ -44,9 +45,9 @@ abstract class ModeleBankAccountDoc extends CommonDocGenerator
* @param integer $maxfilenamelength Max length of value to show
* @return array List of templates
*/
// phpcs:ignore PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
static function liste_modeles($db, $maxfilenamelength=0)
{
// phpcs:enable
global $conf;
$type = 'bankaccount';

View File

@ -29,6 +29,7 @@ abstract class ModeleExpenseReport extends CommonDocGenerator
public $error='';
// phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
/**
* Return list of active generation modules
*
@ -36,9 +37,9 @@ abstract class ModeleExpenseReport extends CommonDocGenerator
* @param integer $maxfilenamelength Max length of value to show
* @return array List of templates
*/
// phpcs:ignore PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
static function liste_modeles($db,$maxfilenamelength=0)
{
// phpcs:enable
global $conf;
$type='expensereport';

View File

@ -37,12 +37,12 @@ class ExportExcel2007 extends ExportExcel
* @var int ID
*/
public $id;
/**
* @var string proper name for given parameter
*/
public $label;
var $extension;
var $version;
@ -98,14 +98,15 @@ class ExportExcel2007 extends ExportExcel
}
/**
* Close Excel file
*
* @return int <0 if KO, >0 if OK
*/
// phpcs:ignore PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
/**
* Close Excel file
*
* @return int <0 if KO, >0 if OK
*/
function close_file()
{
// phpcs:enable
global $conf;
if (! empty($conf->global->MAIN_USE_PHP_WRITEEXCEL))

View File

@ -42,6 +42,7 @@ class ModeleExports extends CommonDocGenerator // This class can't be abstrac
var $libversion=array();
// phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
/**
* Load into memory list of available export format
*
@ -49,9 +50,9 @@ class ModeleExports extends CommonDocGenerator // This class can't be abstrac
* @param integer $maxfilenamelength Max length of value to show
* @return array List of templates (same content than array this->driverlabel)
*/
// phpcs:ignore PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
function liste_modeles($db,$maxfilenamelength=0)
{
// phpcs:enable
dol_syslog(get_class($this)."::liste_modeles");
$dir=DOL_DOCUMENT_ROOT."/core/modules/export/";

View File

@ -42,6 +42,7 @@ abstract class ModelePDFFactures extends CommonDocGenerator
*/
public $error='';
// phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
/**
* Return list of active generation modules
*
@ -49,9 +50,9 @@ abstract class ModelePDFFactures extends CommonDocGenerator
* @param integer $maxfilenamelength Max length of value to show
* @return array List of templates
*/
// phpcs:ignore PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
static function liste_modeles($db,$maxfilenamelength=0)
{
// phpcs:enable
global $conf;
$type='invoice';
@ -65,7 +66,7 @@ abstract class ModelePDFFactures extends CommonDocGenerator
}
/**
* Classe mere des modeles de numerotation des references de facture
* Classe mere des modeles de numerotation des references de facture
*/
abstract class ModeleNumRefFactures
{

View File

@ -118,16 +118,17 @@ class mod_holiday_immaculate extends ModelNumRefHolidays
return $numFinal;
}
// phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
/**
* Return next value
* Return next value
*
* @param User $fuser User object
* @param Object $objforref Holiday object
* @return string Value if OK, 0 if KO
* @param User $fuser User object
* @param Object $objforref Holiday object
* @return string Value if OK, 0 if KO
*/
// phpcs:ignore PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
function holiday_get_num($fuser, $objforref)
{
// phpcs:enable
return $this->getNextValue($fuser, $objforref);
}
}

View File

@ -136,6 +136,7 @@ class mod_holiday_madonna extends ModelNumRefHolidays
}
// phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
/**
* Return next value
*
@ -143,9 +144,9 @@ class mod_holiday_madonna extends ModelNumRefHolidays
* @param Object $objforref Holiday object
* @return string Value if OK, 0 if KO
*/
// phpcs:ignore PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
function holiday_get_num($fuser,$objforref)
{
// phpcs:enable
return $this->getNextValue($fuser,$objforref);
}
}

View File

@ -142,16 +142,17 @@ class mod_livraison_jade extends ModeleNumRefDeliveryOrder
}
// phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
/**
* Return next free ref
*
* @param Societe $objsoc Object thirdparty
* @param Societe $objsoc Object thirdparty
* @param Object $object Object livraison
* @return string Texte descripif
* @return string Texte descriptif
*/
// phpcs:ignore PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
function livraison_get_num($objsoc=0,$object='')
{
// phpcs:enable
return $this->getNextValue($objsoc,$object);
}
}

View File

@ -110,6 +110,7 @@ class mailing_xinputfile extends MailingTargets
return $s;
}
// phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
/**
* Ajoute destinataires dans table des cibles
*
@ -117,9 +118,9 @@ class mailing_xinputfile extends MailingTargets
* @param array $filtersarray Requete sql de selection des destinataires
* @return int < 0 si erreur, nb ajout si ok
*/
// phpcs:ignore PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
function add_to_target($mailing_id,$filtersarray=array())
{
// phpcs:enable
global $conf,$langs,$_FILES;
require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';

View File

@ -108,6 +108,7 @@ class mailing_xinputuser extends MailingTargets
return $s;
}
// phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
/**
* Ajoute destinataires dans table des cibles
*
@ -115,9 +116,9 @@ class mailing_xinputuser extends MailingTargets
* @param array $filtersarray Requete sql de selection des destinataires
* @return int < 0 si erreur, nb ajout si ok
*/
// phpcs:ignore PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
function add_to_target($mailing_id,$filtersarray=array())
{
// phpcs:enable
global $conf,$langs,$_FILES;
require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
@ -154,8 +155,8 @@ class mailing_xinputuser extends MailingTargets
}
else
{
$langs->load("errors");
$this->error = $langs->trans("ErrorBadEmail",$email);
$langs->load("errors");
$this->error = $langs->trans("ErrorBadEmail",$email);
return -1;
}
}

View File

@ -138,16 +138,17 @@ class mod_payment_cicada extends ModeleNumRefPayments
}
// phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
/**
* Return next free value
*
* @param Societe $objsoc Object third party
* @param string $objforref Object for number to search
* @param string $objforref Object for number to search
* @return string Next free value
*/
// phpcs:ignore PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
function payment_get_num($objsoc,$objforref)
{
// phpcs:enable
return $this->getNextValue($objsoc,$objforref);
}
}

View File

@ -21,8 +21,8 @@
/**
* \class ModeleProductCode
* \brief Parent class for product code generators
* \class ModeleProductCode
* \brief Parent class for product code generators
*/
/**
@ -44,16 +44,17 @@ abstract class ModelePDFProductBatch extends CommonDocGenerator
public $error='';
/**
* Return list of active generation modules
// phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
/**
* Return list of active generation modules
*
* @param DoliDB $db Database handler
* @param integer $maxfilenamelength Max length of value to show
* @return array List of templates
*/
// phpcs:ignore PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
static function liste_modeles($db, $maxfilenamelength=0)
{
// phpcs:enable
global $conf;
$type='product_batch';

View File

@ -668,14 +668,15 @@ class FactureFournisseur extends CommonInvoice
}
// phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
/**
* Load this->lines
*
* @return int 1 si ok, < 0 si erreur
*/
// phpcs:ignore PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
function fetch_lines()
{
// phpcs:enable
$this->lines = array();
$sql = 'SELECT f.rowid, f.ref as ref_supplier, f.description, f.date_start, f.date_end, f.pu_ht, f.pu_ttc, f.qty, f.remise_percent, f.vat_src_code, f.tva_tx';
@ -894,15 +895,16 @@ class FactureFournisseur extends CommonInvoice
}
}
// phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
/**
* Add a discount line into an invoice (as an invoice line) using an existing absolute discount (Consume the discount)
*
* @param int $idremise Id of absolute discount
* @return int >0 if OK, <0 if KO
*/
// phpcs:ignore PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
function insert_discount($idremise)
{
// phpcs:enable
global $langs;
include_once DOL_DOCUMENT_ROOT.'/core/lib/price.lib.php';
@ -1146,17 +1148,18 @@ class FactureFournisseur extends CommonInvoice
}
// phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
/**
* Tag invoice as a payed invoice
* Tag invoice as a payed invoice
*
* @param User $user Object user
* @param string $close_code Code renseigne si on classe a payee completement alors que paiement incomplet. Not implementd yet.
* @param string $close_note Commentaire renseigne si on classe a payee alors que paiement incomplet. Not implementd yet.
* @return int <0 si ko, >0 si ok
*/
// phpcs:ignore PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
function set_paid($user, $close_code='', $close_note='')
{
// phpcs:enable
global $conf,$langs;
$error=0;
@ -1195,6 +1198,7 @@ class FactureFournisseur extends CommonInvoice
}
// phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
/**
* Tag la facture comme non payee completement + appel trigger BILL_UNPAYED
* Fonction utilisee quand un paiement prelevement est refuse,
@ -1203,9 +1207,9 @@ class FactureFournisseur extends CommonInvoice
* @param User $user Object user that change status
* @return int <0 si ok, >0 si ok
*/
// phpcs:ignore PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
function set_unpaid($user)
{
// phpcs:enable
global $conf,$langs;
$error=0;
@ -1407,6 +1411,7 @@ class FactureFournisseur extends CommonInvoice
}
// phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
/**
* Set draft status
*
@ -1414,9 +1419,9 @@ class FactureFournisseur extends CommonInvoice
* @param int $idwarehouse Id warehouse to use for stock change.
* @return int <0 if KO, >0 if OK
*/
// phpcs:ignore PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
function set_draft($user, $idwarehouse=-1)
{
// phpcs:enable
global $conf,$langs;
$error=0;
@ -1972,16 +1977,17 @@ class FactureFournisseur extends CommonInvoice
}
}
/**
// phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
/**
* Renvoi liste des factures remplacables
* Statut validee ou abandonnee pour raison autre + non payee + aucun paiement + pas deja remplacee
*
* @param int $socid Id societe
* @return array Tableau des factures ('id'=>id, 'ref'=>ref, 'status'=>status, 'paymentornot'=>0/1)
*/
// phpcs:ignore PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
function list_replacable_supplier_invoices($socid=0)
{
// phpcs:enable
global $conf;
$return = array();
@ -2019,6 +2025,7 @@ class FactureFournisseur extends CommonInvoice
}
}
// phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
/**
* Renvoi liste des factures qualifiables pour correction par avoir
* Les factures qui respectent les regles suivantes sont retournees:
@ -2027,9 +2034,9 @@ class FactureFournisseur extends CommonInvoice
* @param int $socid Id societe
* @return array Tableau des factures ($id => array('ref'=>,'paymentornot'=>,'status'=>,'paye'=>)
*/
// phpcs:ignore PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
function list_qualified_avoir_supplier_invoices($socid=0)
{
// phpcs:enable
global $conf;
$return = array();
@ -2070,15 +2077,16 @@ class FactureFournisseur extends CommonInvoice
}
}
// phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
/**
* Load indicators for dashboard (this->nbtodo and this->nbtodolate)
*
* @param User $user Object 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;
$sql = 'SELECT ff.rowid, ff.date_lim_reglement as datefin, ff.fk_statut';
@ -2367,14 +2375,15 @@ class FactureFournisseur extends CommonInvoice
$this->total_ttc = $xnbp*119.6;
}
// phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
/**
* Load indicators for dashboard (this->nbtodo and this->nbtodolate)
*
* @return int <0 if KO, >0 if OK
*/
// phpcs:ignore PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
function load_state_board()
{
// phpcs:enable
global $conf, $user;
$this->nb=array();
@ -3106,14 +3115,16 @@ class SupplierInvoiceLine extends CommonObjectLine
return -2;
}
}
/**
// phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
/**
* Mise a jour de l'objet ligne de commande en base
*
* @return int <0 si ko, >0 si ok
*/
// phpcs:ignore PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
function update_total()
{
// phpcs:enable
$this->db->begin();
// Mise a jour ligne en base