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-04 21:16:17 +02:00
parent 48d8a444e0
commit c6cef85ccd
No known key found for this signature in database
GPG Key ID: 06809324E4B2ABC1
5 changed files with 12 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
htdocs/core/modules/expensereport/modules_expensereport.php
View File

@ -52,6 +52,7 @@ abstract class ModeleExpenseReport extends CommonDocGenerator
} }
} }
// phpcs:ignore PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
/** /**
* expensereport_pdf_create * expensereport_pdf_create
* *
@ -65,9 +66,9 @@ abstract class ModeleExpenseReport extends CommonDocGenerator
* @param int $hideref Hide ref * @param int $hideref Hide ref
* @return int 0 if KO, 1 if OK * @return int 0 if KO, 1 if OK
*/ */
// phpcs:ignore PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
function expensereport_pdf_create(DoliDB $db, ExpenseReport $object, $message, $modele, $outputlangs, $hidedetails=0, $hidedesc=0, $hideref=0) function expensereport_pdf_create(DoliDB $db, ExpenseReport $object, $message, $modele, $outputlangs, $hidedetails=0, $hidedesc=0, $hideref=0)
{ {
// phpcs:enable
return $object->generateDocument($modele, $outputlangs, $hidedetails, $hidedesc, $hideref); return $object->generateDocument($modele, $outputlangs, $hidedetails, $hidedesc, $hideref);
} }
@ -142,7 +143,7 @@ abstract class ModeleNumRefExpenseReport
/** /**
* Renvoie version du module numerotation * Renvoie version du module numerotation
* *
* @return string Valeur * @return string Valeur
*/ */
function getVersion() function getVersion()
{ {

2
htdocs/core/modules/export/export_excel2007.modules.php
View File

@ -98,7 +98,7 @@ class ExportExcel2007 extends ExportExcel
} }
// phpcs:ignore PEAR.NamingConventions.ValidFunctionName.NotCamelCaps // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
/** /**
* Close Excel file * Close Excel file
* *

3
htdocs/core/modules/societe/mod_codecompta_panicum.php
View File

@ -67,6 +67,7 @@ class mod_codecompta_panicum extends ModeleAccountancyCode
return ''; return '';
} }
// phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
/** /**
* Set accountancy account code for a third party into this->code * Set accountancy account code for a third party into this->code
* *
@ -75,9 +76,9 @@ class mod_codecompta_panicum extends ModeleAccountancyCode
* @param int $type 'customer' or 'supplier' * @param int $type 'customer' or 'supplier'
* @return int >=0 if OK, <0 if KO * @return int >=0 if OK, <0 if KO
*/ */
// phpcs:ignore PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
function get_code($db, $societe, $type='') function get_code($db, $societe, $type='')
{ {
// phpcs:enable
$this->code=''; $this->code='';
if (is_object($societe)) { if (is_object($societe)) {

7
htdocs/core/modules/usergroup/modules_usergroup.class.php
View File

@ -44,16 +44,17 @@ abstract class ModelePDFUserGroup extends CommonDocGenerator
public $error=''; public $error='';
/** // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
/**
* Return list of active generation modules * Return list of active generation modules
* *
* @param DoliDB $db Database handler * @param DoliDB $db Database handler
* @param integer $maxfilenamelength Max length of value to show * @param integer $maxfilenamelength Max length of value to show
* @return array List of templates * @return array List of templates
*/ */
// phpcs:ignore PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
static function liste_modeles($db,$maxfilenamelength=0) static function liste_modeles($db,$maxfilenamelength=0)
{ {
// phpcs:enable
global $conf; global $conf;
$type = 'group'; $type = 'group';
@ -63,4 +64,4 @@ abstract class ModelePDFUserGroup extends CommonDocGenerator
$list = getListOfModels($db, $type, $maxfilenamelength); $list = getListOfModels($db, $type, $maxfilenamelength);
return $list; return $list;
} }
} }

8
htdocs/livraison/class/livraison.class.php
View File

@ -1100,25 +1100,21 @@ class LivraisonLigne extends CommonObjectLine
*/ */
public $label; public $label;
<<<<<<< HEAD
var $description; // Description produit
=======
/** /**
* @var string product description * @var string product description
*/ */
public $description; public $description;
>>>>>>> upstream/develop
/** /**
* @deprecated * @deprecated
* @see product_ref * @see product_ref
*/ */
var $ref; public $ref;
/** /**
* @deprecated * @deprecated
* @see product_label; * @see product_label;
*/ */
var $libelle; public $libelle;
public $product_ref; public $product_ref;
public $product_label; public $product_label;