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

Fix: Checkstyle

Browse Source
This commit is contained in:
Laurent Destailleur 2012-07-23 10:46:09 +02:00
parent f07c416f76
commit ea93e62e91
4 changed files with 65 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
htdocs/comm/propal/class/propal.class.php
View File

@ -303,6 +303,8 @@ class Propal extends CommonObject
* @param int $rang Position of line * @param int $rang Position of line
* @param int $special_code Special code * @param int $special_code Special code
* @param int $fk_parent_line Id of parent line * @param int $fk_parent_line Id of parent line
* @param int $fk_fournprice Id supplier price
* @param int $pa_ht Buying price without tax
* @return int >0 if OK, <0 if KO * @return int >0 if OK, <0 if KO
* *
* @see add_product * @see add_product
@ -456,13 +458,15 @@ class Propal extends CommonObject
* @param int $special_code Set special code ('' = we don't change it) * @param int $special_code Set special code ('' = we don't change it)
* @param int $fk_parent_line Id of line parent * @param int $fk_parent_line Id of line parent
* @param int $skip_update_total Skip update total * @param int $skip_update_total Skip update total
* @param int $fk_fournprice Id supplier price
* @param int $pa_ht Buying price without tax
* @return int 0 if OK, <0 if KO * @return int 0 if OK, <0 if KO
*/ */
function updateline($rowid, $pu, $qty, $remise_percent=0, $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=null, $pa_ht = 0) 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=null, $pa_ht=0)
{ {
global $conf,$user,$langs; global $conf,$user,$langs;
dol_syslog("Propal::UpdateLine $rowid, $pu, $qty, $remise_percent, $txtva, $desc, $price_base_type, $info_bits"); dol_syslog(get_class($this)."::updateLine $rowid, $pu, $qty, $remise_percent, $txtva, $desc, $price_base_type, $info_bits");
include_once(DOL_DOCUMENT_ROOT.'/core/lib/price.lib.php'); include_once(DOL_DOCUMENT_ROOT.'/core/lib/price.lib.php');
// Clean parameters // Clean parameters
@ -750,8 +754,8 @@ class Propal extends CommonObject
$this->lines[$i]->rang, $this->lines[$i]->rang,
$this->lines[$i]->special_code, $this->lines[$i]->special_code,
$fk_parent_line, $fk_parent_line,
$this->lines[$i]->fk_fournprice, $this->lines[$i]->fk_fournprice,
$this->lines[$i]->pa_ht $this->lines[$i]->pa_ht
); );
if ($result < 0) if ($result < 0)

12
htdocs/commande/class/commande.class.php
View File

@ -697,8 +697,8 @@ class Commande extends CommonOrder
$this->lines[$i]->rang, $this->lines[$i]->rang,
$this->lines[$i]->special_code, $this->lines[$i]->special_code,
$fk_parent_line, $fk_parent_line,
$this->lines[$i]->fk_fournprice, $this->lines[$i]->fk_fournprice,
$this->lines[$i]->pa_ht $this->lines[$i]->pa_ht
); );
if ($result < 0) if ($result < 0)
{ {
@ -996,6 +996,8 @@ class Commande extends CommonOrder
* @param int $rang Position of line * @param int $rang Position of line
* @param int $special_code Special code * @param int $special_code Special code
* @param int $fk_parent_line Parent line * @param int $fk_parent_line Parent line
* @param int $fk_fournprice Id supplier price
* @param int $pa_ht Buying price (without tax)
* @return int >0 if OK, <0 if KO * @return int >0 if OK, <0 if KO
* *
* @see add_product * @see add_product
@ -1005,7 +1007,7 @@ class Commande extends CommonOrder
* par l'appelant par la methode get_default_tva(societe_vendeuse,societe_acheteuse,produit) * par l'appelant par la methode get_default_tva(societe_vendeuse,societe_acheteuse,produit)
* et le desc doit deja avoir la bonne valeur (a l'appelant de gerer le multilangue) * et le desc doit deja avoir la bonne valeur (a l'appelant de gerer le multilangue)
*/ */
function addline($commandeid, $desc, $pu_ht, $qty, $txtva, $txlocaltax1=0, $txlocaltax2=0, $fk_product=0, $remise_percent=0, $info_bits=0, $fk_remise_except=0, $price_base_type='HT', $pu_ttc=0, $date_start='', $date_end='', $type=0, $rang=-1, $special_code=0, $fk_parent_line=0, $fk_fournprice=null, $pa_ht = 0) function addline($commandeid, $desc, $pu_ht, $qty, $txtva, $txlocaltax1=0, $txlocaltax2=0, $fk_product=0, $remise_percent=0, $info_bits=0, $fk_remise_except=0, $price_base_type='HT', $pu_ttc=0, $date_start='', $date_end='', $type=0, $rang=-1, $special_code=0, $fk_parent_line=0, $fk_fournprice=null, $pa_ht=0)
{ {
dol_syslog("Commande::addline commandeid=$commandeid, desc=$desc, pu_ht=$pu_ht, qty=$qty, txtva=$txtva, fk_product=$fk_product, remise_percent=$remise_percent, info_bits=$info_bits, fk_remise_except=$fk_remise_except, price_base_type=$price_base_type, pu_ttc=$pu_ttc, date_start=$date_start, date_end=$date_end, type=$type", LOG_DEBUG); dol_syslog("Commande::addline commandeid=$commandeid, desc=$desc, pu_ht=$pu_ht, qty=$qty, txtva=$txtva, fk_product=$fk_product, remise_percent=$remise_percent, info_bits=$info_bits, fk_remise_except=$fk_remise_except, price_base_type=$price_base_type, pu_ttc=$pu_ttc, date_start=$date_start, date_end=$date_end, type=$type", LOG_DEBUG);
@ -2151,9 +2153,11 @@ class Commande extends CommonOrder
* @param int $type Type of line (0=product, 1=service) * @param int $type Type of line (0=product, 1=service)
* @param int $fk_parent_line Parent line id * @param int $fk_parent_line Parent line id
* @param int $skip_update_total Skip update of total * @param int $skip_update_total Skip update of total
* @param int $fk_fournprice Id supplier price
* @param int $pa_ht Buying price (without tax)
* @return int < 0 if KO, > 0 if OK * @return int < 0 if KO, > 0 if OK
*/ */
function updateline($rowid, $desc, $pu, $qty, $remise_percent=0, $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) 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)
{ {
global $conf; global $conf;

2
htdocs/commissions/lib/commissions.lib.php
View File

@ -21,11 +21,11 @@
* \file /marges/lib/commissions.lib.php * \file /marges/lib/commissions.lib.php
* \ingroup marges * \ingroup marges
* \brief Library for common commissions functions * \brief Library for common commissions functions
* \version $Id:$
*/ */
/** /**
* Define head array for tabs of marges tools setup pages * Define head array for tabs of marges tools setup pages
*
* @return Array of head * @return Array of head
*/ */
function commissions_admin_prepare_head() function commissions_admin_prepare_head()

42
htdocs/core/modules/modCommissions.class.php
View File

@ -36,12 +36,13 @@ include_once(DOL_DOCUMENT_ROOT ."/core/modules/DolibarrModules.class.php");
class modCommissions extends DolibarrModules class modCommissions extends DolibarrModules
{ {
/** /**
* \brief Constructor. Define names, constants, directories, boxes, permissions * Constructor. Define names, constants, directories, boxes, permissions
* \param DB Database handler *
*/ * @param DoliDB $db Database handler
function modCommissions($DB) */
function modCommissions($db)
{ {
$this->db = $DB; $this->db = $db;
// Id for module (must be unique). // Id for module (must be unique).
// Use here a free id (See in Home -> System information -> Dolibarr for list of used modules id). // Use here a free id (See in Home -> System information -> Dolibarr for list of used modules id).
@ -141,10 +142,11 @@ class modCommissions extends DolibarrModules
} }
/** /**
* \brief Function called when module is enabled. * Function called when module is enabled.
* The init function add constants, boxes, permissions and menus (defined in constructor) into Dolibarr database. * The init function add constants, boxes, permissions and menus (defined in constructor) into Dolibarr database.
* It also creates data directories. * It also creates data directories.
* \return int 1 if OK, 0 if KO *
* @return int 1 if OK, 0 if KO
*/ */
function init() function init()
{ {
@ -156,10 +158,11 @@ class modCommissions extends DolibarrModules
} }
/** /**
* \brief Function called when module is disabled. * Function called when module is disabled.
* Remove from database constants, boxes and permissions from Dolibarr database. * Remove from database constants, boxes and permissions from Dolibarr database.
* Data directories are not deleted. * Data directories are not deleted.
* \return int 1 if OK, 0 if KO *
* @return int 1 if OK, 0 if KO
*/ */
function remove() function remove()
{ {
@ -170,12 +173,13 @@ class modCommissions extends DolibarrModules
/** /**
* \brief Create tables and keys required by module * Create tables and keys required by module
* Files mymodule.sql and mymodule.key.sql with create table and create keys * Files mymodule.sql and mymodule.key.sql with create table and create keys
* commands must be stored in directory /mymodule/sql/ * commands must be stored in directory /mymodule/sql/
* This function is called by this->init. * This function is called by this->init.
* \return int <=0 if KO, >0 if OK *
*/ * @return int <=0 if KO, >0 if OK
*/
function load_tables() function load_tables()
{ {
return; return;