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

Fix phpcs

Browse Source
This commit is contained in:
Laurent Destailleur 2019-04-08 16:00:01 +02:00
parent 917b9d69fa
commit 1274d71a10
11 changed files with 421 additions and 469 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
htdocs/categories/class/categorie.class.php
View File

@ -985,9 +985,10 @@ class Categorie extends CommonObject
* *
* @param string $type Type of categories ('customer', 'supplier', 'contact', 'product', 'member') or (0, 1, 2, ...). * @param string $type Type of categories ('customer', 'supplier', 'contact', 'product', 'member') or (0, 1, 2, ...).
* @param int|string|array $markafterid Keep only or removed all categories including the leaf $markafterid in category tree (exclude) or Keep only of category is inside the leaf starting with this id. * @param int|string|array $markafterid Keep only or removed all categories including the leaf $markafterid in category tree (exclude) or Keep only of category is inside the leaf starting with this id.
* $markafterid can be an : int (id of category) * $markafterid can be an :
* string (categories ids seprated by comma) * - int (id of category)
* array (list of categories ids) * - string (categories ids seprated by comma)
* - array (list of categories ids)
* @param int $include [=0] Removed or 1=Keep only * @param int $include [=0] Removed or 1=Keep only
* @return array|int Array of categories. this->cats and this->motherof are set, -1 on error * @return array|int Array of categories. this->cats and this->motherof are set, -1 on error
*/ */

14
htdocs/core/class/commondocgenerator.class.php
View File

@ -1071,14 +1071,14 @@ abstract class CommonDocGenerator
} }
/** /**
* print standard column content * Print standard column content
* *
* @param PDF $pdf pdf object * @param PDF $pdf Pdf object
* @param float $tab_top tab top position * @param float $tab_top Tab top position
* @param float $tab_height default tab height * @param float $tab_height Default tab height
* @param $outputlangs * @param Translate $outputlangs Output language
* @param int $hidetop * @param int $hidetop Hide top
* @return float height of col tab titles * @return float Height of col tab titles
*/ */
function pdfTabTitles(&$pdf, $tab_top, $tab_height, $outputlangs, $hidetop = 0) function pdfTabTitles(&$pdf, $tab_top, $tab_height, $outputlangs, $hidetop = 0)
{ {

7
htdocs/core/class/html.form.class.php
View File

@ -3806,9 +3806,10 @@ class Form
* @param string $htmlname HTML field name * @param string $htmlname HTML field name
* @param int $maxlength Maximum length for labels * @param int $maxlength Maximum length for labels
* @param int|string|array $markafterid Keep only or removed all categories including the leaf $markafterid in category tree (exclude) or Keep only of category is inside the leaf starting with this id. * @param int|string|array $markafterid Keep only or removed all categories including the leaf $markafterid in category tree (exclude) or Keep only of category is inside the leaf starting with this id.
* $markafterid can be an : int (id of category) * $markafterid can be an :
* string (categories ids seprated by comma) * - int (id of category)
* array (list of categories ids) * - string (categories ids seprated by comma)
* - array (list of categories ids)
* @param int $outputmode 0=HTML select string, 1=Array * @param int $outputmode 0=HTML select string, 1=Array
* @param int $include [=0] Removed or 1=Keep only * @param int $include [=0] Removed or 1=Keep only
* @return string * @return string

2
htdocs/core/modules/commande/doc/pdf_einstein.modules.php
View File

@ -116,7 +116,7 @@ class pdf_einstein extends ModelePDFCommandes
/** /**
* Issuer * Issuer
* @var Company object that emits * @var Societe object that emits
*/ */
public $emetteur; public $emetteur;

2
htdocs/core/modules/commande/doc/pdf_eratosthene.modules.php
View File

@ -1358,8 +1358,6 @@ class pdf_eratosthene extends ModelePDFCommandes
if (empty($hidetop)){ if (empty($hidetop)){
$pdf->line($this->marge_gauche, $tab_top+$this->tabTitleHeight, $this->page_largeur-$this->marge_droite, $tab_top+$this->tabTitleHeight); // line prend une position y en 2eme param et 4eme param $pdf->line($this->marge_gauche, $tab_top+$this->tabTitleHeight, $this->page_largeur-$this->marge_droite, $tab_top+$this->tabTitleHeight); // line prend une position y en 2eme param et 4eme param
} }
} }
/** /**

14
htdocs/core/modules/expedition/doc/pdf_espadon.modules.php
View File

@ -105,7 +105,7 @@ class pdf_espadon extends ModelePdfExpedition
/** /**
* Issuer * Issuer
* @var Company object that emits * @var Societe object that emits
*/ */
public $emetteur; public $emetteur;
@ -505,7 +505,6 @@ class pdf_espadon extends ModelePdfExpedition
$pdf->SetFont('', '', $default_font_size - 1); // On repositionne la police par defaut $pdf->SetFont('', '', $default_font_size - 1); // On repositionne la police par defaut
// weight // weight
$weighttxt=''; $weighttxt='';
@ -732,9 +731,6 @@ class pdf_espadon extends ModelePdfExpedition
} }
if ($this->getColumnStatus('qty_asked') && $totalOrdered) if ($this->getColumnStatus('qty_asked') && $totalOrdered)
{ {
$this->printStdColumnContent($pdf, $tab2_top, 'qty_asked', $totalOrdered); $this->printStdColumnContent($pdf, $tab2_top, 'qty_asked', $totalOrdered);
@ -745,14 +741,11 @@ class pdf_espadon extends ModelePdfExpedition
$this->printStdColumnContent($pdf, $tab2_top, 'qty_shipped', $totalToShip); $this->printStdColumnContent($pdf, $tab2_top, 'qty_shipped', $totalToShip);
} }
if ($this->getColumnStatus('subprice')) if ($this->getColumnStatus('subprice'))
{ {
$this->printStdColumnContent($pdf, $tab2_top, 'subprice', price($object->total_ht, 0, $outputlangs)); $this->printStdColumnContent($pdf, $tab2_top, 'subprice', price($object->total_ht, 0, $outputlangs));
} }
$pdf->SetTextColor(0, 0, 0); $pdf->SetTextColor(0, 0, 0);
return ($tab2_top + ($tab2_hl * $index)); return ($tab2_top + ($tab2_hl * $index));
@ -1075,7 +1068,7 @@ class pdf_espadon extends ModelePdfExpedition
* Define Array Column Field * Define Array Column Field
* *
* @param object $object common object * @param object $object common object
* @param outputlangs $outputlangs langs * @param Translate $outputlangs langs
* @param int $hidedetails Do not show line details * @param int $hidedetails Do not show line details
* @param int $hidedesc Do not show desc * @param int $hidedesc Do not show desc
* @param int $hideref Do not show ref * @param int $hideref Do not show ref
@ -1236,8 +1229,5 @@ class pdf_espadon extends ModelePdfExpedition
{ {
$this->cols = $hookmanager->resArray; $this->cols = $hookmanager->resArray;
} }
} }
} }

2
htdocs/core/modules/expedition/doc/pdf_rouget.modules.php
View File

@ -105,7 +105,7 @@ class pdf_rouget extends ModelePdfExpedition
/** /**
* Issuer * Issuer
* @var Company object that emits * @var Societe object that emits
*/ */
public $emetteur; public $emetteur;

2
htdocs/core/modules/facture/doc/pdf_sponge.modules.php
View File

@ -1559,8 +1559,6 @@ class pdf_sponge extends ModelePDFFactures
if (empty($hidetop)){ if (empty($hidetop)){
$pdf->line($this->marge_gauche, $tab_top+$this->tabTitleHeight, $this->page_largeur-$this->marge_droite, $tab_top+$this->tabTitleHeight); // line prend une position y en 2eme param et 4eme param $pdf->line($this->marge_gauche, $tab_top+$this->tabTitleHeight, $this->page_largeur-$this->marge_droite, $tab_top+$this->tabTitleHeight); // line prend une position y en 2eme param et 4eme param
} }
} }
/** /**

46
htdocs/core/modules/supplier_order/pdf/pdf_cornas.modules.php
View File

@ -110,7 +110,7 @@ class pdf_cornas extends ModelePDFSuppliersOrders
/** /**
* Issuer * Issuer
* @var Company object that emits * @var Societe object that emits
*/ */
public $emetteur; public $emetteur;
@ -455,7 +455,6 @@ class pdf_cornas extends ModelePDFSuppliersOrders
if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) $this->_pagehead($pdf, $object, 0, $outputlangs); if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) $this->_pagehead($pdf, $object, 0, $outputlangs);
$height_note=$posyafter-$tab_top_newpage; $height_note=$posyafter-$tab_top_newpage;
$pdf->Rect($this->marge_gauche, $tab_top_newpage-1, $tab_width, $height_note+1); $pdf->Rect($this->marge_gauche, $tab_top_newpage-1, $tab_width, $height_note+1);
} }
else // No pagebreak else // No pagebreak
{ {
@ -1436,14 +1435,14 @@ class pdf_cornas extends ModelePDFSuppliersOrders
* Define Array Column Field * Define Array Column Field
* *
* @param object $object common object * @param object $object common object
* @param outputlangs $outputlangs langs * @param Translate $outputlangs langs
* @param int $hidedetails Do not show line details * @param int $hidedetails Do not show line details
* @param int $hidedesc Do not show desc * @param int $hidedesc Do not show desc
* @param int $hideref Do not show ref * @param int $hideref Do not show ref
* @return null * @return null
*/ */
function defineColumnField($object,$outputlangs,$hidedetails=0,$hidedesc=0,$hideref=0){ function defineColumnField($object, $outputlangs, $hidedetails=0, $hidedesc=0, $hideref=0)
{
global $conf, $hookmanager; global $conf, $hookmanager;
// Default field style for content // Default field style for content
@ -1632,40 +1631,6 @@ class pdf_cornas extends ModelePDFSuppliersOrders
} }
/* /*
* *
* DEBUT PARTIE NORMALEMENT DANS LA CLASSE CommonDocGenerator * DEBUT PARTIE NORMALEMENT DANS LA CLASSE CommonDocGenerator
@ -1695,7 +1660,7 @@ class pdf_cornas extends ModelePDFSuppliersOrders
* Prepare Array Column Field * Prepare Array Column Field
* *
* @param object $object common object * @param object $object common object
* @param outputlangs $outputlangs langs * @param Translate $outputlangs langs
* @param int $hidedetails Do not show line details * @param int $hidedetails Do not show line details
* @param int $hidedesc Do not show desc * @param int $hidedesc Do not show desc
* @param int $hideref Do not show ref * @param int $hideref Do not show ref
@ -1896,5 +1861,4 @@ class pdf_cornas extends ModelePDFSuppliersOrders
} }
else return false; else return false;
} }
} }