Skip to content

Commit

Permalink
Revert "Scrutinizer Auto-Fixes"
Browse files Browse the repository at this point in the history
  • Loading branch information
@eldy
eldy committed Jul 21, 2014
1 parent d5ab896 commit 161f5ea
Show file tree
Hide file tree
Showing 189 changed files with 479 additions and 530 deletions.
2 changes: 1 addition & 1 deletion htdocs/adherents/class/adherent.class.php
View file
Expand Up @@ -1241,7 +1241,7 @@ function fetch_subscriptions()
* @param string $num_chq Numero cheque (if Id bank account provided)
* @param string $emetteur_nom Name of cheque writer
* @param string $emetteur_banque Name of bank of cheque
* @param integer $datesubend Date end subscription
* @param timestamp $datesubend Date end subscription
* @return int rowid of record added, <0 if KO
*/
function cotisation($date, $montant, $accountid=0, $operation='', $label='', $num_chq='', $emetteur_nom='', $emetteur_banque='', $datesubend=0)
Expand Down
6 changes: 3 additions & 3 deletions htdocs/cashdesk/class/Facturation.class.php
View file
Expand Up @@ -266,7 +266,7 @@ private function razPers()
* Getter for id
*
* @param int $aId Id
* @return null|integer
* @return id
*/
public function id($aId=null)
{
Expand Down Expand Up @@ -390,7 +390,7 @@ public function remisePercent($aRemisePercent=null)
* Getter for montant_remise
*
* @param int $aMontantRemise Amount
* @return null|integer Amount
* @return string Amount
*/
public function montantRemise($aMontantRemise=null)
{
Expand All @@ -415,7 +415,7 @@ public function montantRemise($aMontantRemise=null)
* Getter for prix
*
* @param int $aPrix Price
* @return null|integer Stock
* @return string Stock
*/
public function prix ( $aPrix=null )
{
Expand Down
2 changes: 1 addition & 1 deletion htdocs/categories/categorie.php
View file
Expand Up @@ -609,7 +609,7 @@
* @param Object $object Object we want to see categories it can be classified into
* @param int $typeid Type of category (0, 1, 2, 3)
* @param int $socid Id thirdparty
* @param integer $showclassifyform 1=Add form to 'Classify', 0=Do not show form to 'Classify'
* @param string $showclassifyform 1=Add form to 'Classify', 0=Do not show form to 'Classify'
* @return int 0
*/
function formCategory($db,$object,$typeid,$socid=0,$showclassifyform=1)
Expand Down
4 changes: 2 additions & 2 deletions htdocs/categories/class/categorie.class.php
View file
Expand Up @@ -327,7 +327,7 @@ function update($user='')
* Delete a category from database
*
* @param User $user Object user that ask to delete
* @return integer
* @return void
*/
function delete($user)
{
Expand Down Expand Up @@ -980,7 +980,7 @@ function get_nb_categories()
/**
* Check if no category with same label already exists for this cat's parent or root and for this cat's type
*
* @return integer 1 if already exist, 0 otherwise, -1 if error
* @return boolean 1 if already exist, 0 otherwise, -1 if error
*/
function already_exists()
{
Expand Down
2 changes: 1 addition & 1 deletion htdocs/comm/action/class/cactioncomm.class.php
View file
Expand Up @@ -100,7 +100,7 @@ function fetch($id)
* @param int $active 1 or 0 to filter on event state active or not ('' by default = no filter)
* @param string $idorcode 'id' or 'code'
* @param string $excludetype Type to exclude
* @param integer $onlyautoornot Group list by auto events or not
* @param string $onlyautoornot Group list by auto events or not
* @return array Array of all event types if OK, <0 if KO
*/
function liste_array($active='',$idorcode='id',$excludetype='',$onlyautoornot=0)
Expand Down
2 changes: 1 addition & 1 deletion htdocs/comm/action/class/ical.class.php
View file
Expand Up @@ -257,7 +257,7 @@ function retun_key_value($text)
* Parse RRULE return array
*
* @param string $value string
* @return string
* @return array
*/
function ical_rrule($value)
{
Expand Down
16 changes: 8 additions & 8 deletions htdocs/comm/propal/class/propal.class.php
View file
Expand Up @@ -292,12 +292,12 @@ function insert_discount($idremise)
* @param double $pu_ht Prix unitaire
* @param double $qty Quantite
* @param double $txtva Taux de tva
* @param integer $txlocaltax1 Local tax 1 rate
* @param integer $txlocaltax2 Local tax 2 rate
* @param double $txlocaltax1 Local tax 1 rate
* @param double $txlocaltax2 Local tax 2 rate
* @param int $fk_product Id du produit/service predefini
* @param integer $remise_percent Pourcentage de remise de la ligne
* @param double $remise_percent Pourcentage de remise de la ligne
* @param string $price_base_type HT or TTC
* @param integer $pu_ttc Prix unitaire TTC
* @param double $pu_ttc Prix unitaire TTC
* @param int $info_bits Bits de type de lignes
* @param int $type Type of line (product, service)
* @param int $rang Position of line
Expand All @@ -308,7 +308,7 @@ function insert_discount($idremise)
* @param string $label ???
* @param int $date_start Start date of the line
* @param int $date_end End date of the line
* @param integer $array_option extrafields array
* @param array $array_option extrafields array
* @return int >0 if OK, <0 if KO
*
* @see add_product
Expand Down Expand Up @@ -466,8 +466,8 @@ function addline($desc, $pu_ht, $qty, $txtva, $txlocaltax1=0, $txlocaltax2=0, $f
* @param double $qty Quantity
* @param double $remise_percent Remise effectuee sur le produit
* @param double $txtva Taux de TVA
* @param integer $txlocaltax1 Local tax 1 rate
* @param integer $txlocaltax2 Local tax 2 rate
* @param double $txlocaltax1 Local tax 1 rate
* @param double $txlocaltax2 Local tax 2 rate
* @param string $desc Description
* @param double $price_base_type HT ou TTC
* @param int $info_bits Miscellaneous informations
Expand All @@ -480,7 +480,7 @@ function addline($desc, $pu_ht, $qty, $txtva, $txlocaltax1=0, $txlocaltax2=0, $f
* @param int $type 0/1=Product/service
* @param int $date_start Start date of the line
* @param int $date_end End date of the line
* @param integer $array_option extrafields array
* @param array $array_option extrafields array
* @return int 0 if OK, <0 if KO
*/
function updateline($rowid, $pu, $qty, $remise_percent, $txtva, $txlocaltax1=0, $txlocaltax2=0, $desc='', $price_base_type='HT', $info_bits=0, $special_code=0, $fk_parent_line=0, $skip_update_total=0, $fk_fournprice=0, $pa_ht=0, $label='', $type=0, $date_start='', $date_end='', $array_option=0)
Expand Down
20 changes: 10 additions & 10 deletions htdocs/commande/class/commande.class.php
View file
Expand Up @@ -1037,14 +1037,14 @@ function createFromProposal($object)
* @param double $pu_ht Unit price (without tax)
* @param double $qty Quantite
* @param double $txtva Taux de tva force, sinon -1
* @param integer $txlocaltax1 Local tax 1 rate
* @param integer $txlocaltax2 Local tax 2 rate
* @param double $txlocaltax1 Local tax 1 rate
* @param double $txlocaltax2 Local tax 2 rate
* @param int $fk_product Id du produit/service predefini
* @param integer $remise_percent Pourcentage de remise de la ligne
* @param double $remise_percent Pourcentage de remise de la ligne
* @param int $info_bits Bits de type de lignes
* @param int $fk_remise_except Id remise
* @param string $price_base_type HT or TTC
* @param integer $pu_ttc Prix unitaire TTC
* @param double $pu_ttc Prix unitaire TTC
* @param timestamp $date_start Start date of the line - Added by Matelli (See http://matelli.fr/showcases/patchs-dolibarr/add-dates-in-order-lines.html)
* @param timestamp $date_end End date of the line - Added by Matelli (See http://matelli.fr/showcases/patchs-dolibarr/add-dates-in-order-lines.html)
* @param int $type Type of line (0=product, 1=service)
Expand All @@ -1054,7 +1054,7 @@ function createFromProposal($object)
* @param int $fk_fournprice Id supplier price
* @param int $pa_ht Buying price (without tax)
* @param string $label Label
* @param integer $array_option extrafields array
* @param array $array_option extrafields array
* @return int >0 if OK, <0 if KO
*
* @see add_product
Expand Down Expand Up @@ -1233,7 +1233,7 @@ function addline($desc, $pu_ht, $qty, $txtva, $txlocaltax1=0, $txlocaltax2=0, $f
*
* @param int $idproduct Product Id
* @param double $qty Quantity
* @param integer $remise_percent Product discount relative
* @param double $remise_percent Product discount relative
* @param timestamp $date_start Start date of the line - Added by Matelli (See http://matelli.fr/showcases/patchs-dolibarr/add-dates-in-order-lines.html)
* @param timestamp $date_end End date of the line - Added by Matelli (See http://matelli.fr/showcases/patchs-dolibarr/add-dates-in-order-lines.html)
* @return void
Expand Down Expand Up @@ -2273,8 +2273,8 @@ function classer_facturee()
* @param double $qty Quantity
* @param double $remise_percent Pourcentage de remise de la ligne
* @param double $txtva Taux TVA
* @param integer $txlocaltax1 Local tax 1 rate
* @param integer $txlocaltax2 Local tax 2 rate
* @param double $txlocaltax1 Local tax 1 rate
* @param double $txlocaltax2 Local tax 2 rate
* @param string $price_base_type HT or TTC
* @param int $info_bits Miscellaneous informations on line
* @param timestamp $date_start Start date of the line
Expand All @@ -2286,7 +2286,7 @@ function classer_facturee()
* @param int $pa_ht Price (without tax) of product when it was bought
* @param string $label Label
* @param int $special_code Special code (also used by externals modules!)
* @param integer $array_option extrafields array
* @param array $array_option extrafields array
* @return int < 0 if KO, > 0 if OK
*/
function updateline($rowid, $desc, $pu, $qty, $remise_percent, $txtva, $txlocaltax1=0,$txlocaltax2=0, $price_base_type='HT', $info_bits=0, $date_start='', $date_end='', $type=0, $fk_parent_line=0, $skip_update_total=0, $fk_fournprice=null, $pa_ht=0, $label='', $special_code=0, $array_option=0)
Expand Down Expand Up @@ -2932,7 +2932,7 @@ function update_extrafields($user)
/**
* Return an array of order lines
*
* @return integer Lines of order
* @return array Lines of order
*/
function getLinesArray()
{
Expand Down
4 changes: 2 additions & 2 deletions htdocs/compta/bank/class/account.class.php
View file
Expand Up @@ -1142,7 +1142,7 @@ function fetch($rowid,$ref='',$num='')
/**
* Delete transaction bank line record
*
* @param integer $user User object that delete
* @param User $user User object that delete
* @return int <0 if KO, >0 if OK
*/
function delete($user=0)
Expand Down Expand Up @@ -1191,7 +1191,7 @@ function delete($user=0)
/**
* Delete bank line records
*
* @param integer $user User object that delete
* @param User $user User object that delete
* @return int <0 if KO, >0 if OK
*/
function delete_urls($user=0)
Expand Down
2 changes: 1 addition & 1 deletion htdocs/compta/bank/class/bankcateg.class.php
View file
Expand Up @@ -168,7 +168,7 @@ function fetch($id)
/**
* Update database
*
* @param integer $user User that modify
* @param User $user User that modify
* @param int $notrigger 0=launch triggers after, 1=disable triggers
* @return int <0 if KO, >0 if OK
*/
Expand Down
4 changes: 2 additions & 2 deletions htdocs/compta/facture/class/facture-rec.class.php
View file
Expand Up @@ -401,11 +401,11 @@ function delete()
* @param double $qty Quantite
* @param double $txtva Taux de tva force, sinon -1
* @param int $fk_product Id du produit/service predefini
* @param integer $remise_percent Pourcentage de remise de la ligne
* @param double $remise_percent Pourcentage de remise de la ligne
* @param string $price_base_type HT or TTC
* @param int $info_bits Bits de type de lignes
* @param int $fk_remise_except Id remise
* @param integer $pu_ttc Prix unitaire TTC (> 0 even for credit note)
* @param double $pu_ttc Prix unitaire TTC (> 0 even for credit note)
* @param int $type Type of line (0=product, 1=service)
* @param int $rang Position of line
* @param int $special_code Special code
Expand Down
18 changes: 9 additions & 9 deletions htdocs/compta/facture/class/facture.class.php
View file
Expand Up @@ -1018,7 +1018,7 @@ function fetch_lines()
/**
* Update database
*
* @param integer $user User that modify
* @param User $user User that modify
* @param int $notrigger 0=launch triggers after, 1=disable triggers
* @return int <0 if KO, >0 if OK
*/
Expand Down Expand Up @@ -1885,17 +1885,17 @@ function set_draft($user,$idwarehouse=-1)
* @param double $pu_ht Unit price without tax (> 0 even for credit note)
* @param double $qty Quantity
* @param double $txtva Force vat rate, -1 for auto
* @param integer $txlocaltax1 Local tax 1 rate
* @param integer $txlocaltax2 Local tax 2 rate
* @param double $txlocaltax1 Local tax 1 rate
* @param double $txlocaltax2 Local tax 2 rate
* @param int $fk_product Id of predefined product/service
* @param integer $remise_percent Percent of discount on line
* @param double $remise_percent Percent of discount on line
* @param timestamp $date_start Date start of service
* @param timestamp $date_end Date end of service
* @param int $ventil Code of dispatching into accountancy
* @param int $info_bits Bits de type de lignes
* @param int $fk_remise_except Id discount used
* @param string $price_base_type 'HT' or 'TTC'
* @param integer $pu_ttc Unit price with tax (> 0 even for credit note)
* @param double $pu_ttc Unit price with tax (> 0 even for credit note)
* @param int $type Type of line (0=product, 1=service)
* @param int $rang Position of line
* @param int $special_code Special code (also used by externals modules!)
Expand All @@ -1905,7 +1905,7 @@ function set_draft($user,$idwarehouse=-1)
* @param int $fk_fournprice Supplier price id (to calculate margin) or ''
* @param int $pa_ht Buying price of line (to calculate margin) or ''
* @param string $label Label of the line (deprecated, do not use)
* @param integer $array_option extrafields array
* @param array $array_option extrafields array
* @return int <0 if KO, Id of line if OK
*/
function addline($desc, $pu_ht, $qty, $txtva, $txlocaltax1=0, $txlocaltax2=0, $fk_product=0, $remise_percent=0, $date_start='', $date_end='', $ventil=0, $info_bits=0, $fk_remise_except='', $price_base_type='HT', $pu_ttc=0, $type=self::TYPE_STANDARD, $rang=-1, $special_code=0, $origin='', $origin_id=0, $fk_parent_line=0, $fk_fournprice=null, $pa_ht=0, $label='', $array_option=0)
Expand Down Expand Up @@ -2068,8 +2068,8 @@ function addline($desc, $pu_ht, $qty, $txtva, $txlocaltax1=0, $txlocaltax2=0, $f
* @param date $date_start Date de debut de validite du service
* @param date $date_end Date de fin de validite du service
* @param double $txtva VAT Rate
* @param integer $txlocaltax1 Local tax 1 rate
* @param integer $txlocaltax2 Local tax 2 rate
* @param double $txlocaltax1 Local tax 1 rate
* @param double $txlocaltax2 Local tax 2 rate
* @param string $price_base_type HT or TTC
* @param int $info_bits Miscellaneous informations
* @param int $type Type of line (0=product, 1=service)
Expand All @@ -2079,7 +2079,7 @@ function addline($desc, $pu_ht, $qty, $txtva, $txlocaltax1=0, $txlocaltax2=0, $f
* @param int $pa_ht Price (without tax) of product when it was bought
* @param string $label Label of the line (deprecated, do not use)
* @param int $special_code Special code (also used by externals modules!)
* @param integer $array_option extrafields array
* @param array $array_option extrafields array
* @return int < 0 if KO, > 0 if OK
*/
function updateline($rowid, $desc, $pu, $qty, $remise_percent, $date_start, $date_end, $txtva, $txlocaltax1=0, $txlocaltax2=0, $price_base_type='HT', $info_bits=0, $type= self::TYPE_STANDARD, $fk_parent_line=0, $skip_update_total=0, $fk_fournprice=null, $pa_ht=0, $label='', $special_code=0, $array_option=0)
Expand Down
2 changes: 1 addition & 1 deletion htdocs/compta/facture/class/paymentterm.class.php
View file
Expand Up @@ -257,7 +257,7 @@ function getDefaultId()
/**
* Update database
*
* @param integer $user User that modify
* @param User $user User that modify
* @param int $notrigger 0=launch triggers after, 1=disable triggers
* @return int <0 if KO, >0 if OK
*/
Expand Down
2 changes: 1 addition & 1 deletion htdocs/compta/localtax/class/localtax.class.php
View file
Expand Up @@ -123,7 +123,7 @@ function create($user)
/**
* Update database
*
* @param integer $user User that modify
* @param User $user User that modify
* @param int $notrigger 0=no, 1=yes (no update trigger)
* @return int <0 if KO, >0 if OK
*/
Expand Down
2 changes: 1 addition & 1 deletion htdocs/compta/paiement/cheque/class/remisecheque.class.php
View file
Expand Up @@ -274,7 +274,7 @@ function create($user, $account_id, $limit, $toRemise)
* Supprime la remise en base
*
* @param User $user Utilisateur qui effectue l'operation
* @return integer
* @return void
*/
function delete($user='')
{
Expand Down
7 changes: 3 additions & 4 deletions htdocs/compta/prelevement/class/bonprelevement.class.php
View file
Expand Up @@ -172,7 +172,6 @@ function AddFacture($facture_id, $client_id, $client_nom, $amount, $code_banque,
* @param string $code_guichet code of bank's office
* @param string $number bank account number
* @param string $number_key number key of account number
* @param integer $line_id
* @return int >0 if OK, <0 if KO
*/
function addline(&$line_id, $client_id, $client_nom, $amount, $code_banque, $code_guichet, $number, $number_key)
Expand Down Expand Up @@ -248,7 +247,7 @@ function addline(&$line_id, $client_id, $client_nom, $amount, $code_banque, $cod
* Read errors
*
* @param int $error id of error
* @return string Array of errors
* @return array Array of errors
*/
function ReadError($error)
{
Expand Down Expand Up @@ -1505,7 +1504,7 @@ function EnregDestinataire($rowid, $client_nom, $rib_banque, $rib_guichet, $rib_
* @param string $row_bic rib.bic AS bic,
* @param string $row_datec soc.datec,
* @param string $row_drum soc.rowid AS drum
* @return string
* @return void
*/
function EnregDestinataireSEPA($row_code_client, $row_nom, $row_address, $row_zip, $row_town, $row_country_code, $row_cb, $row_cg, $row_cc, $row_somme, $row_facnumber, $row_idfac, $row_iban, $row_bic, $row_datec, $row_drum)
{
Expand Down Expand Up @@ -1627,7 +1626,7 @@ function EnregEmetteur()
* @param int $nombre 0 or 1
* @param float $total Total
* @param string $CrLf End of line character
* @return string
* @return SEPA
*/
function EnregEmetteurSEPA($configuration, $ladate, $nombre, $total, $CrLf='\n')
{ // SEPA INITIALISATION
Expand Down
2 changes: 1 addition & 1 deletion htdocs/compta/prelevement/class/ligneprelevement.class.php
View file
Expand Up @@ -61,7 +61,7 @@ function __construct($db, $user)
* Recupere l'objet prelevement
*
* @param int $rowid id de la facture a recuperer
* @return integer
* @return void
*/
function fetch($rowid)
{
Expand Down
2 changes: 1 addition & 1 deletion htdocs/compta/prelevement/class/rejetprelevement.class.php
View file
Expand Up @@ -317,7 +317,7 @@ private function getListInvoices()
* Retrieve withdrawal object
*
* @param int $rowid id of invoice to retrieve
* @return integer
* @return void
*/
function fetch($rowid)
{
Expand Down
4 changes: 2 additions & 2 deletions htdocs/compta/salaries/class/paymentsalary.class.php
View file
Expand Up @@ -69,7 +69,7 @@ function __construct($db)
/**
* Update database
*
* @param integer $user User that modify
* @param User $user User that modify
* @param int $notrigger 0=no, 1=yes (no update trigger)
* @return int <0 if KO, >0 if OK
*/
Expand Down Expand Up @@ -141,7 +141,7 @@ function update($user=0, $notrigger=0)
* Load object in memory from database
*
* @param int $id id object
* @param integer $user User that load
* @param User $user User that load
* @return int <0 if KO, >0 if OK
*/
function fetch($id, $user=0)
Expand Down

0 comments on commit 161f5ea

Please sign in to comment.