Checkstyle
This commit is contained in:
Laurent Destailleur
parent
325d055fbb
commit
78ae7dc075
@ -741,7 +741,7 @@ class pdf_canelle extends ModelePDFSuppliersInvoices
|
|||||||
$y+=3;
|
$y+=3;
|
||||||
$row = $this->db->fetch_object($resql);
|
$row = $this->db->fetch_object($resql);
|
||||||
|
|
||||||
$pdf->SetXY($tab3_posx, $tab3_top+$y );
|
$pdf->SetXY($tab3_posx, $tab3_top+$y);
|
||||||
$pdf->MultiCell(20, 3, dol_print_date($this->db->jdate($row->date),'day',false,$outputlangs,true), 0, 'L', 0);
|
$pdf->MultiCell(20, 3, dol_print_date($this->db->jdate($row->date),'day',false,$outputlangs,true), 0, 'L', 0);
|
||||||
$pdf->SetXY($tab3_posx+21, $tab3_top+$y);
|
$pdf->SetXY($tab3_posx+21, $tab3_top+$y);
|
||||||
$pdf->MultiCell(20, 3, price($row->amount), 0, 'L', 0);
|
$pdf->MultiCell(20, 3, price($row->amount), 0, 'L', 0);
|
||||||
|
|||||||
@ -17,15 +17,14 @@
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* \file htdocs/core/triggers/interface_20_all_Logevents.class.php
|
* \file htdocs/core/triggers/interface_20_all_Logevents.class.php
|
||||||
* \ingroup core
|
* \ingroup core
|
||||||
* \brief Trigger file for
|
* \brief Trigger file for
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* \class InterfaceLogevents
|
* Class of triggers for security events
|
||||||
* \brief Class of triggers for security events
|
|
||||||
*/
|
*/
|
||||||
class InterfaceLogevents
|
class InterfaceLogevents
|
||||||
{
|
{
|
||||||
|
|||||||
@ -23,8 +23,7 @@
|
|||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* \class InterfacePaypalWorkflow
|
* Class of triggers for paypal module
|
||||||
* \brief Class of triggers for paypal module
|
|
||||||
*/
|
*/
|
||||||
class InterfacePaypalWorkflow
|
class InterfacePaypalWorkflow
|
||||||
{
|
{
|
||||||
|
|||||||
@ -17,15 +17,14 @@
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* \file htdocs/core/triggers/interface_20_modWorkflow_WorkflowManager.class.php
|
* \file htdocs/core/triggers/interface_20_modWorkflow_WorkflowManager.class.php
|
||||||
* \ingroup core
|
* \ingroup core
|
||||||
* \brief Trigger file for workflows
|
* \brief Trigger file for workflows
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* \class InterfaceWorkflowManager
|
* Class of triggers for workflow module
|
||||||
* \brief Class of triggers for workflow module
|
|
||||||
*/
|
*/
|
||||||
|
|
||||||
class InterfaceWorkflowManager
|
class InterfaceWorkflowManager
|
||||||
@ -95,7 +94,6 @@ class InterfaceWorkflowManager
|
|||||||
* @param User $user Object user
|
* @param User $user Object user
|
||||||
* @param Translate $langs Object langs
|
* @param Translate $langs Object langs
|
||||||
* @param conf $conf Object conf
|
* @param conf $conf Object conf
|
||||||
* @param string $entity Value for instance of data (Always 1 except if module MultiCompany is installed)
|
|
||||||
* @return int <0 if KO, 0 if no triggered ran, >0 if OK
|
* @return int <0 if KO, 0 if no triggered ran, >0 if OK
|
||||||
*/
|
*/
|
||||||
function run_trigger($action,$object,$user,$langs,$conf)
|
function run_trigger($action,$object,$user,$langs,$conf)
|
||||||
|
|||||||
@ -25,8 +25,7 @@
|
|||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* \class InterfaceActionsAuto
|
* Class of triggered functions for agenda module
|
||||||
* \brief Class of triggered functions for agenda module
|
|
||||||
*/
|
*/
|
||||||
class InterfaceActionsAuto
|
class InterfaceActionsAuto
|
||||||
{
|
{
|
||||||
|
|||||||
@ -16,16 +16,15 @@
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* \file htdocs/core/triggers/interface_50_modLdap_Ldapsynchro.class.php
|
* \file htdocs/core/triggers/interface_50_modLdap_Ldapsynchro.class.php
|
||||||
* \ingroup core
|
* \ingroup core
|
||||||
* \brief Fichier de gestion des triggers LDAP
|
* \brief Fichier de gestion des triggers LDAP
|
||||||
*/
|
*/
|
||||||
require_once (DOL_DOCUMENT_ROOT."/core/class/ldap.class.php");
|
require_once (DOL_DOCUMENT_ROOT."/core/class/ldap.class.php");
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* \class InterfaceLdapsynchro
|
* Class of triggers for ldap module
|
||||||
* \brief Class of triggers for ldap module
|
|
||||||
*/
|
*/
|
||||||
class InterfaceLdapsynchro
|
class InterfaceLdapsynchro
|
||||||
{
|
{
|
||||||
|
|||||||
@ -17,15 +17,14 @@
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* \file htdocs/core/triggers/interface_50_modNotification_Notification.class.php
|
* \file htdocs/core/triggers/interface_50_modNotification_Notification.class.php
|
||||||
* \ingroup notification
|
* \ingroup notification
|
||||||
* \brief File of class of triggers for notification module
|
* \brief File of class of triggers for notification module
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* \class InterfaceNotification
|
* Class of triggers for notification module
|
||||||
* \brief Class of triggers for notification module
|
|
||||||
*/
|
*/
|
||||||
class InterfaceNotification
|
class InterfaceNotification
|
||||||
{
|
{
|
||||||
|
|||||||
@ -17,22 +17,21 @@
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* \file htdocs/core/triggers/interface_90_all_Demo.class.php
|
* \file htdocs/core/triggers/interface_90_all_Demo.class.php
|
||||||
* \ingroup core
|
* \ingroup core
|
||||||
* \brief Fichier de demo de personalisation des actions du workflow
|
* \brief Fichier de demo de personalisation des actions du workflow
|
||||||
* \remarks Son propre fichier d'actions peut etre cree par recopie de celui-ci:
|
* \remarks Son propre fichier d'actions peut etre cree par recopie de celui-ci:
|
||||||
* - Le nom du fichier doit etre: interface_99_modMymodule_Mytrigger.class.php
|
* - Le nom du fichier doit etre: interface_99_modMymodule_Mytrigger.class.php
|
||||||
* ou: interface_99_all_Mytrigger.class.php
|
* ou: interface_99_all_Mytrigger.class.php
|
||||||
* - Le fichier doit rester stocke dans core/triggers
|
* - Le fichier doit rester stocke dans core/triggers
|
||||||
* - Le nom de la classe doit etre InterfaceMytrigger
|
* - Le nom de la classe doit etre InterfaceMytrigger
|
||||||
* - Le nom de la methode constructeur doit etre InterfaceMytrigger
|
* - Le nom de la methode constructeur doit etre InterfaceMytrigger
|
||||||
* - Le nom de la propriete name doit etre Mytrigger
|
* - Le nom de la propriete name doit etre Mytrigger
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* \class InterfaceDemo
|
* Class of triggers for demo module
|
||||||
* \brief Class of triggers for demo module
|
|
||||||
*/
|
*/
|
||||||
class InterfaceDemo
|
class InterfaceDemo
|
||||||
{
|
{
|
||||||
@ -57,6 +56,7 @@ class InterfaceDemo
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* Return name of trigger file
|
* Return name of trigger file
|
||||||
|
*
|
||||||
* @return string Name of trigger file
|
* @return string Name of trigger file
|
||||||
*/
|
*/
|
||||||
function getName()
|
function getName()
|
||||||
@ -66,6 +66,7 @@ class InterfaceDemo
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* Return description of trigger file
|
* Return description of trigger file
|
||||||
|
*
|
||||||
* @return string Description of trigger file
|
* @return string Description of trigger file
|
||||||
*/
|
*/
|
||||||
function getDesc()
|
function getDesc()
|
||||||
@ -75,6 +76,7 @@ class InterfaceDemo
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* Return version of trigger file
|
* Return version of trigger file
|
||||||
|
*
|
||||||
* @return string Version of trigger file
|
* @return string Version of trigger file
|
||||||
*/
|
*/
|
||||||
function getVersion()
|
function getVersion()
|
||||||
|
|||||||
@ -194,7 +194,7 @@ class FactureFournisseur extends Facture
|
|||||||
$this->lines[$i]->localtax2_tx,
|
$this->lines[$i]->localtax2_tx,
|
||||||
$this->lines[$i]->qty,
|
$this->lines[$i]->qty,
|
||||||
$this->lines[$i]->fk_product,
|
$this->lines[$i]->fk_product,
|
||||||
'HT',
|
'HT',
|
||||||
$this->lines[$i]->info_bits,
|
$this->lines[$i]->info_bits,
|
||||||
$this->lines[$i]->product_type
|
$this->lines[$i]->product_type
|
||||||
);
|
);
|
||||||
|
|||||||
@ -190,7 +190,7 @@ else if ($action == 'addline' && $user->rights->fournisseur->commande->creer)
|
|||||||
$_POST['idprodfournprice'],
|
$_POST['idprodfournprice'],
|
||||||
$productsupplier->fourn_ref,
|
$productsupplier->fourn_ref,
|
||||||
$remise_percent,
|
$remise_percent,
|
||||||
'HT',
|
'HT',
|
||||||
$type
|
$type
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|||||||
@ -316,7 +316,7 @@ elseif ($action == 'add' && $user->rights->fournisseur->facture->creer)
|
|||||||
$date_end,
|
$date_end,
|
||||||
0,
|
0,
|
||||||
$lines[$i]->info_bits,
|
$lines[$i]->info_bits,
|
||||||
'HT',
|
'HT',
|
||||||
$product_type
|
$product_type
|
||||||
);
|
);
|
||||||
|
|
||||||
|
|||||||
@ -25,14 +25,14 @@
|
|||||||
/**
|
/**
|
||||||
* \file htdocs/user/class/user.class.php
|
* \file htdocs/user/class/user.class.php
|
||||||
* \brief File of class to manage users
|
* \brief File of class to manage users
|
||||||
|
* \ingroup core
|
||||||
*/
|
*/
|
||||||
|
|
||||||
require_once(DOL_DOCUMENT_ROOT ."/core/class/commonobject.class.php");
|
require_once(DOL_DOCUMENT_ROOT ."/core/class/commonobject.class.php");
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* \class User
|
* Class to manage users
|
||||||
* \brief Class to manage users
|
|
||||||
*/
|
*/
|
||||||
class User extends CommonObject
|
class User extends CommonObject
|
||||||
{
|
{
|
||||||
@ -1433,17 +1433,17 @@ class User extends CommonObject
|
|||||||
dol_syslog("User::send_password url=".$url);
|
dol_syslog("User::send_password url=".$url);
|
||||||
}
|
}
|
||||||
$mailfile = new CMailFile(
|
$mailfile = new CMailFile(
|
||||||
$subject,
|
$subject,
|
||||||
$this->email,
|
$this->email,
|
||||||
$conf->notification->email_from,
|
$conf->notification->email_from,
|
||||||
$mesg,
|
$mesg,
|
||||||
array(),
|
array(),
|
||||||
array(),
|
array(),
|
||||||
array(),
|
array(),
|
||||||
'',
|
'',
|
||||||
'',
|
'',
|
||||||
0,
|
0,
|
||||||
$msgishtml
|
$msgishtml
|
||||||
);
|
);
|
||||||
|
|
||||||
if ($mailfile->sendfile())
|
if ($mailfile->sendfile())
|
||||||
|
|||||||
@ -83,10 +83,10 @@ $server->wsdl->addComplexType(
|
|||||||
// Define other specific objects
|
// Define other specific objects
|
||||||
$server->wsdl->addComplexType(
|
$server->wsdl->addComplexType(
|
||||||
'product',
|
'product',
|
||||||
'complexType',
|
'complexType',
|
||||||
'struct',
|
'struct',
|
||||||
'all',
|
'all',
|
||||||
'',
|
'',
|
||||||
array(
|
array(
|
||||||
'id' => array('name'=>'id','type'=>'xsd:string'),
|
'id' => array('name'=>'id','type'=>'xsd:string'),
|
||||||
'ref' => array('name'=>'ref','type'=>'xsd:string'),
|
'ref' => array('name'=>'ref','type'=>'xsd:string'),
|
||||||
@ -120,10 +120,10 @@ $server->wsdl->addComplexType(
|
|||||||
// Define other specific objects
|
// Define other specific objects
|
||||||
$server->wsdl->addComplexType(
|
$server->wsdl->addComplexType(
|
||||||
'filterproduct',
|
'filterproduct',
|
||||||
'complexType',
|
'complexType',
|
||||||
'struct',
|
'struct',
|
||||||
'all',
|
'all',
|
||||||
'',
|
'',
|
||||||
array(
|
array(
|
||||||
// 'limit' => array('name'=>'limit','type'=>'xsd:string'),
|
// 'limit' => array('name'=>'limit','type'=>'xsd:string'),
|
||||||
'type' => array('name'=>'type','type'=>'xsd:string'),
|
'type' => array('name'=>'type','type'=>'xsd:string'),
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user