This commit is contained in:
Laurent Destailleur 2012-03-14 11:49:11 +01:00
parent f8bf7ade83
commit 9e5cffc62b
63 changed files with 328 additions and 209 deletions

View File

@ -50,7 +50,7 @@ class CommActionRapport
* @param int $month Month
* @param int $year Year
*/
function CommActionRapport($db, $month, $year)
function __construct($db, $month, $year)
{
global $langs;
$langs->load("commercial");

View File

@ -43,7 +43,7 @@ class BordereauChequeBlochet extends ModeleChequeReceipts
*
* @param DoliDB $db Database handler
*/
function BordereauChequeBlochet($db)
function __construct($db)
{
global $conf,$langs,$mysoc;

View File

@ -47,7 +47,7 @@ class doc_generic_order_odt extends ModelePDFCommandes
*
* @param DoliDB $db Database handler
*/
function doc_generic_order_odt($db)
function __construct($db)
{
global $conf,$langs,$mysoc;

View File

@ -41,7 +41,7 @@ class pdf_edison extends ModelePDFCommandes
*
* @param DoliDb $db Database access handler
*/
function pdf_edison($db=0)
function __construct($db=0)
{
global $conf,$langs,$mysoc;

View File

@ -63,7 +63,7 @@ class pdf_einstein extends ModelePDFCommandes
*
* @param DoliDB $DB Database handler
*/
function pdf_einstein($db)
function __construct($db)
{
global $conf,$langs,$mysoc;

View File

@ -35,8 +35,10 @@ class mod_commande_marbre extends ModeleNumRefCommandes
var $nom='Marbre';
/** \brief Return description of numbering module
* \return string Text with description
/**
* Return description of numbering module
*
* @return string Text with description
*/
function info()
{
@ -45,8 +47,10 @@ class mod_commande_marbre extends ModeleNumRefCommandes
}
/** \brief Renvoi un exemple de numerotation
* \return string Example
/**
* Renvoi un exemple de numerotation
*
* @return string Example
*/
function getExample()
{
@ -54,9 +58,11 @@ class mod_commande_marbre extends ModeleNumRefCommandes
}
/** \brief Test si les numeros deje en vigueur dans la base ne provoquent pas de
* de conflits qui empechera cette numerotation de fonctionner.
* \return boolean false si conflit, true si ok
/**
* Test si les numeros deje en vigueur dans la base ne provoquent pas de
* de conflits qui empechera cette numerotation de fonctionner.
*
* @return boolean false si conflit, true si ok
*/
function canBeActivated()
{
@ -86,10 +92,12 @@ class mod_commande_marbre extends ModeleNumRefCommandes
return true;
}
/** \brief Return next value
* \param objsoc Objet third party
* \param commande Object order
* \return string Value if OK, 0 if KO
/**
* Return next free value
*
* @param Societe $objsoc Object thirdparty
* @param Object $object Object we need next value for
* @return string Value if KO, <0 if KO
*/
function getNextValue($objsoc,$commande)
{

View File

@ -39,8 +39,10 @@ class mod_commande_saphir extends ModeleNumRefCommandes
var $nom = 'Saphir';
/** \brief Renvoi la description du modele de numerotation
* \return string Texte descripif
/**
* Renvoi la description du modele de numerotation
*
* @return string Texte descripif
*/
function info()
{
@ -77,8 +79,10 @@ class mod_commande_saphir extends ModeleNumRefCommandes
return $texte;
}
/** \brief Renvoi un exemple de numerotation
* \return string Example
/**
* Renvoi un exemple de numerotation
*
* @return string Example
*/
function getExample()
{
@ -96,11 +100,13 @@ class mod_commande_saphir extends ModeleNumRefCommandes
return $numExample;
}
/** \brief Return next value
* \param objsoc Objet third party
* \param commande Object order
* \return string Value if OK, 0 if KO
*/
/**
* Return next free value
*
* @param Societe $objsoc Object thirdparty
* @param Object $object Object we need next value for
* @return string Value if KO, <0 if KO
*/
function getNextValue($objsoc,$commande)
{
global $db,$conf;

View File

@ -35,6 +35,7 @@ class mod_contract_magre extends ModelNumRefContracts
/**
* Return default description of numbering model
*
* @return string text description
*/
function info()
@ -68,8 +69,9 @@ class mod_contract_magre extends ModelNumRefContracts
return $texte;
}
/**
/**
* Return numbering example
*
* @return string Example
*/
function getExample()
@ -88,8 +90,9 @@ class mod_contract_magre extends ModelNumRefContracts
return $numExample;
}
/**
/**
* Return next value
*
* @param objsoc third party object
* @param contract contract object
* @return string Value if OK, 0 if KO
@ -113,8 +116,9 @@ class mod_contract_magre extends ModelNumRefContracts
return $numFinal;
}
/**
*Return next free value
/**
* Return next free value
*
* @param objsoc Object third party
* @param objforref Object for number to search
* @return string Next free value

View File

@ -36,6 +36,7 @@ class mod_contract_serpis extends ModelNumRefContracts
/**
* Return default description of numbering model
*
* @return string text description
*/
function info()
@ -45,8 +46,9 @@ class mod_contract_serpis extends ModelNumRefContracts
}
/**
/**
* Return numbering example
*
* @return string Example
*/
function getExample()
@ -55,8 +57,9 @@ class mod_contract_serpis extends ModelNumRefContracts
}
/**
/**
* Test if existing numbers make problems with numbering
*
* @return boolean false if conflit, true if ok
*/
function canBeActivated()
@ -87,8 +90,9 @@ class mod_contract_serpis extends ModelNumRefContracts
return true;
}
/**
/**
* Return next value
*
* @param objsoc third party object
* @param contract contract object
* @return string Value if OK, 0 if KO
@ -125,8 +129,9 @@ class mod_contract_serpis extends ModelNumRefContracts
}
/**
*Return next free value
/**
* Return next free value
*
* @param objsoc Object third party
* @param objforref Object for number to search
* @return string Next free value

View File

@ -44,7 +44,7 @@ Class pdf_expedition_merou extends ModelePdfExpedition
*
* @param DoliDB $db Database handler
*/
function pdf_expedition_merou($db=0)
function __construct($db=0)
{
global $conf,$langs,$mysoc;

View File

@ -41,9 +41,9 @@ Class pdf_expedition_rouget extends ModelePdfExpedition
/**
* Constructor
*
* @param db Database handler
* @param DoliDB $db Database handler
*/
function pdf_expedition_rouget($db=0)
function __construct($db=0)
{
global $conf,$langs,$mysoc;

View File

@ -25,8 +25,12 @@ include_once "methode_expedition.modules.php";
class methode_expedition_colsui extends ModeleShippingMethod
{
function methode_expedition_colsui($db=0)
/**
* Constructor
*
* @param DoliDB $db Database handler
*/
function __construct($db=0)
{
$this->db = $db;
$this->id = 3; // Do not change this value
@ -35,6 +39,12 @@ class methode_expedition_colsui extends ModeleShippingMethod
$this->description = "Colissimo Suivi";
}
/**
* Return URL of provider
*
* @param string $tracking_number Tracking number
* @return string URL for tracking
*/
function provider_url_status($tracking_number)
{
return sprintf("http://www.coliposte.net/particulier/suivi_particulier.jsp?colispart=%s",$tracking_number);

View File

@ -24,8 +24,12 @@ include_once "methode_expedition.modules.php";
class methode_expedition_enl extends ModeleShippingMethod
{
function methode_expedition_enl($db=0)
/**
* Constructor
*
* @param DoliDB $db Database handler
*/
function __construct($db=0)
{
global $langs;
$this->db = $db;
@ -35,7 +39,13 @@ class methode_expedition_enl extends ModeleShippingMethod
$this->description = $langs->trans("Enlevement");
}
Function provider_url_status($tracking_number)
/**
* Return URL of provider
*
* @param string $tracking_number Tracking number
* @return string URL for tracking
*/
function provider_url_status($tracking_number)
{
return '';
}

View File

@ -25,8 +25,12 @@ include_once "methode_expedition.modules.php";
class methode_expedition_lettremax extends ModeleShippingMethod
{
function methode_expedition_lettremax($db=0)
/**
* Constructor
*
* @param DoliDB $db Database handler
*/
function __construct($db=0)
{
$this->db = $db;
$this->id = 4; // Do not change this value
@ -35,6 +39,12 @@ class methode_expedition_lettremax extends ModeleShippingMethod
$this->description = "Courrier suivi et lettre max";
}
/**
* Return URL of provider
*
* @param string $tracking_number Tracking number
* @return string URL for tracking
*/
function provider_url_status($tracking_number)
{
return sprintf("http://www.csuivi.courrier.laposte.fr/default.asp?EZ_ACTION=rechercheRapide&numObjet=%s",$tracking_number);

View File

@ -25,7 +25,12 @@ include_once "methode_expedition.modules.php";
class methode_expedition_trans extends ModeleShippingMethod
{
function methode_expedition_trans($db=0)
/**
* Constructor
*
* @param DoliDB $db Database handler
*/
function __construct($db=0)
{
global $langs;
@ -36,7 +41,13 @@ class methode_expedition_trans extends ModeleShippingMethod
$this->description = $langs->trans("GenericTransport");
}
Function provider_url_status($tracking_number)
/**
* Return URL of provider
*
* @param string $tracking_number Tracking number
* @return string URL for tracking
*/
function provider_url_status($tracking_number)
{
return '';
}

View File

@ -35,6 +35,7 @@ class mod_expedition_ribera extends ModelNumRefExpedition
/**
* Return default description of numbering model
*
* @return string text description
*/
function info()
@ -68,8 +69,9 @@ class mod_expedition_ribera extends ModelNumRefExpedition
return $texte;
}
/**
/**
* Return numbering example
*
* @return string Example
*/
function getExample()
@ -88,8 +90,9 @@ class mod_expedition_ribera extends ModelNumRefExpedition
return $numExample;
}
/**
/**
* Return next value
*
* @param objsoc third party object
* @param shipment shipment object
* @return string Value if OK, 0 if KO
@ -113,8 +116,9 @@ class mod_expedition_ribera extends ModelNumRefExpedition
return $numFinal;
}
/**
*Return next free value
/**
* Return next free value
*
* @param objsoc Object third party
* @param objforref Object for number to search
* @return string Next free value

View File

@ -36,6 +36,7 @@ class mod_expedition_safor extends ModelNumRefExpedition
/**
* Return default description of numbering model
*
* @return string text description
*/
function info()
@ -47,6 +48,7 @@ class mod_expedition_safor extends ModelNumRefExpedition
/**
* Return numbering example
*
* @return string Example
*/
function getExample()
@ -57,6 +59,7 @@ class mod_expedition_safor extends ModelNumRefExpedition
/**
* Test if existing numbers make problems with numbering
*
* @return boolean false if conflit, true if ok
*/
function canBeActivated()
@ -89,6 +92,7 @@ class mod_expedition_safor extends ModelNumRefExpedition
/**
* Return next value
*
* @param objsoc third party object
* @param shipment shipment object
* @return string Value if OK, 0 if KO
@ -125,7 +129,8 @@ class mod_expedition_safor extends ModelNumRefExpedition
}
/**
*Return next free value
* Return next free value
*
* @param objsoc Object third party
* @param objforref Object for number to search
* @return string Next free value

View File

@ -49,7 +49,7 @@ class ExportCsv extends ModeleExports
*
* @param DoliDB $db Database handler
*/
function ExportCsv($db)
function __construct($db)
{
global $conf,$langs;
$this->db = $db;

View File

@ -52,7 +52,7 @@ class ExportExcel extends ModeleExports
*
* @param DoliDB $db Database handler
*/
function ExportExcel($db)
function __construct($db)
{
global $conf;
$this->db = $db;

View File

@ -53,7 +53,7 @@ class ExportExcel2007 extends ExportExcel
*
* @param DoliDB $db Database handler
*/
function ExportExcel2007($db)
function __construct($db)
{
global $conf;
$this->db = $db;

View File

@ -49,7 +49,7 @@ class ExportTsv extends ModeleExports
*
* @param DoliDB $db Database handler
*/
function ExportTsv($db)
function __construct($db)
{
global $conf;
$this->db = $db;

View File

@ -46,7 +46,7 @@ class doc_generic_invoice_odt extends ModelePDFFactures
*
* @param DoliDB $db Database handler
*/
function doc_generic_invoice_odt($db)
function __construct($db)
{
global $conf,$langs,$mysoc;

View File

@ -61,7 +61,7 @@ class pdf_crabe extends ModelePDFFactures
*
* @param DoliDB $db Database handler
*/
function pdf_crabe($db)
function __construct($db)
{
global $conf,$langs,$mysoc;

View File

@ -50,9 +50,9 @@ class pdf_oursin extends ModelePDFFactures
/**
* Constructor
*
* @param DoliDB $DB Database handler
* @param DoliDB $db Database handler
*/
function pdf_oursin($db)
function __construct($db)
{
global $conf,$langs,$mysoc;

View File

@ -37,8 +37,10 @@ class mod_facture_mercure extends ModeleNumRefFactures
var $error = '';
/** \brief Renvoi la description du modele de numerotation
* \return string Texte descripif
/**
* Renvoi la description du modele de numerotation
*
* @return string Texte descripif
*/
function info()
{
@ -81,8 +83,10 @@ class mod_facture_mercure extends ModeleNumRefFactures
return $texte;
}
/** \brief Return an example of number value
* \return string Example
/**
* Return an example of number value
*
* @return string Example
*/
function getExample()
{

View File

@ -34,8 +34,10 @@ class mod_facture_terre extends ModeleNumRefFactures
var $prefixcreditnote='AV';
var $error='';
/** \brief Renvoi la description du modele de numerotation
* \return string Texte descripif
/**
* Renvoi la description du modele de numerotation
*
* @return string Texte descripif
*/
function info()
{
@ -44,17 +46,21 @@ class mod_facture_terre extends ModeleNumRefFactures
return $langs->trans('TerreNumRefModelDesc1',$this->prefixinvoice,$this->prefixcreditnote);
}
/** \brief Renvoi un exemple de numerotation
* \return string Example
/**
* Renvoi un exemple de numerotation
*
* @return string Example
*/
function getExample()
{
return $this->prefixinvoice."0501-0001";
}
/** \brief Test si les numeros deja en vigueur dans la base ne provoquent pas de
* de conflits qui empechera cette numerotation de fonctionner.
* \return boolean false si conflit, true si ok
/**
* Test si les numeros deja en vigueur dans la base ne provoquent pas de
* de conflits qui empechera cette numerotation de fonctionner.
*
* @return boolean false si conflit, true si ok
*/
function canBeActivated()
{

View File

@ -33,21 +33,12 @@ class mod_arctic extends ModeleNumRefFicheinter
{
var $version='dolibarr'; // 'development', 'experimental', 'dolibarr'
var $error = '';
var $nom = 'Artic';
var $nom = 'arctic';
/**
* Constructor
*
* @param DoliDb $db Database handler
*/
function mod_arctic()
{
$this->nom = "arctic";
}
/**
* Renvoi la description du modele de numerotation
*
*
* @return string Texte descripif
*/
function info()
@ -87,7 +78,7 @@ class mod_arctic extends ModeleNumRefFicheinter
/**
* Renvoi un exemple de numerotation
*
*
* @return string Example
*/
function getExample()
@ -107,11 +98,11 @@ class mod_arctic extends ModeleNumRefFicheinter
}
/**
* Renvoi prochaine valeur attribuee
*
* @param Societe $objsoc Objet societe
* @param Ficheinter $object Object ficheinter
* @return string Valeur
* Return next free value
*
* @param Societe $objsoc Object thirdparty
* @param Object $object Object we need next value for
* @return string Value if KO, <0 if KO
*/
function getNextValue($objsoc=0,$object='')
{
@ -136,7 +127,7 @@ class mod_arctic extends ModeleNumRefFicheinter
/**
* Return next free value
*
*
* @param Societe $objsoc Object third party
* @param Object $objforref Object for number to search
* @return string Next free value

View File

@ -37,7 +37,7 @@ class mod_pacific extends ModeleNumRefFicheinter
/**
* Return description of numbering module
*
*
* @return string Text with description
*/
function info()
@ -48,7 +48,7 @@ class mod_pacific extends ModeleNumRefFicheinter
/**
* Renvoi un exemple de numerotation
*
*
* @return string Example
*/
function getExample()
@ -56,10 +56,10 @@ class mod_pacific extends ModeleNumRefFicheinter
return $this->prefix."0501-0001";
}
/**
/**
* Test si les numeros deja en vigueur dans la base ne provoquent pas de
* de conflits qui empechera cette numerotation de fonctionner.
*
*
* @return boolean false si conflit, true si ok
*/
function canBeActivated()
@ -94,12 +94,12 @@ class mod_pacific extends ModeleNumRefFicheinter
}
}
/**
* Renvoi prochaine valeur attribuee
*
* @param objsoc Objet societe
* @param ficheinter Object ficheinter
* @return string Valeur
/**
* Return next free value
*
* @param Societe $objsoc Object thirdparty
* @param Object $object Object we need next value for
* @return string Value if KO, <0 if KO
*/
function getNextValue($objsoc=0,$object='')
{
@ -128,9 +128,9 @@ class mod_pacific extends ModeleNumRefFicheinter
return $this->prefix.$yymm."-".$num;
}
/**
/**
* Return next free value
*
*
* @param Societe $objsoc Object third party
* @param Object $objforref Object for number to search
* @return string Next free value

View File

@ -59,7 +59,7 @@ class ImportCsv extends ModeleImports
* @param DoliDB $db Database handler
* @param string $datatoimport String code describing import set (ex: 'societe_1')
*/
function ImportCsv($db,$datatoimport)
function __construct($db,$datatoimport)
{
global $conf,$langs;
$this->db = $db;

View File

@ -55,7 +55,7 @@ class ModeleImports
/**
* Constructor
*/
function ModeleImports()
function __construct()
{
}

View File

@ -42,8 +42,9 @@ class mod_livraison_jade extends ModeleNumRefDeliveryOrder
/**
* \brief Renvoi la description du modele de numerotation
* \return string Texte descripif
* Renvoi la description du modele de numerotation
*
* @return string Texte descripif
*/
function info()
{
@ -52,17 +53,20 @@ class mod_livraison_jade extends ModeleNumRefDeliveryOrder
}
/**
* \brief Renvoi un exemple de numerotation
* \return string Example
* Renvoi un exemple de numerotation
*
* @return string Example
*/
function getExample()
{
return $this->prefix."0501-0001";
}
/** \brief Test si les numeros deja en vigueur dans la base ne provoquent pas de
* de conflits qui empechera cette numerotation de fonctionner.
* \return boolean false si conflit, true si ok
/**
* Test si les numeros deja en vigueur dans la base ne provoquent pas de
* de conflits qui empechera cette numerotation de fonctionner.
*
* @return boolean false si conflit, true si ok
*/
function canBeActivated()
{

View File

@ -36,8 +36,10 @@ class mod_livraison_saphir extends ModeleNumRefDeliveryOrder
var $nom = 'Saphir';
/** \brief Renvoi la description du modele de numerotation
* \return string Texte descripif
/**
* Renvoi la description du modele de numerotation
*
* @return string Texte descripif
*/
function info()
{
@ -74,8 +76,10 @@ class mod_livraison_saphir extends ModeleNumRefDeliveryOrder
return $texte;
}
/** \brief Renvoi un exemple de num<EFBFBD>rotation
* \return string Example
/**
* Return an example of number
*
* @return string Example
*/
function getExample()
{
@ -94,11 +98,13 @@ class mod_livraison_saphir extends ModeleNumRefDeliveryOrder
}
/** \brief Return next value
* \param objsoc Object third party
* \param livraison Object delivery
* \return string Value if OK, 0 if KO
*/
/**
* Return next value
*
* @param Societe $objsoc Object third party
* @param Object $livraison Object delivery
* @return string Value if OK, 0 if KO
*/
function getNextValue($objsoc=0,$livraison='')
{
global $db,$conf;
@ -120,21 +126,25 @@ class mod_livraison_saphir extends ModeleNumRefDeliveryOrder
}
/** \brief Return next free value
* \param objsoc Object third party
* \param objforref Object for number to search
* \return string Next free value
*/
/**
* Return next free value
*
* @param Societe $objsoc Object third party
* @param string $objforref Object for number to search
* @return string Next free value
*/
function getNumRef($objsoc,$objforref)
{
return $this->getNextValue($objsoc,$objforref);
}
/** \brief Renvoie la r<EFBFBD>f<EFBFBD>rence de commande suivante non utilis<EFBFBD>e
* \param objsoc Objet soci<EFBFBD>t<EFBFBD>
* \param livraison Objet livraison
* \return string Texte descripif
/**
* Return next free ref
*
* @param Societe $objsoc Object thirdparty
* @param Object $livraison Objet livraison
* @return string Texte descripif
*/
function livraison_get_num($objsoc=0,$livraison='')
{

View File

@ -40,9 +40,9 @@ class pdf_sirocco extends ModelePDFDeliveryOrder
/**
* Constructor
*
* @param DoliDB $DB Database handler
* @param DoliDB $db Database handler
*/
function pdf_sirocco($db)
function __construct($db)
{
global $conf,$langs,$mysoc;

View File

@ -44,9 +44,9 @@ class pdf_typhon extends ModelePDFDeliveryOrder
/**
* Constructor
*
* @param DoliDB $DB Database handler
* @param DoliDB $db Database handler
*/
function pdf_typhon($db)
function __construct($db)
{
global $conf,$langs,$mysoc;

View File

@ -47,7 +47,7 @@ class mailing_contacts1 extends MailingTargets
*
* @param DoliDB $db Database handler
*/
function mailing_contacts1($db)
function __construct($db)
{
$this->db=$db;
}

View File

@ -46,7 +46,7 @@ class mailing_contacts2 extends MailingTargets
*
* @param DoliDB $db Database handler
*/
function mailing_contacts2($db)
function __construct($db)
{
$this->db=$db;
}

View File

@ -46,7 +46,7 @@ class mailing_contacts3 extends MailingTargets
*
* @param DoliDB $db Database handler
*/
function mailing_contacts3($db)
function __construct($db)
{
$this->db=$db;
}

View File

@ -44,7 +44,7 @@ class mailing_example extends MailingTargets
*
* @param DoliDB $DB Database handler
*/
function mailing_example($DB)
function __construct($DB)
{
$this->db=$DB;
}

View File

@ -52,7 +52,7 @@ class mailing_fraise extends MailingTargets
*
* @param DoliDB $db Database handler
*/
function mailing_fraise($db)
function __construct($db)
{
$this->db=$db;
}

View File

@ -42,7 +42,7 @@ class mailing_framboise extends MailingTargets
*
* @param DoliDB $db Database handler
*/
function mailing_framboise($db)
function __construct($db)
{
$this->db=$db;
}

View File

@ -45,7 +45,7 @@ class mailing_peche extends MailingTargets
*
* @param DoliDB $db Database handler
*/
function mailing_peche($db)
function __construct($db)
{
$this->db=$db;
}

View File

@ -45,7 +45,7 @@ class mailing_pomme extends MailingTargets
*
* @param DoliDB $db Database handler
*/
function mailing_pomme($db)
function __construct($db)
{
$this->db=$db;
}

View File

@ -42,7 +42,7 @@ class mailing_thirdparties extends MailingTargets
*
* @param DoliDB $db Database handler
*/
function mailing_thirdparties($db)
function __construct($db)
{
$this->db=$db;
}

View File

@ -38,7 +38,7 @@ class mailing_thirdparties_services_expired extends MailingTargets
*
* @param DoliDB $db Database handler
*/
function mailing_thirdparties_services_expired($db)
function __construct($db)
{
$this->db=$db;

View File

@ -70,7 +70,8 @@ require_once(DOL_DOCUMENT_ROOT.'/core/lib/format_cards.lib.php');
* \class pdf_standard
* \brief Classe afin d'editer au format PDF des cartes de visite au format Avery ou personnalise
*/
class pdf_standard {
class pdf_standard
{
var $code; // Code of format
var $format; // Array with informations
@ -98,9 +99,9 @@ class pdf_standard {
/**
* Constructor
*
* @param DoliDB $DB Database handler
* @param DoliDB $db Database handler
*/
function pdf_standard($db)
function __construct($db)
{
$this->db = $db;
}
@ -108,7 +109,8 @@ class pdf_standard {
//Methode qui permet de modifier la taille des caracteres
// Cela modiera aussi l'espace entre chaque ligne
function Set_Char_Size(&$pdf,$pt) {
function Set_Char_Size(&$pdf,$pt)
{
if ($pt > 3) {
$this->_Char_Size = $pt;
$this->_Line_Height = $this->_Get_Height_Chars($pt);
@ -118,7 +120,7 @@ class pdf_standard {
// On imprime une etiquette
function Add_PDF_card(&$pdf,$textleft,$header='',$footer='',$outputlangs,$textright='',$idmember,$photomember)
function Add_PDF_card(&$pdf,$textleft,$header,$footer,$outputlangs,$textright='',$idmember=0,$photomember='')
{
global $mysoc,$conf,$langs;

View File

@ -70,7 +70,8 @@ require_once(DOL_DOCUMENT_ROOT.'/core/lib/format_cards.lib.php');
* \class pdf_standardlabel
* \brief Classe afin d'editer au format PDF des pages d'etiquette adresse au format Avery ou personnalise
*/
class pdf_standardlabel {
class pdf_standardlabel
{
var $code; // Code of format
var $format; // Array with informations
@ -99,9 +100,9 @@ class pdf_standardlabel {
/**
* Constructor
*
* @param DoliDB $DB Database handler
* @param DoliDB $db Database handler
*/
function pdf_standard($db)
function __construct($db)
{
$this->db = $db;
}
@ -146,7 +147,7 @@ class pdf_standardlabel {
}
// Define photo
$photo='';
// Print lines
if ($this->code == "CARD")
{

View File

@ -42,9 +42,9 @@ class pdf_baleine extends ModelePDFProjects
/**
* Constructor
*
* @param DoliDB $DB Database handler
* @param DoliDB $db Database handler
*/
function pdf_baleine($db)
function __construct($db)
{
global $conf,$langs,$mysoc;

View File

@ -47,7 +47,7 @@ class doc_generic_proposal_odt extends ModelePDFPropales
*
* @param DoliDB $db Database handler
*/
function doc_generic_proposal_odt($db)
function __construct($db)
{
global $conf,$langs,$mysoc;

View File

@ -44,9 +44,9 @@ class pdf_azur extends ModelePDFPropales
/**
* Constructor
*
* @param DoliDB $DB Database handler
* @param DoliDB $db Database handler
*/
function pdf_azur($db)
function __construct($db)
{
global $conf,$langs,$mysoc;

View File

@ -44,9 +44,9 @@ class pdf_jaune extends ModelePDFPropales
/**
* Constructor
*
* @param DoliDB $DB Database handler
* @param DoliDB $db Database handler
*/
function pdf_jaune($db)
function __construct($db)
{
global $conf,$langs,$mysoc;

View File

@ -37,8 +37,10 @@ class mod_propale_marbre extends ModeleNumRefPropales
var $nom = "Marbre";
/** \brief Return description of numbering module
* \return string Text with description
/**
* Return description of numbering module
*
* @return string Text with description
*/
function info()
{
@ -47,8 +49,10 @@ class mod_propale_marbre extends ModeleNumRefPropales
}
/** \brief Return an example of numbering module values
* \return string Example
/**
* Return an example of numbering module values
*
* @return string Example
*/
function getExample()
{

View File

@ -39,8 +39,10 @@ class mod_propale_saphir extends ModeleNumRefPropales
var $nom = 'Saphir';
/** \brief Return description of module
* \return string Texte descripif
/**
* Return description of module
*
* @return string Texte descripif
*/
function info()
{
@ -77,8 +79,10 @@ class mod_propale_saphir extends ModeleNumRefPropales
return $texte;
}
/** \brief Renvoi un exemple de numerotation
* \return string Example
/**
* Renvoi un exemple de numerotation
*
* @return string Example
*/
function getExample()
{

View File

@ -36,7 +36,7 @@ class pdf_paiement
*
* @param DoliDb $db Database handler
*/
function pdf_paiement($db)
function __construct($db)
{
global $langs;
$langs->load("bills");

View File

@ -44,7 +44,7 @@ class doc_generic_odt extends ModeleThirdPartyDoc
*
* @param DoliDB $db Database handler
*/
function doc_generic_odt($db)
function __construct($db)
{
global $conf,$langs,$mysoc;

View File

@ -50,7 +50,7 @@ class mod_codeclient_elephant extends ModeleThirdPartyCode
/**
* Constructor
*/
function mod_codeclient_elephant()
function __construct()
{
$this->code_null = 0;
$this->code_modifiable = 1;

View File

@ -51,7 +51,7 @@ class mod_codeclient_leopard extends ModeleThirdPartyCode
/**
* Constructor
*/
function mod_codeclient_leopard()
function __construct()
{
$this->code_null = 1;
$this->code_modifiable = 1;

View File

@ -48,7 +48,7 @@ class mod_codeclient_monkey extends ModeleThirdPartyCode
/**
* Constructor
*/
function mod_codeclient_monkey()
function __construct()
{
$this->nom = "Monkey";
$this->version = "dolibarr";

View File

@ -41,7 +41,7 @@ class mod_codecompta_aquarium extends ModeleAccountancyCode
/**
* Constructor
*/
function mod_codecompta_aquarium()
function __construct()
{
global $conf;
if (empty($conf->global->COMPANY_AQUARIUM_MASK_CUSTOMER)) $conf->global->COMPANY_AQUARIUM_MASK_CUSTOMER='411';

View File

@ -38,7 +38,7 @@ class mod_codecompta_panicum extends ModeleAccountancyCode
/**
* Constructor
*/
function mod_codecompta_panicum()
function __construct()
{
}
@ -53,11 +53,13 @@ class mod_codecompta_panicum extends ModeleAccountancyCode
return $langs->trans("ModuleCompanyCode".$this->nom);
}
/** Return an example of result returned by getNextValue
/**
* Return an example of result returned by getNextValue
*
* @param Translate $langs Object langs
* @param Societe $objsoc Object thirdparty
* @param int $type Type of third party (1:customer, 2:supplier, -1:autodetect)
* @param Translate $langs Object langs
* @param Societe $objsoc Object thirdparty
* @param int $type Type of third party (1:customer, 2:supplier, -1:autodetect)
* @return string Example
*/
function getExample($langs,$objsoc=0,$type=-1)
{

View File

@ -58,9 +58,9 @@ class pdf_canelle extends ModelePDFSuppliersInvoices
/**
* Constructor
*
* @param DoliDB $DB Database handler
* @param DoliDB $db Database handler
*/
function pdf_canelle($db,$object)
function __construct($db,$object)
{
global $conf,$langs,$mysoc;

View File

@ -37,8 +37,10 @@ class mod_commande_fournisseur_muguet extends ModeleNumRefSuppliersOrders
var $prefix='CF';
/** \brief Return description of numbering module
* \return string Text with description
/**
* Return description of numbering module
*
* @return string Text with description
*/
function info()
{
@ -47,8 +49,10 @@ class mod_commande_fournisseur_muguet extends ModeleNumRefSuppliersOrders
}
/** \brief Renvoi un exemple de numerotation
* \return string Example
/**
* Renvoi un exemple de numerotation
*
* @return string Example
*/
function getExample()
{
@ -56,9 +60,11 @@ class mod_commande_fournisseur_muguet extends ModeleNumRefSuppliersOrders
}
/** \brief Test si les numeros deja en vigueur dans la base ne provoquent pas de
* de conflits qui empechera cette numerotation de fonctionner.
* \return boolean false si conflit, true si ok
/**
* Test si les numeros deja en vigueur dans la base ne provoquent pas de
* de conflits qui empechera cette numerotation de fonctionner.
*
* @return boolean false si conflit, true si ok
*/
function canBeActivated()
{
@ -89,11 +95,13 @@ class mod_commande_fournisseur_muguet extends ModeleNumRefSuppliersOrders
}
}
/** \brief Return next value
* \param objsoc Object third party
* \param object Object
* \return string Valeur
*/
/**
* Return next value
*
* @param Societe $objsoc Object third party
* @param Object $object Object
* @return string Value if OK, 0 if KO
*/
function getNextValue($objsoc=0,$object='')
{
global $db,$conf;
@ -123,11 +131,13 @@ class mod_commande_fournisseur_muguet extends ModeleNumRefSuppliersOrders
}
/** \brief Renvoie la reference de commande suivante non utilisee
* \param objsoc Object third party
* \param object Object
* \return string Texte descripif
*/
/**
* Renvoie la reference de commande suivante non utilisee
*
* @param Societe $objsoc Object third party
* @param Object $object Object
* @return string Texte descripif
*/
function commande_get_num($objsoc=0,$object='')
{
return $this->getNextValue($objsoc,$object);

View File

@ -38,8 +38,10 @@ class mod_commande_fournisseur_orchidee extends ModeleNumRefSuppliersOrders
var $nom = 'Orchidee';
/** \brief Renvoi la description du modele de numerotation
* \return string Texte descripif
/**
* Renvoi la description du modele de numerotation
*
* @return string Texte descripif
*/
function info()
{
@ -77,8 +79,10 @@ class mod_commande_fournisseur_orchidee extends ModeleNumRefSuppliersOrders
return $texte;
}
/** \brief Renvoi un exemple de numerotation
* \return string Example
/**
* Renvoi un exemple de numerotation
*
* @return string Example
*/
function getExample()
{
@ -96,10 +100,12 @@ class mod_commande_fournisseur_orchidee extends ModeleNumRefSuppliersOrders
return $numExample;
}
/** \brief Return next value
* \param objsoc Object third party
* \param commande Object supplier order
* \return string Value if OK, 0 if KO
/**
* Return next value
*
* @param Societe $objsoc Object third party
* @param Object $object Object
* @return string Value if OK, 0 if KO
*/
function getNextValue($objsoc=0,$commande='')
{
@ -122,10 +128,12 @@ class mod_commande_fournisseur_orchidee extends ModeleNumRefSuppliersOrders
}
/** \brief Renvoie la reference de commande suivante non utilisee
* \param objsoc Objet societe
* \param commande Objet commande
* \return string Texte descripif
/**
* Renvoie la reference de commande suivante non utilisee
*
* @param Societe $objsoc Object third party
* @param Object $object Object
* @return string Texte descripif
*/
function commande_get_num($objsoc=0,$commande='')
{

View File

@ -63,7 +63,7 @@ class pdf_muscadet extends ModelePDFSuppliersOrders
*
* @param DoliDB $db Database handler
*/
function pdf_muscadet($db)
function __construct($db)
{
global $conf,$langs,$mysoc;