diff --git a/htdocs/actioncomm.class.php b/htdocs/actioncomm.class.php
index 56b3b4e6a27..4427ec70ce3 100644
--- a/htdocs/actioncomm.class.php
+++ b/htdocs/actioncomm.class.php
@@ -40,7 +40,7 @@ class ActionComm
* Initialisation
*
*/
- Function ActionComm($db)
+ function ActionComm($db)
{
$this->db = $db;
$this->societe = new Societe($db);
@@ -55,7 +55,7 @@ class ActionComm
*
*
*/
- Function add($author)
+ function add($author)
{
if (! $this->contact)
{
@@ -92,7 +92,7 @@ class ActionComm
*
*
*/
- Function fetch($id)
+ function fetch($id)
{
$sql = "SELECT ".$this->db->pdate("a.datea")." as da, a.note, c.libelle, fk_soc, fk_user_author, fk_contact, fk_facture, a.percent ";
$sql .= "FROM ".MAIN_DB_PREFIX."actioncomm as a, ".MAIN_DB_PREFIX."c_actioncomm as c WHERE a.id=$id AND a.fk_action=c.id;";
@@ -135,7 +135,7 @@ class ActionComm
*
*
*/
- Function delete($id)
+ function delete($id)
{
$sql = "DELETE FROM ".MAIN_DB_PREFIX."actioncomm WHERE id=$id;";
@@ -148,7 +148,7 @@ class ActionComm
* Met à jour l'action
*
*/
- Function update()
+ function update()
{
if ($this->percent > 100)
{
diff --git a/htdocs/address.class.php b/htdocs/address.class.php
index 9bfd3af0514..99b3c1f4e5c 100644
--- a/htdocs/address.class.php
+++ b/htdocs/address.class.php
@@ -28,7 +28,7 @@ class Address {
var $city;
var $country;
- Function Address() {
+ function Address() {
}
diff --git a/htdocs/bargraph.class.php b/htdocs/bargraph.class.php
index 65dd8c150e0..15b23ca90b3 100644
--- a/htdocs/bargraph.class.php
+++ b/htdocs/bargraph.class.php
@@ -32,7 +32,7 @@ class BarGraph extends Graph
* Retour: 0 si ko, 1 si ok
*/
- Function BarGraph($data=array()) {
+ function BarGraph($data=array()) {
$modules_list = get_loaded_extensions();
$isgdinstalled=0;
@@ -74,7 +74,7 @@ class BarGraph extends Graph
return;
}
- Function isGraphKo() {
+ function isGraphKo() {
return $this->errorstr;
}
@@ -82,7 +82,7 @@ class BarGraph extends Graph
* Dessine le graphique
*
*/
- Function draw($file, $data, $title='') {
+ function draw($file, $data, $title='') {
$this->prepare($file, $data, $title);
if (substr($this->MaxValue,0,1) == 1)
diff --git a/htdocs/cactioncomm.class.php b/htdocs/cactioncomm.class.php
index e393be24250..6f14421a89a 100644
--- a/htdocs/cactioncomm.class.php
+++ b/htdocs/cactioncomm.class.php
@@ -24,7 +24,7 @@ class CActioncomm {
var $id;
var $libelle;
- Function CActioncomm($DB=0)
+ function CActioncomm($DB=0)
{
$this->db = $DB;
}
@@ -33,7 +33,7 @@ class CActioncomm {
*
*/
- Function fetch($db, $id)
+ function fetch($db, $id)
{
$sql = "SELECT libelle FROM ".MAIN_DB_PREFIX."c_actioncomm WHERE id=$id;";
@@ -67,7 +67,7 @@ class CActioncomm {
*
*
*/
- Function liste_array()
+ function liste_array()
{
$ga = array();
@@ -102,7 +102,7 @@ class CActioncomm {
* Renvoie le nom d'une action a partir d'un id
*
*/
- Function get_nom($id)
+ function get_nom($id)
{
$sql = "SELECT libelle nom FROM ".MAIN_DB_PREFIX."c_actioncomm WHERE id='$id';";
diff --git a/htdocs/chargesociales.class.php b/htdocs/chargesociales.class.php
index feeaa257616..eb9ed0a2b2c 100644
--- a/htdocs/chargesociales.class.php
+++ b/htdocs/chargesociales.class.php
@@ -31,13 +31,13 @@ class PaiementCharge {
var $num_paiement;
var $note;
- Function PaiementCharge($DB) {
+ function PaiementCharge($DB) {
$this->db = $DB;
return 1;
}
- Function create($user) {
+ function create($user) {
$sql_err = 0;
/*
* Insertion dans la base
@@ -93,7 +93,7 @@ class PaiementCharge {
* Mise a jour du lien entre le paiement de charge et la ligne dans llx_bank générée
*
*/
- Function update_fk_bank($id_bank) {
+ function update_fk_bank($id_bank) {
$sql = "UPDATE llx_paiementcharge set fk_bank = ".$id_bank." where rowid = ".$this->id;
$result = $this->db->query($sql);
if ($result)
@@ -125,7 +125,7 @@ class ChargeSociales {
var $paye;
var $periode;
- Function ChargeSociales($DB) {
+ function ChargeSociales($DB) {
$this->db = $DB;
return 1;
@@ -135,7 +135,7 @@ class ChargeSociales {
* Retrouve et charge une charge sociale
* Retour: 1 si trouve, 0 sinon
*/
- Function fetch($id) {
+ function fetch($id) {
$sql = "SELECT cs.rowid,".$this->db->pdate("cs.date_ech")." as date_ech,".$this->db->pdate("cs.date_pai")." as date_pai";
$sql .=", cs.libelle as lib, cs.fk_type, cs.amount, cs.paye, ".$this->db->pdate("cs.periode")." as periode, c.libelle";
$sql .= " FROM ".MAIN_DB_PREFIX."chargesociales as cs, ".MAIN_DB_PREFIX."c_chargesociales as c";
@@ -173,7 +173,7 @@ class ChargeSociales {
}
}
- Function solde($year = 0) {
+ function solde($year = 0) {
$sql = "SELECT sum(f.amount) as amount";
$sql .= " FROM ".MAIN_DB_PREFIX."chargesociales as f WHERE paye = 0";
@@ -204,7 +204,7 @@ class ChargeSociales {
* Tag la charge comme payée complètement
*
*/
- Function set_payed($rowid)
+ function set_payed($rowid)
{
$sql = "UPDATE ".MAIN_DB_PREFIX."chargesociales set paye=1 WHERE rowid = $rowid ;";
$return = $this->db->query( $sql);
@@ -215,7 +215,7 @@ class ChargeSociales {
* Renvoi le staut sous forme de libellé d'une charge
*
*/
- Function getLibStatut() {
+ function getLibStatut() {
if ($this->paye == 0) { return "Non Payé"; }
else { return "Payé"; }
}
diff --git a/htdocs/contact.class.php b/htdocs/contact.class.php
index c075be76f3e..b5a28aea865 100644
--- a/htdocs/contact.class.php
+++ b/htdocs/contact.class.php
@@ -36,7 +36,7 @@ class Contact
var $email;
var $birthday;
- Function Contact($DB, $id=0)
+ function Contact($DB, $id=0)
{
$this->db = $DB;
$this->id = $id;
@@ -48,7 +48,7 @@ class Contact
* Création du contact
*
*/
- Function create($user)
+ function create($user)
{
if (!$this->socid)
{
@@ -75,7 +75,7 @@ class Contact
* Mise à jour des infos
*
*/
- Function update($id, $user=0)
+ function update($id, $user=0)
{
$this->id = $id;
$this->error = array();
@@ -131,7 +131,7 @@ class Contact
*
*/
- Function update_ldap($user)
+ function update_ldap($user)
{
$this->fetch($this->id);
@@ -255,7 +255,7 @@ class Contact
* Mise à jour des infos persos
*
*/
- Function update_perso($id, $user=0)
+ function update_perso($id, $user=0)
{
# Mis a jour contact
$sql = "UPDATE ".MAIN_DB_PREFIX."socpeople SET idp=$id ";
@@ -300,7 +300,7 @@ class Contact
*
*
*/
- Function fetch($_id, $user=0)
+ function fetch($_id, $user=0)
{
$sql = "SELECT c.idp, c.fk_soc, c.civilite civilite_id, c.name, c.firstname, c.address, c.birthday as birthday, poste, phone, phone_perso, phone_mobile, fax, c.email, jabberid, c.note";
$sql .= " FROM ".MAIN_DB_PREFIX."socpeople as c";
@@ -391,7 +391,7 @@ class Contact
*
*
*/
- Function delete($id)
+ function delete($id)
{
$sql = "DELETE FROM ".MAIN_DB_PREFIX."socpeople";
$sql .= " WHERE idp=$id";
@@ -439,7 +439,7 @@ class Contact
* Information sur l'objet
*
*/
- Function info($id)
+ function info($id)
{
$sql = "SELECT c.idp, ".$this->db->pdate("datec")." as datec, fk_user";
$sql .= ", ".$this->db->pdate("tms")." as tms, fk_user_modif";
diff --git a/htdocs/cyberpaiement.class.php b/htdocs/cyberpaiement.class.php
index 4b498543da9..c706af66219 100644
--- a/htdocs/cyberpaiement.class.php
+++ b/htdocs/cyberpaiement.class.php
@@ -28,7 +28,7 @@
class Cyberpaiement
{
- Function Cyberpaiement($conf)
+ function Cyberpaiement($conf)
/*
* Initialisation des valeurs par défaut
*/
@@ -104,7 +104,7 @@ class Cyberpaiement
/* */
/* ********************** */
- Function set_client($nom,$prenom,$email,$societe='')
+ function set_client($nom,$prenom,$email,$societe='')
{
/* Nom */
@@ -165,7 +165,7 @@ class Cyberpaiement
/* */
/* ********************** */
- Function set_commande($ref, $montant)
+ function set_commande($ref, $montant)
{
/* Référence */
@@ -180,7 +180,7 @@ class Cyberpaiement
*
*
*/
- Function print_hidden()
+ function print_hidden()
{
print '';
print "\n";
diff --git a/htdocs/don.class.php b/htdocs/don.class.php
index 70eecd03329..eb245ed4af7 100644
--- a/htdocs/don.class.php
+++ b/htdocs/don.class.php
@@ -52,7 +52,7 @@ class Don
*
*
*/
- Function Don($DB, $soc_idp="")
+ function Don($DB, $soc_idp="")
{
$this->db = $DB ;
$this->modepaiementid = 0;
@@ -62,7 +62,7 @@ class Don
*
*
*/
- Function print_error_list()
+ function print_error_list()
{
$num = sizeof($this->errorstr);
for ($i = 0 ; $i < $num ; $i++)
@@ -74,7 +74,7 @@ class Don
*
*
*/
- Function check($minimum=0)
+ function check($minimum=0)
{
$err = 0;
@@ -163,7 +163,7 @@ class Don
*
*
*/
- Function create($userid)
+ function create($userid)
{
/*
* Insertion dans la base
@@ -193,7 +193,7 @@ class Don
*
*
*/
- Function update($userid)
+ function update($userid)
{
$this->date = $this->db->idate($this->date);
@@ -235,7 +235,7 @@ class Don
* Suppression du don
*
*/
- Function delete($rowid)
+ function delete($rowid)
{
@@ -263,7 +263,7 @@ class Don
*
*
*/
- Function fetch($rowid)
+ function fetch($rowid)
{
$sql = "SELECT d.rowid, ".$this->db->pdate("d.datedon")." as datedon, d.prenom, d.nom, d.societe, d.amount, p.libelle as projet, d.fk_statut, d.adresse, d.cp, d.ville, d.pays, d.public, d.amount, d.fk_paiement, d.note, cp.libelle, d.email, d.fk_don_projet";
$sql .= " FROM ".MAIN_DB_PREFIX."don as d, ".MAIN_DB_PREFIX."don_projet as p, ".MAIN_DB_PREFIX."c_paiement as cp";
@@ -306,7 +306,7 @@ class Don
* Suppression du don
*
*/
- Function valid_promesse($rowid, $userid)
+ function valid_promesse($rowid, $userid)
{
$sql = "UPDATE ".MAIN_DB_PREFIX."don SET fk_statut = 1, fk_user_valid = $userid WHERE rowid = $rowid AND fk_statut = 0;";
@@ -332,7 +332,7 @@ class Don
* Classé comme payé, le don a été recu
*
*/
- Function set_paye($rowid, $modepaiement='')
+ function set_paye($rowid, $modepaiement='')
{
$sql = "UPDATE ".MAIN_DB_PREFIX."don SET fk_statut = 2";
@@ -363,7 +363,7 @@ class Don
*
*
*/
- Function set_commentaire($rowid, $commentaire='')
+ function set_commentaire($rowid, $commentaire='')
{
$sql = "UPDATE ".MAIN_DB_PREFIX."don SET note = '$commentaire'";
@@ -390,7 +390,7 @@ class Don
* Classé comme encaissé
*
*/
- Function set_encaisse($rowid)
+ function set_encaisse($rowid)
{
$sql = "UPDATE ".MAIN_DB_PREFIX."don SET fk_statut = 3 WHERE rowid = $rowid AND fk_statut = 2;";
@@ -415,7 +415,7 @@ class Don
/*
* Somme des dons encaissés
*/
- Function sum_actual()
+ function sum_actual()
{
$sql = "SELECT sum(amount)";
$sql .= " FROM ".MAIN_DB_PREFIX."don";
@@ -433,7 +433,7 @@ class Don
*
*
*/
- Function sum_pending()
+ function sum_pending()
{
$sql = "SELECT sum(amount)";
$sql .= " FROM ".MAIN_DB_PREFIX."don";
@@ -451,7 +451,7 @@ class Don
* Somme des promesses de dons validées
*
*/
- Function sum_intent()
+ function sum_intent()
{
$sql = "SELECT sum(amount)";
$sql .= " FROM ".MAIN_DB_PREFIX."don";
diff --git a/htdocs/facturefourn.class.php b/htdocs/facturefourn.class.php
index e45598fab68..b1c6a6ec3a3 100644
--- a/htdocs/facturefourn.class.php
+++ b/htdocs/facturefourn.class.php
@@ -46,7 +46,7 @@ class FactureFourn
* Initialisation
*
*/
- Function FactureFourn($DB, $soc_idp="", $facid="")
+ function FactureFourn($DB, $soc_idp="", $facid="")
{
$this->db = $DB ;
$this->socidp = $soc_idp;
@@ -66,7 +66,7 @@ class FactureFourn
* Création d'une facture fournisseur
*
*/
- Function create($user)
+ function create($user)
{
/*
@@ -136,7 +136,7 @@ class FactureFourn
*
*
*/
- Function fetch($rowid)
+ function fetch($rowid)
{
$sql = "SELECT fk_soc,libelle,facnumber,amount,remise,".$this->db->pdate(datef)."as df";
$sql .= ", total_ht, total_tva, total_ttc, fk_user_author";
@@ -215,7 +215,7 @@ class FactureFourn
* Suppression de la facture
*
*/
- Function delete($rowid)
+ function delete($rowid)
{
$sql = "DELETE FROM ".MAIN_DB_PREFIX."facture_fourn WHERE rowid = $rowid AND fk_statut = 0";
@@ -248,7 +248,7 @@ class FactureFourn
* Passe une facture fournisseur a l'état validé
*
*/
- Function set_valid($userid)
+ function set_valid($userid)
{
$sql = "UPDATE ".MAIN_DB_PREFIX."facture_fourn set fk_statut = 1, fk_user_valid = $userid WHERE rowid = ".$this->id;
$result = $this->db->query( $sql);
@@ -261,7 +261,7 @@ class FactureFourn
* Passe une facture fournisseur a l'état payé
*
*/
- Function set_payed($userid)
+ function set_payed($userid)
{
$sql = "UPDATE ".MAIN_DB_PREFIX."facture_fourn set paye = 1 WHERE rowid = ".$this->id;
$result = $this->db->query( $sql);
@@ -275,7 +275,7 @@ class FactureFourn
* Ajoute une ligne dans la facture
*
*/
- Function addline($desc, $pu, $tauxtva, $qty)
+ function addline($desc, $pu, $tauxtva, $qty)
{
$sql = "INSERT INTO ".MAIN_DB_PREFIX."facture_fourn_det (fk_facture_fourn)";
@@ -299,7 +299,7 @@ class FactureFourn
* Mise a jour ligne facture fourn
*
*/
- Function updateline($id, $label, $puht, $tauxtva, $qty=1)
+ function updateline($id, $label, $puht, $tauxtva, $qty=1)
{
if (is_numeric($puht) && is_numeric($qty))
{
@@ -331,7 +331,7 @@ class FactureFourn
* Supprime une ligne de la facture
*
*/
- Function deleteline($rowid)
+ function deleteline($rowid)
{
// Supprime ligne
$sql = "DELETE FROM ".MAIN_DB_PREFIX."facture_fourn_det ";
@@ -351,7 +351,7 @@ class FactureFourn
*Mets à jour le prix total de la facture
*
*/
- Function updateprice($facid)
+ function updateprice($facid)
{
$total_ht = 0;
$total_tva = 0;
@@ -401,7 +401,7 @@ class FactureFourn
* Génération du PDF
*
*/
- Function pdf()
+ function pdf()
{
}
@@ -410,7 +410,7 @@ class FactureFourn
* Renvoi un libellé du statut
*
*/
- Function LibStatut($paye,$statut)
+ function LibStatut($paye,$statut)
{
if (! $paye)
{
diff --git a/htdocs/graph.class.php b/htdocs/graph.class.php
index a86a27b367e..b2dc42794e3 100644
--- a/htdocs/graph.class.php
+++ b/htdocs/graph.class.php
@@ -28,7 +28,7 @@ class Graph
* Prépare le graphique
*
*/
- Function prepare($file, $data, $title='')
+ function prepare($file, $data, $title='')
{
//Define the object
$this->graph = new PHPlot($this->width, $this->height);
@@ -115,53 +115,53 @@ class Graph
// $this->graph->DrawGraph();
}
- Function SetPrecisionY($which_prec)
+ function SetPrecisionY($which_prec)
{
$this->precision_y = $which_prec;
return true;
}
- Function SetYLabel($label)
+ function SetYLabel($label)
{
$this->YLabel = $label;
}
- Function SetWidth($w)
+ function SetWidth($w)
{
$this->width = $w;
}
- Function SetLegend($legend)
+ function SetLegend($legend)
{
$this->Legend = $legend;
}
- Function SetMaxValue($max)
+ function SetMaxValue($max)
{
$this->MaxValue = $max;
}
- Function SetHeight($h)
+ function SetHeight($h)
{
$this->height = $h;
}
- Function ResetBgColor()
+ function ResetBgColor()
{
unset($this->bgcolor);
}
- Function SetBgColor($bg_color = array(255,255,255))
+ function SetBgColor($bg_color = array(255,255,255))
{
$this->bgcolor = $bg_color;
}
- Function ResetDataColor()
+ function ResetDataColor()
{
unset($this->datacolor);
}
- Function GetMaxValue()
+ function GetMaxValue()
{
$k = 0;
$vals = array();
@@ -181,7 +181,7 @@ class Graph
return $vals[0];
}
- Function GetAmountMaxValue()
+ function GetAmountMaxValue()
{
$max = ceil($this->GetMaxValue());
diff --git a/htdocs/html.form.class.php b/htdocs/html.form.class.php
index 0fb532536e5..57a389415f5 100644
--- a/htdocs/html.form.class.php
+++ b/htdocs/html.form.class.php
@@ -27,7 +27,7 @@ class Form
var $errorstr;
- Function Form($DB)
+ function Form($DB)
{
$this->db = $DB;
@@ -40,7 +40,7 @@ class Form
* avec un affichage avec rupture sur le pays
*
*/
- Function select_departement($selected='')
+ function select_departement($selected='')
{
// On recherche les départements/cantons/province active d'une region et pays actif
$sql = "SELECT d.rowid, d.code_departement as code , d.nom, d.active, p.libelle as libelle_pays, p.code as code_pays FROM ";
@@ -93,7 +93,7 @@ class Form
* Retourne la liste déroulante des pays actifs
*
*/
- Function select_pays($selected='')
+ function select_pays($selected='')
{
$sql = "SELECT rowid, libelle, active FROM ".MAIN_DB_PREFIX."c_pays";
$sql .= " WHERE active = 1 ORDER BY libelle ASC";
@@ -127,7 +127,7 @@ class Form
* Retourne la liste déroulante des sociétés
*
*/
- Function select_societes($selected='',$htmlname='soc_id')
+ function select_societes($selected='',$htmlname='soc_id')
{
// On recherche les societes
$sql = "SELECT s.idp, s.nom FROM ";
@@ -166,7 +166,7 @@ class Form
* Retourne la liste déroulante des contacts d'une société donnée
*
*/
- Function select_contacts($socid,$selected='',$htmlname='contactid')
+ function select_contacts($socid,$selected='',$htmlname='contactid')
{
// On recherche les societes
$sql = "SELECT s.idp, s.name, s.firstname FROM ";
@@ -208,7 +208,7 @@ class Form
* Retourne le nom d'un pays
*
*/
- Function pays_name($id)
+ function pays_name($id)
{
$sql = "SELECT rowid, libelle FROM ".MAIN_DB_PREFIX."c_pays";
$sql .= " WHERE rowid=$id";
@@ -237,7 +237,7 @@ class Form
*
*/
- Function select_civilite($selected='')
+ function select_civilite($selected='')
{
$sql = "SELECT rowid, civilite, active FROM ".MAIN_DB_PREFIX."c_civilite";
$sql .= " WHERE active = 1";
@@ -276,7 +276,7 @@ class Form
* avec un affichage avec rupture sur le pays
*
*/
- Function select_forme_juridique($selected='')
+ function select_forme_juridique($selected='')
{
// On recherche les formes juridiques actives des pays actifs
$sql = "SELECT f.rowid, f.code as code , f.libelle as nom, f.active, p.libelle as libelle_pays, p.code as code_pays FROM llx_c_forme_juridique as f, llx_c_pays as p";
@@ -328,7 +328,7 @@ class Form
*
*
*/
- Function form_confirm($page, $title, $question, $action)
+ function form_confirm($page, $title, $question, $action)
{
global $langs;
@@ -350,7 +350,7 @@ class Form
*
*
*/
- Function select_tva($name='', $defaulttx = '')
+ function select_tva($name='', $defaulttx = '')
{
if (! strlen(trim($name)))
{
@@ -401,7 +401,7 @@ class Form
* - La date du jour si set_time vaut ''
* - Aucune date (champs vides) si set_time vaut -1
*/
- Function select_date($set_time='', $prefix='re', $h = 0, $m = 0, $empty=0)
+ function select_date($set_time='', $prefix='re', $h = 0, $m = 0, $empty=0)
{
if (! $set_time && ! $empty)
{
@@ -559,7 +559,7 @@ class Form
*
*
*/
- Function select($name, $sql, $id='')
+ function select($name, $sql, $id='')
{
$result = $this->db->query($sql);
@@ -612,7 +612,7 @@ class Form
\param 1 si il faut un valeur "-" dans la liste, 0 sinon
\param 1 pour affiche la key dans la valeur "[key] value"
*/
- Function select_array($name, $array, $id='', $empty=0, $key_libelle=0)
+ function select_array($name, $array, $id='', $empty=0, $key_libelle=0)
{
print '