" . $this->errorstr[$i];
}
- }
}
-
- /*
- * Return errors
- *
- */
- if ($err)
+ /*
+ *
+ *
+ */
+ function check($minimum=0)
{
- $this->errorstr = $error_string;
- return 0;
- }
- else
- {
- return 1;
+ $err = 0;
+
+ if (strlen(trim($this->societe)) == 0)
+ {
+ if ((strlen(trim($this->nom)) + strlen(trim($this->prenom))) == 0)
+ {
+ $error_string[$err] = "Vous devez saisir vos nom et prénom ou le nom de votre société.";
+ $err++;
+ }
+ }
+
+ if (strlen(trim($this->adresse)) == 0)
+ {
+ $error_string[$err] = "L'adresse saisie est invalide";
+ $err++;
+ }
+
+ if (strlen(trim($this->cp)) == 0)
+ {
+ $error_string[$err] = "Le code postal saisi est invalide";
+ $err++;
+ }
+
+ if (strlen(trim($this->ville)) == 0)
+ {
+ $error_string[$err] = "La ville saisie est invalide";
+ $err++;
+ }
+
+ if (strlen(trim($this->email)) == 0)
+ {
+ $error_string[$err] = "L'email saisi est invalide";
+ $err++;
+ }
+
+ $this->amount = trim($this->amount);
+
+ $map = range(0,9);
+ for ($i = 0; $i < strlen($this->amount) ; $i++)
+ {
+ if (!isset($map[substr($this->amount, $i, 1)] ))
+ {
+ $error_string[$err] = "Le montant du don contient un/des caractère(s) invalide(s)";
+ $err++;
+ $amount_invalid = 1;
+ break;
+ }
+ }
+
+ if (! $amount_invalid)
+ {
+ if ($this->amount == 0)
+ {
+ $error_string[$err] = "Le montant du don est null";
+ $err++;
+ }
+ else
+ {
+ if ($this->amount < $minimum && $minimum > 0)
+ {
+ $error_string[$err] = "Le montant minimum du don est de $minimum";
+ $err++;
+ }
+ }
+ }
+
+ /*
+ * Return errors
+ *
+ */
+
+ if ($err)
+ {
+ $this->errorstr = $error_string;
+ return 0;
+ }
+ else
+ {
+ return 1;
+ }
+
}
- }
-
-/*!
+ /**
\brief fonction qui permet de créer le don
\param userid userid de l'adhérent
-*/
-
+ */
function create($userid)
- {
- /*
- * Insertion dans la base
- */
-
- $this->date = $this->db->idate($this->date);
-
- $sql = "INSERT INTO ".MAIN_DB_PREFIX."don (datec, amount, fk_paiement,prenom, nom, societe,adresse, cp, ville, pays, public, fk_don_projet, note, fk_user_author, datedon, email)";
- $sql .= " VALUES (now(), $this->amount, $this->modepaiementid,'$this->prenom','$this->nom','$this->societe','$this->adresse', '$this->cp','$this->ville','$this->pays',$this->public, $this->projetid, '$this->commentaire', $userid, '$this->date','$this->email')";
-
- $result = $this->db->query($sql);
-
- if ($result)
{
- return $this->db->last_insert_id(MAIN_DB_PREFIX."don");
+ /*
+ * Insertion dans la base
+ */
+
+ $this->date = $this->db->idate($this->date);
+
+ $sql = "INSERT INTO ".MAIN_DB_PREFIX."don (datec, amount, fk_paiement,prenom, nom, societe,adresse, cp, ville, pays, public, fk_don_projet, note, fk_user_author, datedon, email)";
+ $sql .= " VALUES (now(), $this->amount, $this->modepaiementid,'$this->prenom','$this->nom','$this->societe','$this->adresse', '$this->cp','$this->ville','$this->pays',$this->public, $this->projetid, '$this->commentaire', $userid, '$this->date','$this->email')";
+
+ $result = $this->db->query($sql);
+
+ if ($result)
+ {
+ return $this->db->last_insert_id(MAIN_DB_PREFIX."don");
+ }
+ else
+ {
+ dolibarr_print_error($this->db);
+ return 0;
+ }
}
- else
+
+ /*!
+ \brief fonction qui permet de mettre à jour le don
+ \param userid userid de l'adhérent
+ */
+
+ function update($userid)
{
- dolibarr_print_error($this->db);
- return 0;
- }
- }
-/*!
- \brief fonction qui permet de mettre à jour le don
- \param userid userid de l'adhérent
-*/
+ $this->date = $this->db->idate($this->date);
- function update($userid)
- {
-
- $this->date = $this->db->idate($this->date);
+ $sql = "UPDATE ".MAIN_DB_PREFIX."don SET ";
+ $sql .= "amount = " . $this->amount;
+ $sql .= ",fk_paiement = ".$this->modepaiementid;
+ $sql .= ",prenom = '".$this->prenom ."'";
+ $sql .= ",nom='".$this->nom."'";
+ $sql .= ",societe='".$this->societe."'";
+ $sql .= ",adresse='".$this->adresse."'";
+ $sql .= ",cp='".$this->cp."'";
+ $sql .= ",ville='".$this->ville."'";
+ $sql .= ",pays='".$this->pays."'";
+ $sql .= ",public=".$this->public;
+ $sql .= ",fk_don_projet=".$this->projetid;
+ $sql .= ",note='".$this->commentaire."'";
+ $sql .= ",datedon='".$this->date."'";
+ $sql .= ",email='".$this->email."'";
+ $sql .= ",fk_statut=".$this->statut;
- $sql = "UPDATE ".MAIN_DB_PREFIX."don SET ";
- $sql .= "amount = " . $this->amount;
- $sql .= ",fk_paiement = ".$this->modepaiementid;
- $sql .= ",prenom = '".$this->prenom ."'";
- $sql .= ",nom='".$this->nom."'";
- $sql .= ",societe='".$this->societe."'";
- $sql .= ",adresse='".$this->adresse."'";
- $sql .= ",cp='".$this->cp."'";
- $sql .= ",ville='".$this->ville."'";
- $sql .= ",pays='".$this->pays."'";
- $sql .= ",public=".$this->public;
- $sql .= ",fk_don_projet=".$this->projetid;
- $sql .= ",note='".$this->commentaire."'";
- $sql .= ",datedon='".$this->date."'";
- $sql .= ",email='".$this->email."'";
- $sql .= ",fk_statut=".$this->statut;
+ $sql .= " WHERE rowid = $this->id";
- $sql .= " WHERE rowid = $this->id";
-
- $result = $this->db->query($sql);
-
- if ($result)
- {
- return 1;
+ $result = $this->db->query($sql);
+
+ if ($result)
+ {
+ return 1;
+ }
+ else
+ {
+ dolibarr_print_error($this->db);
+ return 0;
+ }
}
- else
+
+ /*!
+ \brief fonction qui permet de supprimer le don
+ \param rowid
+ */
+
+ function delete($rowid)
+
{
- dolibarr_print_error($this->db);
- return 0;
- }
- }
- /*!
- \brief fonction qui permet de supprimer le don
- \param rowid
- */
+ $sql = "DELETE FROM ".MAIN_DB_PREFIX."don WHERE rowid = $rowid AND fk_statut = 0;";
- function delete($rowid)
+ if ( $this->db->query( $sql) )
+ {
+ if ( $this->db->affected_rows() )
+ {
+ return 1;
+ }
+ else
+ {
+ return 0;
+ }
+ }
+ else
+ {
+ dolibarr_print_error($this->db);
+ return 0;
+ }
+ }
- {
+ /*!
+ \brief fonction qui permet de récupèrer le don
+ \param rowid
+ */
- $sql = "DELETE FROM ".MAIN_DB_PREFIX."don WHERE rowid = $rowid AND fk_statut = 0;";
+ 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";
- if ( $this->db->query( $sql) )
- {
- if ( $this->db->affected_rows() )
- {
- return 1;
- }
- else
- {
- return 0;
- }
- }
- else
- {
- dolibarr_print_error($this->db);
- return 0;
- }
- }
+ $sql .= " WHERE p.rowid = d.fk_don_projet AND cp.id = d.fk_paiement AND d.rowid = $rowid";
- /*!
- \brief fonction qui permet de récupèrer le don
- \param rowid
- */
+ if ( $this->db->query( $sql) )
+ {
+ if ($this->db->num_rows())
+ {
- 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";
+ $obj = $this->db->fetch_object();
- $sql .= " WHERE p.rowid = d.fk_don_projet AND cp.id = d.fk_paiement AND d.rowid = $rowid";
+ $this->id = $obj->rowid;
+ $this->date = $obj->datedon;
+ $this->prenom = stripslashes($obj->prenom);
+ $this->nom = stripslashes($obj->nom);
+ $this->societe = stripslashes($obj->societe);
+ $this->statut = $obj->fk_statut;
+ $this->adresse = stripslashes($obj->adresse);
+ $this->cp = stripslashes($obj->cp);
+ $this->ville = stripslashes($obj->ville);
+ $this->email = stripslashes($obj->email);
+ $this->pays = stripslashes($obj->pays);
+ $this->projet = $obj->projet;
+ $this->projetid = $obj->fk_don_projet;
+ $this->public = $obj->public;
+ $this->modepaiementid = $obj->fk_paiement;
+ $this->modepaiement = $obj->libelle;
+ $this->amount = $obj->amount;
+ $this->commentaire = stripslashes($obj->note);
+ }
+ }
+ else
+ {
+ print $this->db->error();
+ }
- if ( $this->db->query( $sql) )
- {
- if ($this->db->num_rows())
- {
+ }
- $obj = $this->db->fetch_object();
+ /*!
+ \brief fonction qui permet de valider la promesse de don
+ \param rowid
+ \param userid userid de l'adhérent
+ */
- $this->id = $obj->rowid;
- $this->date = $obj->datedon;
- $this->prenom = stripslashes($obj->prenom);
- $this->nom = stripslashes($obj->nom);
- $this->societe = stripslashes($obj->societe);
- $this->statut = $obj->fk_statut;
- $this->adresse = stripslashes($obj->adresse);
- $this->cp = stripslashes($obj->cp);
- $this->ville = stripslashes($obj->ville);
- $this->email = stripslashes($obj->email);
- $this->pays = stripslashes($obj->pays);
- $this->projet = $obj->projet;
- $this->projetid = $obj->fk_don_projet;
- $this->public = $obj->public;
- $this->modepaiementid = $obj->fk_paiement;
- $this->modepaiement = $obj->libelle;
- $this->amount = $obj->amount;
- $this->commentaire = stripslashes($obj->note);
- }
- }
- else
- {
- print $this->db->error();
- }
+ 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;";
- /*!
- \brief fonction qui permet de valider la promesse de don
- \param rowid
- \param userid userid de l'adhérent
- */
+ if ( $this->db->query( $sql) )
+ {
+ if ( $this->db->affected_rows() )
+ {
+ return 1;
+ }
+ else
+ {
+ return 0;
+ }
+ }
+ else
+ {
+ dolibarr_print_error($this->db);
+ return 0;
+ }
+ }
- 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;";
-
- if ( $this->db->query( $sql) )
- {
- if ( $this->db->affected_rows() )
- {
- return 1;
- }
- else
- {
- return 0;
- }
- }
- else
- {
- dolibarr_print_error($this->db);
- return 0;
- }
- }
-
- /*!
- \brief fonction qui permet de définir la cotisation comme payée
- \param rowid rowid de la cotisation
- \param modepaiement mode de paiement
- */
+ /*!
+ \brief fonction qui permet de définir la cotisation comme payée
+ \param rowid rowid de la cotisation
+ \param modepaiement mode de paiement
+ */
function set_paye($rowid, $modepaiement='')
- {
- $sql = "UPDATE ".MAIN_DB_PREFIX."don SET fk_statut = 2";
+ {
+ $sql = "UPDATE ".MAIN_DB_PREFIX."don SET fk_statut = 2";
- if ($modepaiement)
- {
- $sql .= ", fk_paiement=$modepaiement";
- }
- $sql .= " WHERE rowid = $rowid AND fk_statut = 1;";
+ if ($modepaiement)
+ {
+ $sql .= ", fk_paiement=$modepaiement";
+ }
+ $sql .= " WHERE rowid = $rowid AND fk_statut = 1;";
- if ( $this->db->query( $sql) )
- {
- if ( $this->db->affected_rows() )
- {
- return 1;
- }
- else
- {
- return 0;
- }
- }
- else
- {
- dolibarr_print_error($this->db);
- return 0;
- }
- }
+ if ( $this->db->query( $sql) )
+ {
+ if ( $this->db->affected_rows() )
+ {
+ return 1;
+ }
+ else
+ {
+ return 0;
+ }
+ }
+ else
+ {
+ dolibarr_print_error($this->db);
+ return 0;
+ }
+ }
- /*!
- \brief fonction qui permet de mettre un commentaire sur le don
- \param rowid
- \param commentaire
- */
+ /*!
+ \brief fonction qui permet de mettre un commentaire sur le don
+ \param rowid
+ \param commentaire
+ */
- function set_commentaire($rowid, $commentaire='')
- {
- $sql = "UPDATE ".MAIN_DB_PREFIX."don SET note = '$commentaire'";
+ function set_commentaire($rowid, $commentaire='')
+ {
+ $sql = "UPDATE ".MAIN_DB_PREFIX."don SET note = '$commentaire'";
- $sql .= " WHERE rowid = $rowid ;";
+ $sql .= " WHERE rowid = $rowid ;";
- if ( $this->db->query( $sql) )
- {
- if ( $this->db->affected_rows() )
- {
- return 1;
- }
- else
- {
- return 0;
- }
- }
- else
- {
- dolibarr_print_error($this->db);
- return 0;
- }
- }
+ if ( $this->db->query( $sql) )
+ {
+ if ( $this->db->affected_rows() )
+ {
+ return 1;
+ }
+ else
+ {
+ return 0;
+ }
+ }
+ else
+ {
+ dolibarr_print_error($this->db);
+ return 0;
+ }
+ }
- /*!
- \brief fonction qui permet de mettre le don comme encaissé
- \param rowid
- */
+ /*!
+ \brief fonction qui permet de mettre le don comme encaiss
+ \param rowid
+ */
function set_encaisse($rowid)
- {
+ {
- $sql = "UPDATE ".MAIN_DB_PREFIX."don SET fk_statut = 3 WHERE rowid = $rowid AND fk_statut = 2;";
+ $sql = "UPDATE ".MAIN_DB_PREFIX."don SET fk_statut = 3 WHERE rowid = $rowid AND fk_statut = 2;";
- if ( $this->db->query( $sql) )
- {
- if ( $this->db->affected_rows() )
- {
- return 1;
- }
- else
- {
- return 0;
- }
- }
- else
- {
- dolibarr_print_error($this->db);
- return 0;
- }
- }
+ if ( $this->db->query( $sql) )
+ {
+ if ( $this->db->affected_rows() )
+ {
+ return 1;
+ }
+ else
+ {
+ return 0;
+ }
+ }
+ else
+ {
+ dolibarr_print_error($this->db);
+ return 0;
+ }
+ }
}
diff --git a/htdocs/bon-prelevement.class.php b/htdocs/bon-prelevement.class.php
index 338f2f49ea8..b5f27a37cdb 100644
--- a/htdocs/bon-prelevement.class.php
+++ b/htdocs/bon-prelevement.class.php
@@ -752,7 +752,7 @@ class BonPrelevement
if ($fact->fetch($fac[0]) >= 0)
{
$soc = new Societe($this->db);
- if ($soc->fetch($fact->socidp) >= 0)
+ if ($soc->fetch($fact->socid) >= 0)
{
if ($soc->verif_rib() == 1)
{
@@ -763,8 +763,8 @@ class BonPrelevement
}
else
{
- dolibarr_syslog("Erreur de RIB societe $fact->socidp $soc->nom");
- $facture_errors[$fac[0]]="Erreur de RIB societe $fact->socidp $soc->nom";
+ dolibarr_syslog("Erreur de RIB societe $fact->socid $soc->nom");
+ $facture_errors[$fac[0]]="Erreur de RIB societe $fact->socid $soc->nom";
}
}
else
diff --git a/htdocs/comm/action/document.php b/htdocs/comm/action/document.php
index 0d0a6f04c95..3b28f6a746b 100755
--- a/htdocs/comm/action/document.php
+++ b/htdocs/comm/action/document.php
@@ -47,7 +47,7 @@ $upload_dir = $conf->actions->dir_output.'/'.$_GET['id'];
if ($user->societe_id > 0)
{
$action = '';
- $socidp = $user->societe_id;
+ $socid = $user->societe_id;
}
diff --git a/htdocs/comm/action/fiche.php b/htdocs/comm/action/fiche.php
index a8532d3e581..01bdd400474 100644
--- a/htdocs/comm/action/fiche.php
+++ b/htdocs/comm/action/fiche.php
@@ -43,7 +43,7 @@ $langs->load("orders");
if ($user->societe_id > 0)
{
$action = '';
- $socidp = $user->societe_id;
+ $socid = $user->societe_id;
}
if (isset($_GET["error"])) $error=$_GET["error"];
diff --git a/htdocs/comm/action/index.php b/htdocs/comm/action/index.php
index 87f8aa12438..43004611ebc 100644
--- a/htdocs/comm/action/index.php
+++ b/htdocs/comm/action/index.php
@@ -34,7 +34,7 @@ require_once(DOL_DOCUMENT_ROOT."/actioncomm.class.php");
$langs->load("companies");
-$socidp = isset($_GET["socid"])?$_GET["socid"]:$_POST["socid"];
+$socid = isset($_GET["socid"])?$_GET["socid"]:$_POST["socid"];
$sortfield = isset($_GET["sortfield"])?$_GET["sortfield"]:$_POST["sortfield"];
$sortorder = isset($_GET["sortorder"])?$_GET["sortorder"]:$_POST["sortorder"];
$page = isset($_GET["page"])?$_GET["page"]:$_POST["page"];
@@ -43,7 +43,7 @@ $page = isset($_GET["page"])?$_GET["page"]:$_POST["page"];
if ($user->societe_id > 0)
{
$action = '';
- $socidp = $user->societe_id;
+ $socid = $user->societe_id;
}
if ($page == -1) { $page = 0 ; }
@@ -62,12 +62,12 @@ llxHeader();
*
*/
-$sql = "SELECT s.nom as societe, s.idp as socidp, s.client,";
+$sql = "SELECT s.nom as societe, s.idp as socid, s.client,";
$sql.= " a.id,".$db->pdate("a.datep")." as dp, a.fk_contact, a.note, a.percent as percent,";
$sql.= " c.code as acode, c.libelle, u.code, u.rowid as userid";
-if (!$user->rights->commercial->client->voir && !$socidp) $sql .= ", sc.fk_soc, sc.fk_user";
+if (!$user->rights->commercial->client->voir && !$socid) $sql .= ", sc.fk_soc, sc.fk_user";
$sql.= " FROM ".MAIN_DB_PREFIX."actioncomm as a, ".MAIN_DB_PREFIX."c_actioncomm as c, ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."user as u";
-if (!$user->rights->commercial->client->voir && !$socidp) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+if (!$user->rights->commercial->client->voir && !$socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
$sql.= " WHERE a.fk_soc = s.idp AND c.id=a.fk_action AND a.fk_user_author = u.rowid";
if ($_GET["type"])
{
@@ -77,11 +77,11 @@ if ($_GET["time"] == "today")
{
$sql .= " AND date_format(a.datep, '%d%m%Y') = ".strftime("%d%m%Y",time());
}
-if ($socidp)
+if ($socid)
{
- $sql .= " AND s.idp = $socidp";
+ $sql .= " AND s.idp = $socid";
}
-if (!$user->rights->commercial->client->voir && !$socidp) //restriction
+if (!$user->rights->commercial->client->voir && !$socid) //restriction
{
$sql .= " AND s.idp = sc.fk_soc AND sc.fk_user = " .$user->id;
}
@@ -101,10 +101,10 @@ if ($resql)
if ($status == 'todo') $title="ToDoActions";
$param="&status=$status";
- if ($socidp)
+ if ($socid)
{
$societe = new Societe($db);
- $societe->fetch($socidp);
+ $societe->fetch($socid);
print_barre_liste($langs->trans($title."For",$societe->nom), $page, "index.php",$param,$sortfield,$sortorder,'',$num);
}
@@ -178,7 +178,7 @@ if ($resql)
if ($obj->client == 1) $url=DOL_URL_ROOT.'/comm/fiche.php?socid=';
elseif ($obj->client == 2) $url=DOL_URL_ROOT.'/comm/prospect/fiche.php?id=';
else $url=DOL_URL_ROOT.'/soc.php?socid=';
- print ' '.img_object($langs->trans("ShowCompany"),"company").' '.dolibarr_trunc($obj->societe,24).' ';
+ print ' '.img_object($langs->trans("ShowCompany"),"company").' '.dolibarr_trunc($obj->societe,24).' ';
// Contact
print '';
diff --git a/htdocs/comm/action/info.php b/htdocs/comm/action/info.php
index 0cc2f099b16..ab62bb43565 100644
--- a/htdocs/comm/action/info.php
+++ b/htdocs/comm/action/info.php
@@ -38,7 +38,7 @@ $langs->load("commercial");
if ($user->societe_id > 0)
{
$action = '';
- $socidp = $user->societe_id;
+ $socid = $user->societe_id;
}
diff --git a/htdocs/comm/action/rapport/rapport.pdf.php b/htdocs/comm/action/rapport/rapport.pdf.php
index e77c5e1bb53..de49b01bf4c 100644
--- a/htdocs/comm/action/rapport/rapport.pdf.php
+++ b/htdocs/comm/action/rapport/rapport.pdf.php
@@ -149,7 +149,7 @@ class CommActionRapport
$pdf->SetFont('Arial','',8);
$y=$pdf->GetY()+1;
- $sql = "SELECT s.nom as societe, s.idp as socidp, s.client, a.id,".$this->db->pdate("a.datea")." as da, a.datea, c.libelle, u.code, a.fk_contact, a.note, a.percent as percent";
+ $sql = "SELECT s.nom as societe, s.idp as socid, s.client, a.id,".$this->db->pdate("a.datea")." as da, a.datea, c.libelle, u.code, a.fk_contact, a.note, a.percent as percent";
$sql .= " FROM ".MAIN_DB_PREFIX."actioncomm as a, ".MAIN_DB_PREFIX."c_actioncomm as c, ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."user as u";
$sql .= " WHERE a.fk_soc = s.idp AND c.id=a.fk_action AND a.fk_user_author = u.rowid";
diff --git a/htdocs/comm/addpropal.php b/htdocs/comm/addpropal.php
index 4f3705abd95..4ee52466e92 100644
--- a/htdocs/comm/addpropal.php
+++ b/htdocs/comm/addpropal.php
@@ -71,7 +71,7 @@ if ($_GET["projetid"])
if ($_GET["action"] == 'create')
{
$soc = new Societe($db);
- $result=$soc->fetch($_GET["socidp"]);
+ $result=$soc->fetch($_GET["socid"]);
if ($result < 0)
{
dolibarr_print_error($db,$soc->error);
@@ -97,7 +97,7 @@ if ($_GET["action"] == 'create')
}
}
- print " ';
if ($_GET['action'] == 'editdelivery_adress')
{
- $html->form_adresse_livraison($_SERVER['PHP_SELF'].'?propalid='.$propal->id,$propal->adresse_livraison_id,$_GET['socidp'],'adresse_livraison_id','propal',$propal->id);
+ $html->form_adresse_livraison($_SERVER['PHP_SELF'].'?propalid='.$propal->id,$propal->adresse_livraison_id,$_GET['socid'],'adresse_livraison_id','propal',$propal->id);
}
else
{
- $html->form_adresse_livraison($_SERVER['PHP_SELF'].'?propalid='.$propal->id,$propal->adresse_livraison_id,$_GET['socidp'],'none','propal',$propal->id);
+ $html->form_adresse_livraison($_SERVER['PHP_SELF'].'?propalid='.$propal->id,$propal->adresse_livraison_id,$_GET['socid'],'none','propal',$propal->id);
}
print ' ';
}
@@ -936,7 +936,7 @@ if ($conf->expedition->enabled)
print '';
print '';
print $langs->trans("NoProject").' ';
- print 'id.'&action=create>'.$langs->trans('AddProject').' ';
+ print 'id.'&action=create>'.$langs->trans('AddProject').' ';
print ' ';
}
else
@@ -948,11 +948,11 @@ if ($conf->expedition->enabled)
print '';
if ($_GET['action'] == 'classer')
{
- $form->form_project($_SERVER['PHP_SELF'].'?propalid='.$propal->id, $propal->socidp, $propal->projetidp, 'projetidp');
+ $form->form_project($_SERVER['PHP_SELF'].'?propalid='.$propal->id, $propal->socid, $propal->projetidp, 'projetidp');
}
else
{
- $form->form_project($_SERVER['PHP_SELF'].'?propalid='.$propal->id, $propal->socidp, $propal->projetidp, 'none');
+ $form->form_project($_SERVER['PHP_SELF'].'?propalid='.$propal->id, $propal->socid, $propal->projetidp, 'none');
}
print ' ';
}
@@ -1071,7 +1071,7 @@ if ($conf->expedition->enabled)
print '';
+ print ' ';
print img_object($langs->trans("ShowReduc"),'reduc').' '.$langs->trans("Discount");
print ' ';
if ($objp->description) print ' - '.nl2br($objp->description);
@@ -1596,7 +1596,7 @@ if ($conf->expedition->enabled)
$sql = 'SELECT id, '.$db->pdate('a.datea'). ' as da, label, note, fk_user_author' ;
$sql .= ' FROM '.MAIN_DB_PREFIX.'actioncomm as a';
$sql .= ' WHERE a.propalrowid = '.$propal->id ;
- if ($socidp) $sql .= ' AND a.fk_soc = '.$socidp;
+ if ($socid) $sql .= ' AND a.fk_soc = '.$socid;
$resql = $db->query($sql);
if ($resql)
{
@@ -1698,13 +1698,13 @@ else
$pagenext = $page + 1;
$sql = 'SELECT s.nom, s.idp, s.client, p.rowid as propalid, p.price, p.ref, p.fk_statut, '.$db->pdate('p.datep').' as dp,'.$db->pdate('p.fin_validite').' as dfv';
- if (!$user->rights->commercial->client->voir && !$socidp) $sql .= ", sc.fk_soc, sc.fk_user";
+ if (!$user->rights->commercial->client->voir && !$socid) $sql .= ", sc.fk_soc, sc.fk_user";
$sql.= ' FROM '.MAIN_DB_PREFIX.'societe as s, '.MAIN_DB_PREFIX.'propal as p';
- if (!$user->rights->commercial->client->voir && !$socidp) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+ if (!$user->rights->commercial->client->voir && !$socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
if ($sall) $sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'propaldet as pd ON p.rowid=pd.fk_propal';
$sql.= ' WHERE p.fk_soc = s.idp';
- if (!$user->rights->commercial->client->voir && !$socidp) //restriction
+ if (!$user->rights->commercial->client->voir && !$socid) //restriction
{
$sql .= " AND s.idp = sc.fk_soc AND sc.fk_user = " .$user->id;
}
@@ -1721,7 +1721,7 @@ else
$sql .= " AND p.price='".addslashes($_GET['search_montant_ht'])."'";
}
if ($sall) $sql.= " AND (s.nom like '%".addslashes($sall)."%' OR p.note like '%".addslashes($sall)."%' OR pd.description like '%".addslashes($sall)."%')";
- if ($socidp) $sql .= ' AND s.idp = '.$socidp;
+ if ($socid) $sql .= ' AND s.idp = '.$socid;
if ($_GET['viewstatut'] <> '')
{
$sql .= ' AND p.fk_statut in ('.$_GET['viewstatut'].')';
@@ -1750,16 +1750,16 @@ else
if ($result)
{
$num = $db->num_rows($result);
- print_barre_liste($langs->trans('ListOfProposals'), $page,'propal.php','&socidp='.$socidp,$sortfield,$sortorder,'',$num);
+ print_barre_liste($langs->trans('ListOfProposals'), $page,'propal.php','&socid='.$socid,$sortfield,$sortorder,'',$num);
$i = 0;
print '';
print '';
- print_liste_field_titre($langs->trans('Ref'),$_SERVER["PHP_SELF"],'p.ref','','&socidp='.$socidp.'&viewstatut='.$viewstatut,'',$sortfield);
- print_liste_field_titre($langs->trans('Company'),$_SERVER["PHP_SELF"],'s.nom','','&socidp='.$socidp.'&viewstatut='.$viewstatut,'',$sortfield);
- print_liste_field_titre($langs->trans('Date'),$_SERVER["PHP_SELF"],'p.datep','','&socidp='.$socidp.'&viewstatut='.$viewstatut, 'align="center"',$sortfield);
- print_liste_field_titre($langs->trans('DateEndPropalShort'),$_SERVER["PHP_SELF"],'dfv','','&socidp='.$socidp.'&viewstatut='.$viewstatut, 'align="center"',$sortfield);
- print_liste_field_titre($langs->trans('Price'),$_SERVER["PHP_SELF"],'p.price','','&socidp='.$socidp.'&viewstatut='.$viewstatut, 'align="right"',$sortfield);
- print_liste_field_titre($langs->trans('Status'),$_SERVER["PHP_SELF"],'p.fk_statut','','&socidp='.$socidp.'&viewstatut='.$viewstatut,'align="right"',$sortfield);
+ print_liste_field_titre($langs->trans('Ref'),$_SERVER["PHP_SELF"],'p.ref','','&socid='.$socid.'&viewstatut='.$viewstatut,'',$sortfield);
+ print_liste_field_titre($langs->trans('Company'),$_SERVER["PHP_SELF"],'s.nom','','&socid='.$socid.'&viewstatut='.$viewstatut,'',$sortfield);
+ print_liste_field_titre($langs->trans('Date'),$_SERVER["PHP_SELF"],'p.datep','','&socid='.$socid.'&viewstatut='.$viewstatut, 'align="center"',$sortfield);
+ print_liste_field_titre($langs->trans('DateEndPropalShort'),$_SERVER["PHP_SELF"],'dfv','','&socid='.$socid.'&viewstatut='.$viewstatut, 'align="center"',$sortfield);
+ print_liste_field_titre($langs->trans('Price'),$_SERVER["PHP_SELF"],'p.price','','&socid='.$socid.'&viewstatut='.$viewstatut, 'align="right"',$sortfield);
+ print_liste_field_titre($langs->trans('Status'),$_SERVER["PHP_SELF"],'p.fk_statut','','&socid='.$socid.'&viewstatut='.$viewstatut,'align="right"',$sortfield);
print " \n";
// Lignes des champs de filtre
print '
';
print '';
@@ -1187,11 +1187,11 @@ else
print ' ';
if ($_GET['action'] == 'classer')
{
- $html->form_project($_SERVER['PHP_SELF'].'?id='.$commande->id, $commande->socidp, $commande->projet_id, 'projetid');
+ $html->form_project($_SERVER['PHP_SELF'].'?id='.$commande->id, $commande->socid, $commande->projet_id, 'projetid');
}
else
{
- $html->form_project($_SERVER['PHP_SELF'].'?id='.$commande->id, $commande->socidp, $commande->projet_id, 'none');
+ $html->form_project($_SERVER['PHP_SELF'].'?id='.$commande->id, $commande->socid, $commande->projet_id, 'none');
}
print ' ';
}
@@ -1283,7 +1283,7 @@ else
print '';
+ print ' ';
print img_object($langs->trans("ShowReduc"),'reduc').' '.$langs->trans("Discount");
print ' ';
if ($objp->description) print ' - '.nl2br($objp->description);
@@ -1758,7 +1758,7 @@ else
$sql = 'SELECT id, '.$db->pdate('a.datea'). ' as da, label, note, fk_user_author' ;
$sql .= ' FROM '.MAIN_DB_PREFIX.'actioncomm as a';
$sql .= ' WHERE a.fk_commande = '.$commande->id ;
- if ($socidp) $sql .= ' AND a.fk_soc = '.$socidp;
+ if ($socid) $sql .= ' AND a.fk_soc = '.$socid;
$resql = $db->query($sql);
if ($resql)
{
@@ -1828,7 +1828,7 @@ else
print_titre($langs->trans('SendOrderByMail'));
$soc = new Societe($db);
- $soc->fetch($commande->socidp);
+ $soc->fetch($commande->socid);
$liste[0]=" ";
foreach ($soc->contact_email_array() as $key=>$value)
diff --git a/htdocs/commande/index.php b/htdocs/commande/index.php
index 4ca503e08ea..85d72f156ac 100644
--- a/htdocs/commande/index.php
+++ b/htdocs/commande/index.php
@@ -35,12 +35,12 @@ if (!$user->rights->commande->lire) accessforbidden();
$langs->load("orders");
// Sécurité accés client
-$socidp='';
-if ($_GET["socidp"]) { $socidp=$_GET["socidp"]; }
+$socid='';
+if ($_GET["socid"]) { $socid=$_GET["socid"]; }
if ($user->societe_id > 0)
{
$action = '';
- $socidp = $user->societe_id;
+ $socid = $user->societe_id;
}
$commandestatic=new Commande($db);
@@ -73,12 +73,12 @@ print "';
* Commandes en cours
*/
$sql = "SELECT c.rowid, c.ref, c.fk_statut, c.facture, s.nom, s.idp";
-if (!$user->rights->commercial->client->voir && !$socidp) $sql .= ", sc.fk_soc, sc.fk_user";
+if (!$user->rights->commercial->client->voir && !$socid) $sql .= ", sc.fk_soc, sc.fk_user";
$sql .= " FROM ".MAIN_DB_PREFIX."commande as c, ".MAIN_DB_PREFIX."societe as s";
-if (!$user->rights->commercial->client->voir && !$socidp) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+if (!$user->rights->commercial->client->voir && !$socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
$sql .= " WHERE c.fk_soc = s.idp AND c.fk_statut = 2 ";
-if ($socidp) $sql .= " AND c.fk_soc = ".$socidp;
-if (!$user->rights->commercial->client->voir && !$socidp) $sql .= " AND s.idp = sc.fk_soc AND sc.fk_user = " .$user->id;
+if ($socid) $sql .= " AND c.fk_soc = ".$socid;
+if (!$user->rights->commercial->client->voir && !$socid) $sql .= " AND s.idp = sc.fk_soc AND sc.fk_user = " .$user->id;
$sql .= " ORDER BY c.rowid DESC";
if ( $db->query($sql) )
@@ -188,12 +188,12 @@ $max=5;
$sql = "SELECT c.rowid, c.ref, c.fk_statut, c.facture, s.nom, s.idp,";
$sql.= " ".$db->pdate("date_cloture")." as datec";
-if (!$user->rights->commercial->client->voir && !$socidp) $sql .= ", sc.fk_soc, sc.fk_user";
+if (!$user->rights->commercial->client->voir && !$socid) $sql .= ", sc.fk_soc, sc.fk_user";
$sql.= " FROM ".MAIN_DB_PREFIX."commande as c, ".MAIN_DB_PREFIX."societe as s";
-if (!$user->rights->commercial->client->voir && !$socidp) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+if (!$user->rights->commercial->client->voir && !$socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
$sql.= " WHERE c.fk_soc = s.idp and c.fk_statut > 2";
-if ($socidp) $sql .= " AND c.fk_soc = ".$socidp;
-if (!$user->rights->commercial->client->voir && !$socidp) $sql .= " AND s.idp = sc.fk_soc AND sc.fk_user = " .$user->id;
+if ($socid) $sql .= " AND c.fk_soc = ".$socid;
+if (!$user->rights->commercial->client->voir && !$socid) $sql .= " AND s.idp = sc.fk_soc AND sc.fk_user = " .$user->id;
$sql.= " ORDER BY c.tms DESC";
$sql.= $db->plimit($max, 0);
diff --git a/htdocs/commande/info.php b/htdocs/commande/info.php
index 37f9d4824f8..f32ab86665e 100644
--- a/htdocs/commande/info.php
+++ b/htdocs/commande/info.php
@@ -49,8 +49,8 @@ llxHeader();
$commande = new Commande($db);
$commande->fetch($_GET["id"]);
$commande->info($_GET["id"]);
-$soc = new Societe($db, $commande->socidp);
-$soc->fetch($commande->socidp);
+$soc = new Societe($db, $commande->socid);
+$soc->fetch($commande->socid);
$head = commande_prepare_head($commande);
dolibarr_fiche_head($head, 'info', $langs->trans("CustomerOrder"));
diff --git a/htdocs/commande/liste.php b/htdocs/commande/liste.php
index 0740837f783..b4b64f4fe67 100644
--- a/htdocs/commande/liste.php
+++ b/htdocs/commande/liste.php
@@ -45,11 +45,11 @@ $snom=isset($_GET['snom'])?$_GET['snom']:$_POST['snom'];
$sall=isset($_GET['sall'])?$_GET['sall']:$_POST['sall'];
// Sécurité accés client
-$socidp = $_GET['socidp'];
+$socid = $_GET['socid'];
if ($user->societe_id > 0)
{
$action = '';
- $socidp = $user->societe_id;
+ $socid = $user->societe_id;
}
@@ -71,11 +71,11 @@ $offset = $limit * $_GET['page'] ;
$sql = 'SELECT s.nom, s.idp, c.rowid, c.ref, c.total_ht, c.ref_client,';
$sql.= ' '.$db->pdate('c.date_commande').' as date_commande, c.fk_statut, c.facture as facturee';
-if (!$user->rights->commercial->client->voir && !$socidp) $sql .= ", sc.fk_soc, sc.fk_user";
+if (!$user->rights->commercial->client->voir && !$socid) $sql .= ", sc.fk_soc, sc.fk_user";
$sql.= ' FROM '.MAIN_DB_PREFIX.'societe as s, '.MAIN_DB_PREFIX.'commande as c';
-if (!$user->rights->commercial->client->voir && !$socidp) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+if (!$user->rights->commercial->client->voir && !$socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
$sql.= ' WHERE c.fk_soc = s.idp';
-if (!$user->rights->commercial->client->voir && !$socidp) //restriction
+if (!$user->rights->commercial->client->voir && !$socid) //restriction
{
$sql .= " AND s.idp = sc.fk_soc AND sc.fk_user = " .$user->id;
}
@@ -87,9 +87,9 @@ if ($sall)
{
$sql .= " AND (c.ref like '%".addslashes($sall)."%' OR c.note like '%".addslashes($sall)."%')";
}
-if ($socidp)
+if ($socid)
{
- $sql .= ' AND s.idp = '.$socidp;
+ $sql .= ' AND s.idp = '.$socid;
}
if ($_GET['month'] > 0)
{
@@ -132,10 +132,10 @@ $resql = $db->query($sql);
if ($resql)
{
- if ($socidp)
+ if ($socid)
{
$soc = new Societe($db);
- $soc->fetch($socidp);
+ $soc->fetch($socid);
$title = $langs->trans('ListOfOrders') . ' - '.$soc->nom;
}
else
@@ -145,15 +145,15 @@ if ($resql)
if ($_GET['status'] == 3)
$title.=' - '.$langs->trans('StatusOrderToBill');
$num = $db->num_rows($resql);
- print_barre_liste($title, $_GET['page'], 'liste.php','&socidp='.$socidp,$sortfield,$sortorder,'',$num);
+ print_barre_liste($title, $_GET['page'], 'liste.php','&socid='.$socid,$sortfield,$sortorder,'',$num);
$i = 0;
print '';
print '';
- print_liste_field_titre($langs->trans('Ref'),'liste.php','c.ref','','&socidp='.$socidp,'width="25%"',$sortfield);
- print_liste_field_titre($langs->trans('Company'),'liste.php','s.nom','','&socidp='.$socidp,'width="30%"',$sortfield);
- print_liste_field_titre($langs->trans('RefCustomerOrder'),'liste.php','c.ref_client','','&socidp='.$socidp,'width="15%"',$sortfield);
- print_liste_field_titre($langs->trans('Date'),'liste.php','c.date_commande','','&socidp='.$socidp, 'width="20%" align="right" colspan="2"',$sortfield);
- print_liste_field_titre($langs->trans('Status'),'liste.php','c.fk_statut','','&socidp='.$socidp,'width="10%" align="center"',$sortfield);
+ print_liste_field_titre($langs->trans('Ref'),'liste.php','c.ref','','&socid='.$socid,'width="25%"',$sortfield);
+ print_liste_field_titre($langs->trans('Company'),'liste.php','s.nom','','&socid='.$socid,'width="30%"',$sortfield);
+ print_liste_field_titre($langs->trans('RefCustomerOrder'),'liste.php','c.ref_client','','&socid='.$socid,'width="15%"',$sortfield);
+ print_liste_field_titre($langs->trans('Date'),'liste.php','c.date_commande','','&socid='.$socid, 'width="20%" align="right" colspan="2"',$sortfield);
+ print_liste_field_titre($langs->trans('Status'),'liste.php','c.fk_statut','','&socid='.$socid,'width="10%" align="center"',$sortfield);
print ' ';
// Lignes des champs de filtre
print '
';
print ' ';
@@ -262,11 +262,11 @@ if ($_GET["id"] > 0)
print ' ';
if ($_GET['action'] == 'classer')
{
- $html->form_project($_SERVER['PHP_SELF'].'?id='.$commande->id, $commande->socidp, $commande->projet_id, 'projetid');
+ $html->form_project($_SERVER['PHP_SELF'].'?id='.$commande->id, $commande->socid, $commande->projet_id, 'projetid');
}
else
{
- $html->form_project($_SERVER['PHP_SELF'].'?id='.$commande->id, $commande->socidp, $commande->projet_id, 'none');
+ $html->form_project($_SERVER['PHP_SELF'].'?id='.$commande->id, $commande->socid, $commande->projet_id, 'none');
}
print ' ';
}
@@ -348,7 +348,7 @@ if ($_GET["id"] > 0)
print '';
if (($objp->info_bits & 2) == 2)
{
- print '';
+ print ' ';
print img_object($langs->trans("ShowReduc"),'reduc').' '.$langs->trans("Discount");
print ' ';
if ($objp->description) print ' - '.nl2br($objp->description);
@@ -528,7 +528,7 @@ if ($_GET["id"] > 0)
if ($commande->statut > 0 && $user->rights->facture->creer)
{
- print ''.$langs->trans("CreateBill").' ';
+ print ''.$langs->trans("CreateBill").' ';
}
if ($commande->statut > 0 && $user->rights->commande->creer)
diff --git a/htdocs/compta/commande/liste.php b/htdocs/compta/commande/liste.php
index cc2444568c1..411ae7c8f4e 100644
--- a/htdocs/compta/commande/liste.php
+++ b/htdocs/compta/commande/liste.php
@@ -42,11 +42,11 @@ $limit = $conf->liste_limit;
$offset = $limit * $_GET["page"] ;
// Sécurité accés client
-$socidp = $_GET["socidp"];
+$socid = $_GET["socid"];
if ($user->societe_id > 0)
{
$action = '';
- $socidp = $user->societe_id;
+ $socid = $user->societe_id;
}
$langs->load('companies');
@@ -58,14 +58,14 @@ llxHeader();
$sql = "SELECT s.nom, s.idp,";
$sql.= " c.rowid, c.ref, c.total_ht,".$db->pdate("c.date_commande")." as date_commande,";
$sql.= " c.fk_statut, c.facture";
-if (!$user->rights->commercial->client->voir && !$socidp) $sql .= ", sc.fk_soc, sc.fk_user";
+if (!$user->rights->commercial->client->voir && !$socid) $sql .= ", sc.fk_soc, sc.fk_user";
$sql .= " FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."commande as c";
-if (!$user->rights->commercial->client->voir && !$socidp) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+if (!$user->rights->commercial->client->voir && !$socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
$sql .= " WHERE c.fk_soc = s.idp";
-if (!$user->rights->commercial->client->voir && !$socidp) $sql .= " AND s.idp = sc.fk_soc AND sc.fk_user = " .$user->id;
-if ($socidp)
+if (!$user->rights->commercial->client->voir && !$socid) $sql .= " AND s.idp = sc.fk_soc AND sc.fk_user = " .$user->id;
+if ($socid)
{
- $sql .= " AND s.idp = $socidp";
+ $sql .= " AND s.idp = $socid";
}
if ($_GET["month"] > 0)
{
@@ -93,10 +93,10 @@ $resql = $db->query($sql);
if ($resql)
{
- if ($socidp)
+ if ($socid)
{
$soc = new Societe($db);
- $soc->fetch($socidp);
+ $soc->fetch($socid);
$title = $langs->trans("ListOfOrders") . " - ".$soc->nom;
}
else
@@ -106,7 +106,7 @@ if ($resql)
// Si page des commandes à facturer
$link=DOL_URL_ROOT."/compta/commande/fiche.php";
$title.=" - ".$langs->trans("StatusOrderToBill");
- $param="&socidp=".$socidp."&year=".$_GET["year"]."&month=".$_GET["month"];
+ $param="&socid=".$socid."&year=".$_GET["year"]."&month=".$_GET["month"];
$num = $db->num_rows($resql);
print_barre_liste($title, $_GET["page"], "liste.php",$param,$sortfield,$sortorder,'',$num);
diff --git a/htdocs/compta/deplacement/fiche.php b/htdocs/compta/deplacement/fiche.php
index f41ffd054c3..86a43b69b9a 100644
--- a/htdocs/compta/deplacement/fiche.php
+++ b/htdocs/compta/deplacement/fiche.php
@@ -55,7 +55,7 @@ if ($_POST["action"] == 'add' && $_POST["cancel"] <> $langs->trans("Cancel"))
$_POST["reyear"]);
$deplacement->km = $_POST["km"];
- $deplacement->socidp = $_POST["socidp"];
+ $deplacement->socid = $_POST["socid"];
$deplacement->userid = $user->id; //$_POST["km"];
$id = $deplacement->create($user);
diff --git a/htdocs/compta/deplacement/index.php b/htdocs/compta/deplacement/index.php
index a4962e87e73..88db305ef36 100644
--- a/htdocs/compta/deplacement/index.php
+++ b/htdocs/compta/deplacement/index.php
@@ -53,25 +53,25 @@ $pageprev = $page - 1;
$pagenext = $page + 1;
// Sécurité accés client
-$socidp = $_GET["socidp"];
+$socid = $_GET["socid"];
if ($user->societe_id > 0)
{
$action = '';
- $socidp = $user->societe_id;
+ $socid = $user->societe_id;
}
$sql = "SELECT s.nom, s.idp,"; // Ou
$sql.= " d.rowid, ".$db->pdate("d.dated")." as dd, d.km, "; // Comment
$sql.= " u.name, u.firstname"; // Qui
-if (!$user->rights->commercial->client->voir && !$socidp) $sql .= ", sc.fk_soc, sc.fk_user";
+if (!$user->rights->commercial->client->voir && !$socid) $sql .= ", sc.fk_soc, sc.fk_user";
$sql.= " FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."deplacement as d, ".MAIN_DB_PREFIX."user as u";
-if (!$user->rights->commercial->client->voir && !$socidp) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+if (!$user->rights->commercial->client->voir && !$socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
$sql.= " WHERE d.fk_soc = s.idp AND d.fk_user = u.rowid";
-if (!$user->rights->commercial->client->voir && !$socidp) $sql .= " AND s.idp = sc.fk_soc AND sc.fk_user = " .$user->id;
+if (!$user->rights->commercial->client->voir && !$socid) $sql .= " AND s.idp = sc.fk_soc AND sc.fk_user = " .$user->id;
-if ($socidp)
+if ($socid)
{
- $sql .= " AND s.idp = $socidp";
+ $sql .= " AND s.idp = $socid";
}
$sql .= " ORDER BY $sortfield $sortorder " . $db->plimit( $limit + 1 ,$offset);
@@ -81,16 +81,16 @@ if ($resql)
{
$num = $db->num_rows($resql);
- print_barre_liste($langs->trans("ListOfTrips"), $page, "index.php","&socidp=$socidp",$sortfield,$sortorder,'',$num);
+ print_barre_liste($langs->trans("ListOfTrips"), $page, "index.php","&socid=$socid",$sortfield,$sortorder,'',$num);
$i = 0;
print '';
print "";
- print_liste_field_titre($langs->trans("Ref"),"index.php","d.rowid","","&socidp=$socidp",'',$sortfield);
- print_liste_field_titre($langs->trans("Date"),"index.php","d.dated","","&socidp=$socidp",'',$sortfield);
- print_liste_field_titre($langs->trans("Company"),"index.php","s.nom","","&socidp=$socidp",'',$sortfield);
- print_liste_field_titre($langs->trans("Person"),"index.php","u.name","","&socidp=$socidp",'',$sortfield);
- print_liste_field_titre($langs->trans("Distance"),"index.php","d.km","","&socidp=$socidp",'align="right"',$sortfield);
+ print_liste_field_titre($langs->trans("Ref"),"index.php","d.rowid","","&socid=$socid",'',$sortfield);
+ print_liste_field_titre($langs->trans("Date"),"index.php","d.dated","","&socid=$socid",'',$sortfield);
+ print_liste_field_titre($langs->trans("Company"),"index.php","s.nom","","&socid=$socid",'',$sortfield);
+ print_liste_field_titre($langs->trans("Person"),"index.php","u.name","","&socid=$socid",'',$sortfield);
+ print_liste_field_titre($langs->trans("Distance"),"index.php","d.km","","&socid=$socid",'align="right"',$sortfield);
print " \n";
$var=true;
diff --git a/htdocs/compta/export/liste.php b/htdocs/compta/export/liste.php
index a925a9c195b..7791c02b7fc 100644
--- a/htdocs/compta/export/liste.php
+++ b/htdocs/compta/export/liste.php
@@ -28,7 +28,7 @@ llxHeader('','Compta - Export');
if ($user->societe_id > 0)
{
$action = '';
- $socidp = $user->societe_id;
+ $socid = $user->societe_id;
}
diff --git a/htdocs/compta/facture.php b/htdocs/compta/facture.php
index f936c78cb7f..8cc69731cb1 100644
--- a/htdocs/compta/facture.php
+++ b/htdocs/compta/facture.php
@@ -55,13 +55,13 @@ $langs->load('main');
$sall=isset($_GET['sall'])?trim($_GET['sall']):trim($_POST['sall']);
$mesg=isset($_GET['mesg'])?urldecode($_GET['mesg']):'';
-$socidp=isset($_GET['socidp'])?$_GET['socidp']:$_POST['socidp'];
+$socid=isset($_GET['socid'])?$_GET['socid']:$_POST['socid'];
// Sécurité accés client
if ($user->societe_id > 0)
{
$action = '';
- $socidp = $user->societe_id;
+ $socid = $user->societe_id;
}
// Récupération de l'id de projet
@@ -152,7 +152,7 @@ if ($_POST['action'] == 'confirm_valid' && $_POST['confirm'] == 'yes' && $user->
$fac = new Facture($db);
$fac->fetch($_GET['facid']);
$soc = new Societe($db);
- $soc->fetch($fac->socidp);
+ $soc->fetch($fac->socid);
$result = $fac->set_valid($fac->id, $user, $soc);
if ($result >= 0)
{
@@ -270,7 +270,7 @@ if ($_POST['action'] == 'confirm_payed_partially' && $_POST['confirm'] == 'yes'
if ($_POST['action'] == 'add' && $user->rights->facture->creer)
{
$facture = new Facture($db);
- $facture->socidp=$_POST['socid'];
+ $facture->socid=$_POST['socid'];
$facture->fetch_client();
$db->begin();
@@ -313,7 +313,7 @@ if ($_POST['action'] == 'add' && $user->rights->facture->creer)
// Si facture récurrente
$datefacture = mktime(12, 0 , 0, $_POST['remonth'], $_POST['reday'], $_POST['reyear']);
- $facture->socidp = $_POST['socid'];
+ $facture->socid = $_POST['socid'];
$facture->type = $_POST['type'];
$facture->number = $_POST['facnumber'];
$facture->date = $datefacture;
@@ -331,7 +331,7 @@ if ($_POST['action'] == 'add' && $user->rights->facture->creer)
// Si facture standard
$datefacture = mktime(12, 0 , 0, $_POST['remonth'], $_POST['reday'], $_POST['reyear']);
- $facture->socidp = $_POST['socid'];
+ $facture->socid = $_POST['socid'];
$facture->type = $_POST['type'];
$facture->number = $_POST['facnumber'];
$facture->date = $datefacture;
@@ -534,7 +534,7 @@ if (($_POST['action'] == 'addligne' || $_POST['action'] == 'addligne_predef') &&
$fac = new Facture($db);
$ret=$fac->fetch($_POST['facid']);
$soc = new Societe($db);
- $ret=$soc->fetch($fac->socidp);
+ $ret=$soc->fetch($fac->socid);
$date_start='';
$date_end='';
@@ -752,7 +752,7 @@ if (($_POST['action'] == 'send' || $_POST['action'] == 'relance') && ! $_POST['c
if (is_readable($file))
{
- $soc = new Societe($db, $fac->socidp);
+ $soc = new Societe($db, $fac->socid);
if ($_POST['sendto']) {
// Le destinataire a été fourni via le champ libre
@@ -836,7 +836,7 @@ if (($_POST['action'] == 'send' || $_POST['action'] == 'relance') && ! $_POST['c
$actioncomm->date = time();
$actioncomm->percent = 100;
$actioncomm->contact = new Contact($db,$sendtoid);
- $actioncomm->societe = new Societe($db,$fac->socidp);
+ $actioncomm->societe = new Societe($db,$fac->socid);
$actioncomm->user = $user; // User qui a fait l'action
$actioncomm->facid = $fac->id;
@@ -966,7 +966,7 @@ if ($_GET['action'] == 'create')
{
$propal = New Propal($db);
$propal->fetch($_GET['propalid']);
- $societe_id = $propal->socidp;
+ $societe_id = $propal->socid;
$projetid=$propal->projetidp;
$ref_client=$propal->ref_client;
@@ -980,7 +980,7 @@ if ($_GET['action'] == 'create')
{
$commande = New Commande($db);
$commande->fetch($_GET['commandeid']);
- $societe_id = $commande->socidp;
+ $societe_id = $commande->socid;
$projetid=$commande-> projet_id;
$ref_client=$commande->ref_client;
@@ -1005,7 +1005,7 @@ if ($_GET['action'] == 'create')
}
else
{
- $societe_id=$socidp;
+ $societe_id=$socid;
$soc->fetch($societe_id);
$cond_reglement_id = $soc->cond_reglement;
@@ -1043,7 +1043,7 @@ if ($_GET['action'] == 'create')
// Societe
print ''.$langs->trans('Company').' ';
print $soc->getNomUrl(1);
- print ' ';
print '';
if (($objp->info_bits & 2) == 2)
{
- print '';
+ print ' ';
print img_object($langs->trans("ShowReduc"),'reduc').' '.$langs->trans("Discount");
print ' ';
}
@@ -1482,8 +1482,8 @@ else
$fac = New Facture($db);
if ( $fac->fetch($_GET['facid'], $user->societe_id) > 0)
{
- $soc = new Societe($db, $fac->socidp);
- $soc->fetch($fac->socidp);
+ $soc = new Societe($db, $fac->socid);
+ $soc->fetch($fac->socid);
$absolute_discount=$soc->getCurrentDiscount();
$totalpaye = $fac->getSommePaiement();
@@ -1533,7 +1533,7 @@ else
require_once(DOL_DOCUMENT_ROOT ."/notify.class.php");
$notify=new Notify($db);
$text.=' ';
if ($_GET['action'] == 'classer')
{
- $html->form_project($_SERVER['PHP_SELF'].'?facid='.$fac->id,$fac->socidp,$fac->projetid,'projetid');
+ $html->form_project($_SERVER['PHP_SELF'].'?facid='.$fac->id,$fac->socid,$fac->projetid,'projetid');
}
else
{
- $html->form_project($_SERVER['PHP_SELF'].'?facid='.$fac->id,$fac->socidp,$fac->projetid,'none');
+ $html->form_project($_SERVER['PHP_SELF'].'?facid='.$fac->id,$fac->socid,$fac->projetid,'none');
}
print ' ';
print '';
+ print ' ';
print img_object($langs->trans("ShowReduc"),'reduc').' '.$langs->trans("Discount");
print ' ';
if ($objp->description) print ' - '.nl2br($objp->description);
@@ -2516,7 +2516,7 @@ else
$sql .= ' FROM '.MAIN_DB_PREFIX.'actioncomm as a, '.MAIN_DB_PREFIX.'user as u ';
$sql .= ' WHERE a.fk_user_author = u.rowid ';
$sql .= ' AND a.fk_action in (9,10) ';
- $sql .= ' AND a.fk_soc = '.$fac->socidp ;
+ $sql .= ' AND a.fk_soc = '.$fac->socid ;
$sql .= ' AND a.fk_facture = '.$fac->id;
$resql = $db->query($sql);
@@ -2709,7 +2709,7 @@ else
if (! $sall) $sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'paiement_facture as pf ON f.rowid=pf.fk_facture ';
if ($sall) $sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'facturedet as fd ON f.rowid=fd.fk_facture ';
$sql.= ' WHERE f.fk_soc = s.idp';
- if ($socidp) $sql .= ' AND s.idp = '.$socidp;
+ if ($socid) $sql .= ' AND s.idp = '.$socid;
if ($month > 0) $sql .= ' AND date_format(f.datef, \'%m\') = '.$month;
if ($_GET['filtre'])
{
@@ -2764,24 +2764,24 @@ else
{
$num = $db->num_rows($resql);
- if ($socidp)
+ if ($socid)
{
$soc = new Societe($db);
- $soc->fetch($socidp);
+ $soc->fetch($socid);
}
- print_barre_liste($langs->trans('BillsCustomers').' '.($socidp?' '.$soc->nom:''),$page,'facture.php','&socidp='.$socidp,$sortfield,$sortorder,'',$num);
+ print_barre_liste($langs->trans('BillsCustomers').' '.($socid?' '.$soc->nom:''),$page,'facture.php','&socid='.$socid,$sortfield,$sortorder,'',$num);
$i = 0;
print '';
print '';
- print_liste_field_titre($langs->trans('Ref'),$_SERVER['PHP_SELF'],'f.facnumber','','&socidp='.$socidp,'',$sortfield);
- print_liste_field_titre($langs->trans('Date'),$_SERVER['PHP_SELF'],'f.datef','','&socidp='.$socidp,'align="center"',$sortfield);
- print_liste_field_titre($langs->trans('Company'),$_SERVER['PHP_SELF'],'s.nom','','&socidp='.$socidp,'',$sortfield);
- print_liste_field_titre($langs->trans('AmountHT'),$_SERVER['PHP_SELF'],'f.total','','&socidp='.$socidp,'align="right"',$sortfield);
- print_liste_field_titre($langs->trans('AmountTTC'),$_SERVER['PHP_SELF'],'f.total_ttc','','&socidp='.$socidp,'align="right"',$sortfield);
- print_liste_field_titre($langs->trans('Received'),$_SERVER['PHP_SELF'],'am','','&socidp='.$socidp,'align="right"',$sortfield);
- print_liste_field_titre($langs->trans('Status'),$_SERVER['PHP_SELF'],'fk_statut,paye,am','','&socidp='.$socidp,'align="right"',$sortfield);
+ print_liste_field_titre($langs->trans('Ref'),$_SERVER['PHP_SELF'],'f.facnumber','','&socid='.$socid,'',$sortfield);
+ print_liste_field_titre($langs->trans('Date'),$_SERVER['PHP_SELF'],'f.datef','','&socid='.$socid,'align="center"',$sortfield);
+ print_liste_field_titre($langs->trans('Company'),$_SERVER['PHP_SELF'],'s.nom','','&socid='.$socid,'',$sortfield);
+ print_liste_field_titre($langs->trans('AmountHT'),$_SERVER['PHP_SELF'],'f.total','','&socid='.$socid,'align="right"',$sortfield);
+ print_liste_field_titre($langs->trans('AmountTTC'),$_SERVER['PHP_SELF'],'f.total_ttc','','&socid='.$socid,'align="right"',$sortfield);
+ print_liste_field_titre($langs->trans('Received'),$_SERVER['PHP_SELF'],'am','','&socid='.$socid,'align="right"',$sortfield);
+ print_liste_field_titre($langs->trans('Status'),$_SERVER['PHP_SELF'],'fk_statut,paye,am','','&socid='.$socid,'align="right"',$sortfield);
print ' ';
// Lignes des champs de filtre
diff --git a/htdocs/compta/facture/apercu.php b/htdocs/compta/facture/apercu.php
index 083e39ba1e3..cf479140598 100644
--- a/htdocs/compta/facture/apercu.php
+++ b/htdocs/compta/facture/apercu.php
@@ -45,7 +45,7 @@ $langs->load("bills");
if ($user->societe_id > 0)
{
$action = '';
- $socidp = $user->societe_id;
+ $socid = $user->societe_id;
}
@@ -64,8 +64,8 @@ if ($_GET["facid"] > 0)
$fac = New Facture($db);
if ( $fac->fetch($_GET["facid"], $user->societe_id) > 0)
{
- $soc = new Societe($db, $fac->socidp);
- $soc->fetch($fac->socidp);
+ $soc = new Societe($db, $fac->socid);
+ $soc->fetch($fac->socid);
$author = new User($db);
if ($fac->user_author)
{
diff --git a/htdocs/compta/facture/contact.php b/htdocs/compta/facture/contact.php
index c2ce66b19b9..d9fc67ab01f 100644
--- a/htdocs/compta/facture/contact.php
+++ b/htdocs/compta/facture/contact.php
@@ -107,7 +107,7 @@ function select_type_contact($facture, $defValue, $htmlname = 'type', $source)
if ($user->societe_id > 0)
{
$action = '';
- $socidp = $user->societe_id;
+ $socid = $user->societe_id;
}
/*
diff --git a/htdocs/compta/facture/document.php b/htdocs/compta/facture/document.php
index c806f326a2a..93b2ca25897 100644
--- a/htdocs/compta/facture/document.php
+++ b/htdocs/compta/facture/document.php
@@ -111,7 +111,7 @@ if ($facid > 0)
$upload_dir = $conf->facture->dir_output.'/'.$facref;
$societe = new Societe($db);
- $societe->fetch($facture->socidp);
+ $societe->fetch($facture->socid);
$head = facture_prepare_head($facture);
dolibarr_fiche_head($head, 'documents', $langs->trans('InvoiceCustomer'));
diff --git a/htdocs/compta/facture/facture-rec.class.php b/htdocs/compta/facture/facture-rec.class.php
index ceb0cec5d78..a587a08be7b 100644
--- a/htdocs/compta/facture/facture-rec.class.php
+++ b/htdocs/compta/facture/facture-rec.class.php
@@ -43,7 +43,7 @@ class FactureRec extends Facture
var $id ;
- var $socidp; // Id client
+ var $socid; // Id client
var $client; // Objet societe client (à charger par fetch_client)
var $number;
@@ -97,7 +97,7 @@ class FactureRec extends Facture
$this->brouillon = 1;
$sql = "INSERT INTO ".MAIN_DB_PREFIX."facture_rec (titre, fk_soc, datec, amount, remise, remise_percent, note, fk_user_author,fk_projet, fk_cond_reglement) ";
- $sql.= " VALUES ('$this->titre', '$facsrc->socidp', now(), '$facsrc->amount', '$facsrc->remise', '$facsrc->remise_percent', '".addslashes($this->note)."','$user->id',";
+ $sql.= " VALUES ('$this->titre', '$facsrc->socid', now(), '$facsrc->amount', '$facsrc->remise', '$facsrc->remise_percent', '".addslashes($this->note)."','$user->id',";
$sql.= " ".($facsrc->projetid?"'".$facsrc->projetid."'":"null").", ";
$sql.= " '".$facsrc->cond_reglement_id."')";
if ( $this->db->query($sql) )
@@ -175,7 +175,7 @@ class FactureRec extends Facture
$this->total_ttc = $obj->total_ttc;
$this->paye = $obj->paye;
$this->remise_percent = $obj->remise_percent;
- $this->socidp = $obj->fk_soc;
+ $this->socid = $obj->fk_soc;
$this->statut = $obj->fk_statut;
$this->date_lim_reglement = $obj->dlr;
$this->cond_reglement_id = $obj->crid;
diff --git a/htdocs/compta/facture/fiche-rec.php b/htdocs/compta/facture/fiche-rec.php
index cc97576c480..dd324180ae1 100644
--- a/htdocs/compta/facture/fiche-rec.php
+++ b/htdocs/compta/facture/fiche-rec.php
@@ -58,7 +58,7 @@ $sortfield="f.datef";
if ($user->societe_id > 0)
{
$action = '';
- $socidp = $user->societe_id;
+ $socid = $user->societe_id;
}
@@ -283,8 +283,8 @@ else
if ( $fac->fetch($facid, $user->societe_id) > 0)
{
- $soc = new Societe($db, $fac->socidp);
- $soc->fetch($fac->socidp);
+ $soc = new Societe($db, $fac->socid);
+ $soc->fetch($fac->socid);
$author = new User($db);
$author->id = $fac->user_author;
$author->fetch();
@@ -402,8 +402,8 @@ else
$sql = "SELECT s.nom,s.idp,f.titre,f.total,f.rowid as facid";
$sql .= " FROM ".MAIN_DB_PREFIX."societe as s,".MAIN_DB_PREFIX."facture_rec as f WHERE f.fk_soc = s.idp";
- if ($socidp)
- $sql .= " AND s.idp = $socidp";
+ if ($socid)
+ $sql .= " AND s.idp = $socid";
//$sql .= " ORDER BY $sortfield $sortorder, rowid DESC ";
// $sql .= $db->plimit($limit + 1,$offset);
@@ -413,13 +413,13 @@ else
if ($result)
{
$num = $db->num_rows($result);
- print_barre_liste($langs->trans("RepeatableInvoice"),$page,"fiche-rec.php","&socidp=$socidp",$sortfield,$sortorder,'',$num);
+ print_barre_liste($langs->trans("RepeatableInvoice"),$page,"fiche-rec.php","&socid=$socid",$sortfield,$sortorder,'',$num);
$i = 0;
print "";
print '';
print ''.$langs->trans("Ref").' ';
- print_liste_field_titre($langs->trans("Company"),"fiche-rec.php","s.nom","","&socidp=$socidp");
+ print_liste_field_titre($langs->trans("Company"),"fiche-rec.php","s.nom","","&socid=$socid");
print ''.$langs->trans("Amount").' ';
print ' ';
print "\n";
diff --git a/htdocs/compta/facture/impayees.php b/htdocs/compta/facture/impayees.php
index bfd20d8a9d4..a495253a19c 100644
--- a/htdocs/compta/facture/impayees.php
+++ b/htdocs/compta/facture/impayees.php
@@ -43,13 +43,13 @@ $langs->load("bills");
-if ($_GET["socidp"]) { $socidp=$_GET["socidp"]; }
+if ($_GET["socid"]) { $socid=$_GET["socid"]; }
// Sécurité accés client
if ($user->societe_id > 0)
{
$action = '';
- $socidp = $user->societe_id;
+ $socid = $user->societe_id;
}
@@ -76,15 +76,15 @@ if ($user->rights->facture->lire)
$sql.= $db->pdate("f.datef")." as df, ".$db->pdate("f.date_lim_reglement")." as datelimite, ";
$sql.= " f.paye as paye, f.rowid as facid, f.fk_statut";
$sql.= " ,sum(pf.amount) as am";
- if (! $user->rights->commercial->client->voir && ! $socidp) $sql .= ", sc.fk_soc, sc.fk_user ";
+ if (! $user->rights->commercial->client->voir && ! $socid) $sql .= ", sc.fk_soc, sc.fk_user ";
$sql.= " FROM ".MAIN_DB_PREFIX."societe as s";
- if (! $user->rights->commercial->client->voir && ! $socidp) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+ if (! $user->rights->commercial->client->voir && ! $socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
$sql.= ",".MAIN_DB_PREFIX."facture as f";
$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."paiement_facture as pf ON f.rowid=pf.fk_facture ";
$sql.= " WHERE f.fk_soc = s.idp";
$sql.= " AND f.paye = 0 AND f.fk_statut = 1";
- if (! $user->rights->commercial->client->voir && ! $socidp) $sql .= " AND s.idp = sc.fk_soc AND sc.fk_user = " .$user->id;
- if ($socidp) $sql .= " AND s.idp = $socidp";
+ if (! $user->rights->commercial->client->voir && ! $socid) $sql .= " AND s.idp = sc.fk_soc AND sc.fk_user = " .$user->id;
+ if ($socid) $sql .= " AND s.idp = $socid";
if ($_GET["filtre"])
{
@@ -135,26 +135,26 @@ if ($user->rights->facture->lire)
{
$num = $db->num_rows($result);
- if ($socidp)
+ if ($socid)
{
$soc = new Societe($db);
- $soc->fetch($socidp);
+ $soc->fetch($socid);
}
- $titre=($socidp?$langs->trans("BillsCustomersUnpayedForCompany",$soc->nom):$langs->trans("BillsCustomersUnpayed"));
- print_barre_liste($titre,$page,"impayees.php","&socidp=$socidp",$sortfield,$sortorder,'',$num);
+ $titre=($socid?$langs->trans("BillsCustomersUnpayedForCompany",$soc->nom):$langs->trans("BillsCustomersUnpayed"));
+ print_barre_liste($titre,$page,"impayees.php","&socid=$socid",$sortfield,$sortorder,'',$num);
$i = 0;
print '';
print '';
- print_liste_field_titre($langs->trans("Ref"),$_SERVER["PHP_SELF"],"f.facnumber","","&socidp=$socidp","",$sortfield);
- print_liste_field_titre($langs->trans("Date"),$_SERVER["PHP_SELF"],"f.datef","","&socidp=$socidp",'align="center"',$sortfield);
- print_liste_field_titre($langs->trans("DateDue"),$_SERVER["PHP_SELF"],"f.date_lim_reglement","","&socidp=$socidp",'align="center"',$sortfield);
- print_liste_field_titre($langs->trans("Company"),$_SERVER["PHP_SELF"],"s.nom","","&socidp=$socidp","",$sortfield);
- print_liste_field_titre($langs->trans("AmountHT"),$_SERVER["PHP_SELF"],"f.total","","&socidp=$socidp",'align="right"',$sortfield);
- print_liste_field_titre($langs->trans("AmountTTC"),$_SERVER["PHP_SELF"],"f.total_ttc","","&socidp=$socidp",'align="right"',$sortfield);
- print_liste_field_titre($langs->trans("Received"),$_SERVER["PHP_SELF"],"am","","&socidp=$socidp",'align="right"',$sortfield);
- print_liste_field_titre($langs->trans("Status"),$_SERVER["PHP_SELF"],"fk_statut,paye,am","","&socidp=$socidp",'align="right"',$sortfield);
+ print_liste_field_titre($langs->trans("Ref"),$_SERVER["PHP_SELF"],"f.facnumber","","&socid=$socid","",$sortfield);
+ print_liste_field_titre($langs->trans("Date"),$_SERVER["PHP_SELF"],"f.datef","","&socid=$socid",'align="center"',$sortfield);
+ print_liste_field_titre($langs->trans("DateDue"),$_SERVER["PHP_SELF"],"f.date_lim_reglement","","&socid=$socid",'align="center"',$sortfield);
+ print_liste_field_titre($langs->trans("Company"),$_SERVER["PHP_SELF"],"s.nom","","&socid=$socid","",$sortfield);
+ print_liste_field_titre($langs->trans("AmountHT"),$_SERVER["PHP_SELF"],"f.total","","&socid=$socid",'align="right"',$sortfield);
+ print_liste_field_titre($langs->trans("AmountTTC"),$_SERVER["PHP_SELF"],"f.total_ttc","","&socid=$socid",'align="right"',$sortfield);
+ print_liste_field_titre($langs->trans("Received"),$_SERVER["PHP_SELF"],"am","","&socid=$socid",'align="right"',$sortfield);
+ print_liste_field_titre($langs->trans("Status"),$_SERVER["PHP_SELF"],"fk_statut,paye,am","","&socid=$socid",'align="right"',$sortfield);
print " \n";
// Lignes des champs de filtre
diff --git a/htdocs/compta/facture/info.php b/htdocs/compta/facture/info.php
index 2e0d0b004c1..09cf65e75b2 100644
--- a/htdocs/compta/facture/info.php
+++ b/htdocs/compta/facture/info.php
@@ -44,8 +44,8 @@ $fac = new Facture($db);
$fac->fetch($_GET["facid"]);
$fac->info($_GET["facid"]);
-$soc = new Societe($db, $fac->socidp);
-$soc->fetch($fac->socidp);
+$soc = new Societe($db, $fac->socid);
+$soc->fetch($fac->socid);
$head = facture_prepare_head($fac);
dolibarr_fiche_head($head, 'info', $langs->trans("InvoiceCustomer"));
diff --git a/htdocs/compta/facture/note.php b/htdocs/compta/facture/note.php
index 29f5fc705c0..0c348b80a43 100644
--- a/htdocs/compta/facture/note.php
+++ b/htdocs/compta/facture/note.php
@@ -30,7 +30,7 @@
require("./pre.inc.php");
require_once(DOL_DOCUMENT_ROOT.'/lib/invoice.lib.php');
-$socidp=isset($_GET["socidp"])?$_GET["socidp"]:isset($_POST["socidp"])?$_POST["socidp"]:"";
+$socid=isset($_GET["socid"])?$_GET["socid"]:isset($_POST["socid"])?$_POST["socid"]:"";
$user->getrights('facture');
if (!$user->rights->facture->lire)
@@ -43,7 +43,7 @@ $langs->load("bills");
if ($user->societe_id > 0)
{
unset($_GET["action"]);
- $socidp = $user->societe_id;
+ $socid = $user->societe_id;
}
@@ -99,8 +99,8 @@ $html = new Form($db);
if ($_GET["facid"])
{
- $soc = new Societe($db, $fac->socidp);
- $soc->fetch($fac->socidp);
+ $soc = new Societe($db, $fac->socid);
+ $soc->fetch($fac->socid);
$head = facture_prepare_head($fac);
$hselected = 2;
diff --git a/htdocs/compta/facture/prelevement.php b/htdocs/compta/facture/prelevement.php
index 2d512ce9bde..4a98690467d 100644
--- a/htdocs/compta/facture/prelevement.php
+++ b/htdocs/compta/facture/prelevement.php
@@ -44,7 +44,7 @@ $langs->load("withdrawals");
if ($user->societe_id > 0)
{
$action = '';
- $socidp = $user->societe_id;
+ $socid = $user->societe_id;
}
@@ -102,8 +102,8 @@ if ($_GET["facid"] > 0)
{
if ($mesg) print $mesg.''.img_next().' ';
print_fiche_titre($langs->trans("BillsStatistics"), $mesg);
-$stats = new FactureStats($db, $socidp);
+$stats = new FactureStats($db, $socid);
$data = $stats->getNbByMonth($year);
create_exdir($conf->facture->dir_temp);
diff --git a/htdocs/compta/fiche.php b/htdocs/compta/fiche.php
index b393152bbf3..50f3be131e7 100644
--- a/htdocs/compta/fiche.php
+++ b/htdocs/compta/fiche.php
@@ -255,7 +255,7 @@ if ($socid > 0)
{
$tableaushown=1;
print '';
- print ' ';
}
@@ -309,7 +309,7 @@ if ($socid > 0)
{
$tableaushown=1;
print '';
- print ' ';
}
while ($i < $num && $i < $MAXLIST)
@@ -346,7 +346,7 @@ if ($socid > 0)
// Si société cliente ou prospect, on affiche bouton "Créer facture client"
if ($societe->client != 0 && $conf->facture->enabled && $user->rights->facture->creer) {
$langs->load("bills");
- print "id\">".$langs->trans("AddBill")." ";
+ print "id\">".$langs->trans("AddBill")." ";
}
if ($conf->deplacement->enabled) {
diff --git a/htdocs/compta/index.php b/htdocs/compta/index.php
index 6fcfd51d951..c11843cd976 100644
--- a/htdocs/compta/index.php
+++ b/htdocs/compta/index.php
@@ -47,11 +47,11 @@ $langs->load("bills");
if ($conf->commande->enabled) $langs->load("orders");
// Sécurité accés client
-$socidp='';
+$socid='';
if ($user->societe_id > 0)
{
$action = '';
- $socidp = $user->societe_id;
+ $socid = $user->societe_id;
}
@@ -61,12 +61,12 @@ if ($user->societe_id > 0)
if (isset($_GET["action"]) && $_GET["action"] == 'add_bookmark')
{
- $sql = "DELETE FROM ".MAIN_DB_PREFIX."bookmark WHERE fk_soc = ".$socidp." AND fk_user=".$user->id;
+ $sql = "DELETE FROM ".MAIN_DB_PREFIX."bookmark WHERE fk_soc = ".$socid." AND fk_user=".$user->id;
if (! $db->query($sql) )
{
dolibarr_print_error($db);
}
- $sql = "INSERT INTO ".MAIN_DB_PREFIX."bookmark (fk_soc, dateb, fk_user) VALUES ($socidp, now(),".$user->id.");";
+ $sql = "INSERT INTO ".MAIN_DB_PREFIX."bookmark (fk_soc, dateb, fk_user) VALUES ($socid, now(),".$user->id.");";
if (! $db->query($sql) )
{
dolibarr_print_error($db);
@@ -119,15 +119,15 @@ if ($conf->facture->enabled)
if ($conf->facture->enabled && $user->rights->facture->lire)
{
$sql = "SELECT f.facnumber, f.rowid, f.total_ttc, s.nom, s.idp";
- if (!$user->rights->commercial->client->voir && !$socidp) $sql .= ", sc.fk_soc, sc.fk_user ";
+ if (!$user->rights->commercial->client->voir && !$socid) $sql .= ", sc.fk_soc, sc.fk_user ";
$sql .= " FROM ".MAIN_DB_PREFIX."facture as f, ".MAIN_DB_PREFIX."societe as s";
- if (!$user->rights->commercial->client->voir && !$socidp) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+ if (!$user->rights->commercial->client->voir && !$socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
$sql .= " WHERE s.idp = f.fk_soc AND f.fk_statut = 0";
- if (!$user->rights->commercial->client->voir && !$socidp) $sql .= " AND s.idp = sc.fk_soc AND sc.fk_user = " .$user->id;
+ if (!$user->rights->commercial->client->voir && !$socid) $sql .= " AND s.idp = sc.fk_soc AND sc.fk_user = " .$user->id;
- if ($socidp)
+ if ($socid)
{
- $sql .= " AND f.fk_soc = $socidp";
+ $sql .= " AND f.fk_soc = $socid";
}
$resql = $db->query($sql);
@@ -275,16 +275,16 @@ if ($conf->facture->enabled && $conf->commande->enabled && $user->rights->comman
$sql = "SELECT sum(f.total) as tot_fht, sum(f.total_ttc) as tot_fttc,";
$sql.= " s.nom, s.idp,";
$sql.= " p.rowid, p.ref, p.facture, p.fk_statut, p.total_ht, p.total_ttc";
- if (!$user->rights->commercial->client->voir && !$socidp) $sql .= ", sc.fk_soc, sc.fk_user ";
+ if (!$user->rights->commercial->client->voir && !$socid) $sql .= ", sc.fk_soc, sc.fk_user ";
$sql.= " FROM ".MAIN_DB_PREFIX."societe AS s, ".MAIN_DB_PREFIX."commande AS p";
- if (!$user->rights->commercial->client->voir && !$socidp) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+ if (!$user->rights->commercial->client->voir && !$socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."co_fa AS co_fa ON co_fa.fk_commande = p.rowid";
$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."facture AS f ON co_fa.fk_facture = f.rowid";
$sql.= " WHERE p.fk_soc = s.idp";
- if (!$user->rights->commercial->client->voir && !$socidp) $sql .= " AND s.idp = sc.fk_soc AND sc.fk_user = " .$user->id;
- if ($socidp)
+ if (!$user->rights->commercial->client->voir && !$socid) $sql .= " AND s.idp = sc.fk_soc AND sc.fk_user = " .$user->id;
+ if ($socid)
{
- $sql.= " AND p.fk_soc = $socidp";
+ $sql.= " AND p.fk_soc = $socid";
}
$sql.= " AND p.fk_statut = 3 AND p.facture=0";
$sql.= " GROUP BY p.rowid";
@@ -356,13 +356,13 @@ if ($conf->facture->enabled && $user->rights->facture->lire)
$sql = "SELECT f.rowid, f.facnumber, f.fk_statut, f.total, f.total_ttc, ".$db->pdate("f.date_lim_reglement")." as datelimite,";
$sql.= " sum(pf.amount) as am,";
$sql.= " s.nom, s.idp";
- if (!$user->rights->commercial->client->voir && !$socidp) $sql .= ", sc.fk_soc, sc.fk_user ";
+ if (!$user->rights->commercial->client->voir && !$socid) $sql .= ", sc.fk_soc, sc.fk_user ";
$sql.= " FROM ".MAIN_DB_PREFIX."societe as s,".MAIN_DB_PREFIX."facture as f";
$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."paiement_facture as pf on f.rowid=pf.fk_facture";
- if (!$user->rights->commercial->client->voir && !$socidp) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+ if (!$user->rights->commercial->client->voir && !$socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
$sql.= " WHERE s.idp = f.fk_soc AND f.paye = 0 AND f.fk_statut = 1";
- if (!$user->rights->commercial->client->voir && !$socidp) $sql .= " AND s.idp = sc.fk_soc AND sc.fk_user = " .$user->id;
- if ($socidp) $sql .= " AND f.fk_soc = ".$socidp;
+ if (!$user->rights->commercial->client->voir && !$socid) $sql .= " AND s.idp = sc.fk_soc AND sc.fk_user = " .$user->id;
+ if ($socid) $sql .= " AND f.fk_soc = ".$socid;
$sql.= " GROUP BY f.rowid, f.facnumber, f.fk_statut, f.total, f.total_ttc, s.nom, s.idp";
$sql.= " ORDER BY f.datef ASC, f.facnumber ASC";
@@ -436,13 +436,13 @@ if ($conf->facture->enabled && $user->rights->facture->lire)
$sql = "SELECT ff.rowid, ff.facnumber, ff.fk_statut, ff.fk_statut, ff.libelle, ff.total_ht, ff.total_ttc,";
$sql.= " sum(pf.amount) as am,";
$sql.= " s.nom, s.idp";
- if (!$user->rights->commercial->client->voir && !$socidp) $sql .= ", sc.fk_soc, sc.fk_user ";
+ if (!$user->rights->commercial->client->voir && !$socid) $sql .= ", sc.fk_soc, sc.fk_user ";
$sql.= " FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."facture_fourn as ff";
$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."paiementfourn_facturefourn as pf on ff.rowid=pf.fk_facturefourn";
- if (!$user->rights->commercial->client->voir && !$socidp) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+ if (!$user->rights->commercial->client->voir && !$socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
$sql.= " WHERE s.idp = ff.fk_soc";
$sql.= " AND ff.paye=0 AND ff.fk_statut = 1";
- if (!$user->rights->commercial->client->voir && !$socidp) $sql .= " AND s.idp = sc.fk_soc AND sc.fk_user = " .$user->id;
+ if (!$user->rights->commercial->client->voir && !$socid) $sql .= " AND s.idp = sc.fk_soc AND sc.fk_user = " .$user->id;
$sql.= " GROUP BY ff.rowid, ff.facnumber, ff.fk_statut, ff.total, ff.total_ttc, s.nom, s.idp";
$resql=$db->query($sql);
diff --git a/htdocs/compta/paiement.php b/htdocs/compta/paiement.php
index b5e3df103b5..f5d17d686f3 100644
--- a/htdocs/compta/paiement.php
+++ b/htdocs/compta/paiement.php
@@ -185,7 +185,7 @@ if ($_POST['action'] == 'add_paiement')
if ($user->societe_id > 0)
{
$action = '';
- $socidp = $user->societe_id;
+ $socid = $user->societe_id;
}
@@ -269,7 +269,7 @@ if ($_GET['action'] == 'create' || $_POST['action'] == 'add_paiement')
$sql .= ', sum(pf.amount) as am';
$sql .= ' FROM '.MAIN_DB_PREFIX.'facture as f';
$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'paiement_facture as pf ON pf.fk_facture = f.rowid';
- $sql .= ' WHERE f.fk_soc = '.$facture->socidp;
+ $sql .= ' WHERE f.fk_soc = '.$facture->socid;
$sql .= ' AND f.paye = 0';
$sql .= ' AND f.fk_statut = 1'; // Statut=0 => non validée, Statut=2 => annulée
$sql .= ' GROUP BY f.facnumber';
@@ -376,9 +376,9 @@ if (! $_GET['action'] && ! $_POST['action'])
$sql .= ' FROM '.MAIN_DB_PREFIX.'paiement as p, '.MAIN_DB_PREFIX.'facture as f, '.MAIN_DB_PREFIX.'c_paiement as c';
$sql .= ' WHERE p.fk_facture = f.rowid AND p.fk_paiement = c.id';
- if ($socidp)
+ if ($socid)
{
- $sql .= ' AND f.fk_soc = '.$socidp;
+ $sql .= ' AND f.fk_soc = '.$socid;
}
$sql .= ' ORDER BY '.$sortfield.' '.$sortorder;
diff --git a/htdocs/compta/paiement/avalider.php b/htdocs/compta/paiement/avalider.php
index 3a819909c8b..15c650ef973 100644
--- a/htdocs/compta/paiement/avalider.php
+++ b/htdocs/compta/paiement/avalider.php
@@ -37,11 +37,11 @@ $langs->load("bills");
if (! $user->rights->facture->lire)
accessforbidden();
-$socidp=0;
+$socid=0;
if ($user->societe_id > 0)
{
$action = '';
- $socidp = $user->societe_id;
+ $socid = $user->societe_id;
}
@@ -63,15 +63,15 @@ $offset = $limit * $page ;
$sql = "SELECT p.rowid,".$db->pdate("p.datep")." as dp, p.amount, p.statut";
$sql .=", c.libelle as paiement_type, p.num_paiement";
$sql .= " FROM ".MAIN_DB_PREFIX."paiement as p, ".MAIN_DB_PREFIX."c_paiement as c";
-if ($socidp)
+if ($socid)
{
$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."paiement_facture as pf ON p.rowid = pf.fk_paiement";
$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."facture as f ON pf.fk_facture = f.rowid";
}
$sql .= " WHERE p.fk_paiement = c.id";
-if ($socidp)
+if ($socid)
{
- $sql.= " AND f.fk_soc = ".$socidp;
+ $sql.= " AND f.fk_soc = ".$socid;
}
$sql .= " AND p.statut = 0";
$sql .= " ORDER BY $sortfield $sortorder";
diff --git a/htdocs/compta/paiement/liste.php b/htdocs/compta/paiement/liste.php
index 9f1ffea7a24..27fcf545422 100644
--- a/htdocs/compta/paiement/liste.php
+++ b/htdocs/compta/paiement/liste.php
@@ -37,11 +37,11 @@ $user->getrights("facture");
if (! $user->rights->facture->lire)
accessforbidden();
-$socidp=0;
+$socid=0;
if ($user->societe_id > 0)
{
$action = '';
- $socidp = $user->societe_id;
+ $socid = $user->societe_id;
}
@@ -68,15 +68,15 @@ $sql.= " FROM ".MAIN_DB_PREFIX."c_paiement as c,";
$sql.= " ".MAIN_DB_PREFIX."paiement as p";
$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."bank as b ON p.fk_bank = b.rowid";
$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."bank_account as ba ON b.fk_account = ba.rowid";
-if ($socidp)
+if ($socid)
{
$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."paiement_facture as pf ON p.rowid = pf.fk_paiement";
$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."facture as f ON pf.fk_facture = f.rowid";
}
$sql.= " WHERE p.fk_paiement = c.id";
-if ($socidp)
+if ($socid)
{
- $sql.= " AND f.fk_soc = ".$socidp;
+ $sql.= " AND f.fk_soc = ".$socid;
}
if ($_GET["search_montant"])
{
diff --git a/htdocs/compta/paiement/rapport.php b/htdocs/compta/paiement/rapport.php
index 9ba095e97e4..61154b790fb 100644
--- a/htdocs/compta/paiement/rapport.php
+++ b/htdocs/compta/paiement/rapport.php
@@ -37,11 +37,11 @@ if (! $user->rights->facture->lire)
$dir = $conf->compta->dir_output;
-$socidp=0;
+$socid=0;
if ($user->societe_id > 0)
{
$action = '';
- $socidp = $user->societe_id;
+ $socid = $user->societe_id;
$dir = DOL_DATA_ROOT.'/private/'.$user->id.'/compta';
}
diff --git a/htdocs/compta/paiement_charge.php b/htdocs/compta/paiement_charge.php
index da9531c5157..64f2a410bd6 100755
--- a/htdocs/compta/paiement_charge.php
+++ b/htdocs/compta/paiement_charge.php
@@ -132,7 +132,7 @@ if ($_POST["action"] == 'add_paiement')
if ($user->societe_id > 0)
{
$action = '';
- $socidp = $user->societe_id;
+ $socid = $user->societe_id;
}
/*
@@ -223,7 +223,7 @@ if ($_GET["action"] == 'create')
// $sql .= ", sum(pf.amount) as am";
// $sql .= " FROM ".MAIN_DB_PREFIX."facture as f";
// $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."paiement_facture as pf ON pf.fk_facture = f.rowid";
-// $sql .= " WHERE f.fk_soc = ".$facture->socidp;
+// $sql .= " WHERE f.fk_soc = ".$facture->socid;
// $sql .= " AND f.paye = 0";
// $sql .= " AND f.fk_statut = 1"; // Statut=0 => non validée, Statut=2 => annulée
// $sql .= " GROUP BY f.facnumber";
diff --git a/htdocs/compta/param/comptes/index.php b/htdocs/compta/param/comptes/index.php
index 0eb3d12a3a8..d259fa62320 100644
--- a/htdocs/compta/param/comptes/index.php
+++ b/htdocs/compta/param/comptes/index.php
@@ -40,7 +40,7 @@ $langs->load("bills");
if ($user->societe_id > 0)
{
$action = '';
- $socidp = $user->societe_id;
+ $socid = $user->societe_id;
}
llxHeader("","Accueil Compta");
diff --git a/htdocs/compta/param/index.php b/htdocs/compta/param/index.php
index 16e69da982c..715078816c9 100644
--- a/htdocs/compta/param/index.php
+++ b/htdocs/compta/param/index.php
@@ -41,7 +41,7 @@ $langs->load("bills");
if ($user->societe_id > 0)
{
$action = '';
- $socidp = $user->societe_id;
+ $socid = $user->societe_id;
}
llxHeader("",$langs->trans("AccountancySetup"));
diff --git a/htdocs/compta/prelevement/bons.php b/htdocs/compta/prelevement/bons.php
index 5436a6bb0f3..1d7d7447faa 100644
--- a/htdocs/compta/prelevement/bons.php
+++ b/htdocs/compta/prelevement/bons.php
@@ -45,7 +45,7 @@ llxHeader('','Pr
if ($user->societe_id > 0)
{
$action = '';
- $socidp = $user->societe_id;
+ $socid = $user->societe_id;
}
diff --git a/htdocs/compta/prelevement/create.php b/htdocs/compta/prelevement/create.php
index 3009c06aece..d055cb172dd 100644
--- a/htdocs/compta/prelevement/create.php
+++ b/htdocs/compta/prelevement/create.php
@@ -169,9 +169,9 @@ $sql .= " , ".MAIN_DB_PREFIX."prelevement_facture_demande as pfd";
$sql .= " WHERE s.idp = f.fk_soc";
$sql .= " AND pfd.traite = 0 AND pfd.fk_facture = f.rowid";
-if ($socidp)
+if ($socid)
{
- $sql .= " AND f.fk_soc = $socidp";
+ $sql .= " AND f.fk_soc = $socid";
}
if ( $db->query($sql) )
diff --git a/htdocs/compta/prelevement/demandes.php b/htdocs/compta/prelevement/demandes.php
index b31211099b2..34089535409 100644
--- a/htdocs/compta/prelevement/demandes.php
+++ b/htdocs/compta/prelevement/demandes.php
@@ -37,7 +37,7 @@ $langs->load("widthdrawals");
if ($user->societe_id > 0)
{
- $socidp = $user->societe_id;
+ $socid = $user->societe_id;
}
llxHeader();
@@ -66,12 +66,12 @@ if (! $sortfield) $sortfield="f.facnumber";
$sql= "SELECT f.facnumber, f.rowid, s.nom, s.idp";
$sql.= " , ".$db->pdate("pfd.date_demande")." as date_demande";
$sql.= " , pfd.fk_user_demande";
-if (!$user->rights->commercial->client->voir && !$socidp) $sql .= ", sc.fk_soc, sc.fk_user";
+if (!$user->rights->commercial->client->voir && !$socid) $sql .= ", sc.fk_soc, sc.fk_user";
$sql.= " FROM ".MAIN_DB_PREFIX."facture as f, ".MAIN_DB_PREFIX."societe as s";
$sql.= " , ".MAIN_DB_PREFIX."prelevement_facture_demande as pfd";
-if (!$user->rights->commercial->client->voir && !$socidp) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+if (!$user->rights->commercial->client->voir && !$socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
$sql.= " WHERE s.idp = f.fk_soc";
-if (!$user->rights->commercial->client->voir && !$socidp) $sql .= " AND s.idp = sc.fk_soc AND sc.fk_user = " .$user->id;
+if (!$user->rights->commercial->client->voir && !$socid) $sql .= " AND s.idp = sc.fk_soc AND sc.fk_user = " .$user->id;
if (! $statut) $sql.= " AND pfd.traite = 0";
if ($statut) $sql.= " AND pfd.traite = ".$statut;
$sql.= " AND pfd.fk_facture = f.rowid";
@@ -79,9 +79,9 @@ if (strlen(trim($_GET["search_societe"])))
{
$sql .= " AND s.nom LIKE '%".$_GET["search_societe"]."%'";
}
-if ($socidp)
+if ($socid)
{
- $sql .= " AND f.fk_soc = $socidp";
+ $sql .= " AND f.fk_soc = $socid";
}
$sql .= " ORDER BY $sortfield $sortorder " . $db->plimit($conf->liste_limit+1, $offset);
diff --git a/htdocs/compta/prelevement/index.php b/htdocs/compta/prelevement/index.php
index 19c82d8f12d..3a58fadef1e 100644
--- a/htdocs/compta/prelevement/index.php
+++ b/htdocs/compta/prelevement/index.php
@@ -37,7 +37,7 @@ if (!$user->rights->prelevement->bons->lire)
if ($user->societe_id > 0)
{
$action = '';
- $socidp = $user->societe_id;
+ $socid = $user->societe_id;
}
@@ -128,18 +128,18 @@ print '';
*
*/
$sql = "SELECT f.facnumber, f.rowid, s.nom, s.idp";
-if (!$user->rights->commercial->client->voir && !$socidp) $sql .= ", sc.fk_soc, sc.fk_user";
+if (!$user->rights->commercial->client->voir && !$socid) $sql .= ", sc.fk_soc, sc.fk_user";
$sql .= " FROM ".MAIN_DB_PREFIX."facture as f, ".MAIN_DB_PREFIX."societe as s";
-if (!$user->rights->commercial->client->voir && !$socidp) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+if (!$user->rights->commercial->client->voir && !$socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
$sql .= " , ".MAIN_DB_PREFIX."prelevement_facture_demande as pfd";
$sql .= " WHERE s.idp = f.fk_soc";
$sql .= " AND pfd.traite = 0 AND pfd.fk_facture = f.rowid";
-if (!$user->rights->commercial->client->voir && !$socidp) $sql .= " AND s.idp = sc.fk_soc AND sc.fk_user = " .$user->id;
+if (!$user->rights->commercial->client->voir && !$socid) $sql .= " AND s.idp = sc.fk_soc AND sc.fk_user = " .$user->id;
-if ($socidp)
+if ($socid)
{
- $sql .= " AND f.fk_soc = $socidp";
+ $sql .= " AND f.fk_soc = $socid";
}
if ( $db->query($sql) )
diff --git a/htdocs/compta/prelevement/liste.php b/htdocs/compta/prelevement/liste.php
index 5ff7fd83590..febf1e606df 100644
--- a/htdocs/compta/prelevement/liste.php
+++ b/htdocs/compta/prelevement/liste.php
@@ -38,7 +38,7 @@ $langs->load("withdrawals");
if ($user->societe_id > 0)
{
$action = '';
- $socidp = $user->societe_id;
+ $socid = $user->societe_id;
}
diff --git a/htdocs/compta/prelevement/rejet-prelevement.class.php b/htdocs/compta/prelevement/rejet-prelevement.class.php
index 1957d45e374..f778ba21d17 100644
--- a/htdocs/compta/prelevement/rejet-prelevement.class.php
+++ b/htdocs/compta/prelevement/rejet-prelevement.class.php
@@ -192,7 +192,7 @@ class RejetPrelevement
$emuser->fetch();
$soc = new Societe($this->db);
- $soc->fetch($fac->socidp);
+ $soc->fetch($fac->socid);
require_once(DOL_DOCUMENT_ROOT."/lib/CMailFile.class.php");
diff --git a/htdocs/compta/propal.php b/htdocs/compta/propal.php
index ad09811159a..986a67e2af4 100644
--- a/htdocs/compta/propal.php
+++ b/htdocs/compta/propal.php
@@ -57,12 +57,12 @@ $pagenext = $page + 1;
// Sécurité accés client
-$socidp='';
-if ($_GET["socidp"]) { $socidp=$_GET["socidp"]; }
+$socid='';
+if ($_GET["socid"]) { $socid=$_GET["socid"]; }
if ($user->societe_id > 0)
{
$action = '';
- $socidp = $user->societe_id;
+ $socid = $user->societe_id;
}
@@ -124,7 +124,7 @@ if ($_GET["propalid"] > 0)
$propal->fetch($_GET['propalid']);
$societe = new Societe($db);
- $societe->fetch($propal->socidp);
+ $societe->fetch($propal->socid);
$head = propal_prepare_head($propal);
dolibarr_fiche_head($head, 'compta', $langs->trans('Proposal'));
@@ -240,7 +240,7 @@ if ($_GET["propalid"] > 0)
{
print ' ';
print $langs->trans("NoProject").' ';
- print 'id.'&action=create>'.$langs->trans('AddProject').' ';
+ print 'id.'&action=create>'.$langs->trans('AddProject').' ';
print ' ';
}
else
@@ -357,7 +357,7 @@ if ($_GET["propalid"] > 0)
print '';
+ print ' ';
print img_object($langs->trans("ShowReduc"),'reduc').' '.$langs->trans("Discount");
print ' ';
if ($objp->description) print ' - '.nl2br($objp->description);
@@ -735,12 +735,12 @@ et non globalement
$sql = "SELECT s.nom, s.idp, p.rowid as propalid, p.price, p.ref, p.fk_statut, ";
$sql.= $db->pdate("p.datep")." as dp, ";
$sql.= $db->pdate("p.fin_validite")." as dfin";
- if (!$user->rights->commercial->client->voir && !$socidp) $sql .= ", sc.fk_soc, sc.fk_user";
+ if (!$user->rights->commercial->client->voir && !$socid) $sql .= ", sc.fk_soc, sc.fk_user";
$sql.= " FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."propal as p";
- if (!$user->rights->commercial->client->voir && !$socidp) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+ if (!$user->rights->commercial->client->voir && !$socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
$sql.= " WHERE p.fk_soc = s.idp";
- if (!$user->rights->commercial->client->voir && !$socidp) $sql .= " AND s.idp = sc.fk_soc AND sc.fk_user = " .$user->id;
- if ($socidp) $sql .= " AND s.idp = $socidp";
+ if (!$user->rights->commercial->client->voir && !$socid) $sql .= " AND s.idp = sc.fk_soc AND sc.fk_user = " .$user->id;
+ if ($socid) $sql .= " AND s.idp = $socid";
if ($viewstatut <> '') $sql .= " AND p.fk_statut in ($viewstatut)"; // viewstatut peut etre combinaisons séparé par virgules
if ($month > 0) $sql .= " AND date_format(p.datep, '%Y-%m') = '$year-$month'";
if ($year > 0) $sql .= " AND date_format(p.datep, '%Y') = $year";
@@ -753,7 +753,7 @@ et non globalement
$propalstatic=new Propal($db);
- print_barre_liste($langs->trans("Proposals"), $page, "propal.php","&socidp=$socidp",$sortfield,$sortorder,'',$num);
+ print_barre_liste($langs->trans("Proposals"), $page, "propal.php","&socid=$socid",$sortfield,$sortorder,'',$num);
$i = 0;
$var=true;
diff --git a/htdocs/compta/resultat/clientfourn.php b/htdocs/compta/resultat/clientfourn.php
index 85ebbcb1e4f..3f4fd206468 100644
--- a/htdocs/compta/resultat/clientfourn.php
+++ b/htdocs/compta/resultat/clientfourn.php
@@ -113,7 +113,7 @@ if ($result) {
$var=!$var;
print " ";
- print "".$langs->trans("Bills")." idp\">$objp->nom \n";
+ print "".$langs->trans("Bills")." idp\">$objp->nom \n";
if ($modecompta == 'CREANCES-DETTES') print "".price($objp->amount_ht)." \n";
print "".price($objp->amount_ttc)." \n";
diff --git a/htdocs/compta/resultat/index.php b/htdocs/compta/resultat/index.php
index 0566a6c0905..ec0e923dd2e 100644
--- a/htdocs/compta/resultat/index.php
+++ b/htdocs/compta/resultat/index.php
@@ -45,7 +45,7 @@ else {
*/
if ($user->societe_id > 0)
{
- $socidp = $user->societe_id;
+ $socid = $user->societe_id;
}
$modecompta = $conf->compta->mode;
@@ -95,7 +95,7 @@ if ($modecompta == 'CREANCES-DETTES') {
$sql .= " FROM ".MAIN_DB_PREFIX."facture as f, ".MAIN_DB_PREFIX."paiement_facture as pf, ".MAIN_DB_PREFIX."paiement as p";
$sql .= " WHERE p.rowid = pf.fk_paiement AND pf.fk_facture = f.rowid";
}
-if ($socidp) $sql .= " AND f.fk_soc = $socidp";
+if ($socid) $sql .= " AND f.fk_soc = $socid";
$sql .= " GROUP BY dm";
$sql .= " ORDER BY dm";
@@ -160,9 +160,9 @@ if ($modecompta == 'CREANCES-DETTES') {
$sql .= " ON f.rowid = p.fk_facture_fourn";
$sql .= " WHERE 1=1";
}
-if ($socidp)
+if ($socid)
{
- $sql .= " AND f.fk_soc = $socidp";
+ $sql .= " AND f.fk_soc = $socid";
}
$sql .= " GROUP BY dm";
diff --git a/htdocs/compta/stats/cabyuser.php b/htdocs/compta/stats/cabyuser.php
index c8c5382815b..422ea69da92 100644
--- a/htdocs/compta/stats/cabyuser.php
+++ b/htdocs/compta/stats/cabyuser.php
@@ -40,7 +40,7 @@ if (! $sortorder) $sortorder="asc";
if (! $sortfield) $sortfield="name";
// Sécurité accés client
-if ($user->societe_id > 0) $socidp = $user->societe_id;
+if ($user->societe_id > 0) $socid = $user->societe_id;
llxHeader();
@@ -91,7 +91,7 @@ else
$sql .= " WHERE p.rowid = pf.fk_paiement AND pf.fk_facture = f.rowid AND f.fk_user_author = u.rowid";
if ($year) $sql .= " AND p.datep between '".$year."-01-01 00:00:00' and '".$year."-12-31 23:59:59'";
}
-if ($socidp) $sql .= " AND f.fk_soc = $socidp";
+if ($socid) $sql .= " AND f.fk_soc = $socid";
$sql .= " GROUP BY rowid";
$sql .= " ORDER BY rowid";
diff --git a/htdocs/compta/stats/casoc.php b/htdocs/compta/stats/casoc.php
index 3cceba21a39..58bd40ad26d 100644
--- a/htdocs/compta/stats/casoc.php
+++ b/htdocs/compta/stats/casoc.php
@@ -40,7 +40,7 @@ if (! $sortorder) $sortorder="asc";
if (! $sortfield) $sortfield="nom";
// Sécurité accés client
-if ($user->societe_id > 0) $socidp = $user->societe_id;
+if ($user->societe_id > 0) $socid = $user->societe_id;
llxHeader();
@@ -90,7 +90,7 @@ else
$sql .= " WHERE p.rowid = pf.fk_paiement AND pf.fk_facture = f.rowid AND f.fk_soc = s.idp";
if ($year) $sql .= " AND p.datep between '".$year."-01-01 00:00:00' and '".$year."-12-31 23:59:59'";
}
-if ($socidp) $sql .= " AND f.fk_soc = $socidp";
+if ($socid) $sql .= " AND f.fk_soc = $socid";
$sql .= " GROUP BY rowid";
$sql .= " ORDER BY rowid";
diff --git a/htdocs/compta/stats/comp.php b/htdocs/compta/stats/comp.php
index d3f56d7b419..ae30244b48c 100644
--- a/htdocs/compta/stats/comp.php
+++ b/htdocs/compta/stats/comp.php
@@ -68,7 +68,7 @@ function propals ($db, $year, $month) {
$var=!$var;
print "";
- print "idp\">$objp->nom idp\">$objp->nom propalid\">$objp->ref ";
- print "idp\">$objp->nom idp\">$objp->nom facid\">$objp->facnumber ";
@@ -252,9 +252,9 @@ function ppt ($db, $year, $socidp)
$sql = "SELECT sum(f.price) as sum, round(date_format(f.datep,'%m')) as dm";
$sql .= " FROM ".MAIN_DB_PREFIX."propal as f WHERE fk_statut in (1,2,4) AND date_format(f.datep,'%Y') = $year ";
- if ($socidp)
+ if ($socid)
{
- $sql .= " AND f.fk_soc = $socidp";
+ $sql .= " AND f.fk_soc = $socid";
}
$sql .= " GROUP BY dm";
@@ -270,9 +270,9 @@ function ppt ($db, $year, $socidp)
$sql .= " AND f.paye = 1";
}
$sql .= " AND date_format(f.datef,'%Y') = $year ";
- if ($socidp)
+ if ($socid)
{
- $sql .= " AND f.fk_soc = $socidp";
+ $sql .= " AND f.fk_soc = $socid";
}
$sql .= " GROUP BY dm";
@@ -300,7 +300,7 @@ function ppt ($db, $year, $socidp)
}
$ayear = $year - 1;
- $acat = get_ca($db, $ayear, $socidp) - get_ca_propal($db, $ayear, $socidp);
+ $acat = get_ca($db, $ayear, $socid) - get_ca_propal($db, $ayear, $socid);
print "Total : ".price($deltat)." ".img_previous()." Année $cyear ".img_next()." ":""));
-ppt($db, $cyear, $socidp);
+ppt($db, $cyear, $socid);
if ($details == 1)
{
diff --git a/htdocs/compta/stats/cumul.php b/htdocs/compta/stats/cumul.php
index 218593ceba9..20d4c560657 100644
--- a/htdocs/compta/stats/cumul.php
+++ b/htdocs/compta/stats/cumul.php
@@ -37,7 +37,7 @@ llxHeader();
*/
if ($user->societe_id > 0)
{
- $socidp = $user->societe_id;
+ $socid = $user->societe_id;
}
$mode='recettes';
@@ -54,9 +54,9 @@ if ($conf->compta->mode != 'CREANCES-DETTES')
{
$sql .= " AND f.paye = 1";
}
-if ($socidp)
+if ($socid)
{
- $sql .= " AND f.fk_soc = $socidp";
+ $sql .= " AND f.fk_soc = $socid";
}
$sql .= " GROUP BY dm";
@@ -70,9 +70,9 @@ $sql .= " WHERE f.fk_statut = 1";
if ($conf->compta->mode != 'CREANCES-DETTES') {
$sql .= " AND f.paye = 1";
}
-if ($socidp)
+if ($socid)
{
- $sql .= " AND f.fk_soc = $socidp";
+ $sql .= " AND f.fk_soc = $socid";
}
$sql .= " GROUP BY dm";
diff --git a/htdocs/compta/stats/exercices.php b/htdocs/compta/stats/exercices.php
index f3567e66e37..544359df820 100644
--- a/htdocs/compta/stats/exercices.php
+++ b/htdocs/compta/stats/exercices.php
@@ -34,7 +34,7 @@ llxHeader();
*/
if ($user->societe_id > 0)
{
- $socidp = $user->societe_id;
+ $socid = $user->societe_id;
}
$mode='recettes';
@@ -74,7 +74,7 @@ function factures ($db, $year, $month, $paye)
$objp = $db->fetch_object($result);
$var=!$var;
print "";
- print "idp\">$objp->nom idp\">$objp->nom facid\">$objp->facnumber ".dolibarr_print_date($objp->df)." \n";
@@ -173,7 +173,7 @@ function pt ($db, $sql, $year) {
}
}
-function ppt ($db, $year, $socidp)
+function ppt ($db, $year, $socid)
{
global $bc,$conf,$langs;
print "";
@@ -193,9 +193,9 @@ function ppt ($db, $year, $socidp)
if ($conf->compta->mode != 'CREANCES-DETTES') {
$sql .= " AND f.paye = 1";
}
- if ($socidp)
+ if ($socid)
{
- $sql .= " AND f.fk_soc = $socidp";
+ $sql .= " AND f.fk_soc = $socid";
}
$sql .= " GROUP BY dm";
@@ -210,9 +210,9 @@ function ppt ($db, $year, $socidp)
if ($conf->compta->mode != 'CREANCES-DETTES') {
$sql .= " AND f.paye = 1";
}
- if ($socidp)
+ if ($socid)
{
- $sql .= " AND f.fk_soc = $socidp";
+ $sql .= " AND f.fk_soc = $socid";
}
$sql .= " GROUP BY dm";
@@ -251,7 +251,7 @@ function ppt ($db, $year, $socidp)
$cyear = strftime ("%Y", time());
-ppt($db, $cyear, $socidp);
+ppt($db, $cyear, $socid);
$db->close();
diff --git a/htdocs/compta/stats/index.php b/htdocs/compta/stats/index.php
index 8d7d9aa4563..050c781ae32 100644
--- a/htdocs/compta/stats/index.php
+++ b/htdocs/compta/stats/index.php
@@ -44,7 +44,7 @@ else {
*/
if ($user->societe_id > 0)
{
- $socidp = $user->societe_id;
+ $socid = $user->societe_id;
}
$modecompta = $conf->compta->mode;
@@ -93,7 +93,7 @@ if ($modecompta == 'CREANCES-DETTES') {
$sql .= " FROM ".MAIN_DB_PREFIX."facture as f, ".MAIN_DB_PREFIX."paiement_facture as pf, ".MAIN_DB_PREFIX."paiement as p";
$sql .= " WHERE p.rowid = pf.fk_paiement AND pf.fk_facture = f.rowid";
}
-if ($socidp) $sql .= " AND f.fk_soc = $socidp";
+if ($socid) $sql .= " AND f.fk_soc = $socid";
$sql .= " GROUP BY dm DESC";
$result = $db->query($sql);
@@ -315,9 +315,9 @@ if ($modecompta != 'CREANCES-DETTES')
$sql = "SELECT f.facnumber, f.rowid, s.nom, s.idp, f.total_ttc, sum(pf.amount) as am";
$sql .= " FROM ".MAIN_DB_PREFIX."societe as s,".MAIN_DB_PREFIX."facture as f left join ".MAIN_DB_PREFIX."paiement_facture as pf on f.rowid=pf.fk_facture";
$sql .= " WHERE s.idp = f.fk_soc AND f.paye = 0 AND f.fk_statut = 1";
- if ($socidp)
+ if ($socid)
{
- $sql .= " AND f.fk_soc = $socidp";
+ $sql .= " AND f.fk_soc = $socid";
}
$sql .= " GROUP BY f.facnumber,f.rowid,s.nom, s.idp, f.total_ttc";
@@ -366,9 +366,9 @@ En attendant correction.
WHERE p.fk_soc = s.idp
AND p.fk_statut >=1
AND p.facture =0";
- if ($socidp)
+ if ($socid)
{
- $sql .= " AND f.fk_soc = $socidp";
+ $sql .= " AND f.fk_soc = $socid";
}
$sql .= " GROUP BY p.rowid";
diff --git a/htdocs/compta/stats/lib.inc.php b/htdocs/compta/stats/lib.inc.php
index 6b8adf9a9d4..1f2830bfec0 100644
--- a/htdocs/compta/stats/lib.inc.php
+++ b/htdocs/compta/stats/lib.inc.php
@@ -21,13 +21,13 @@
*
*/
-function get_ca_propal ($db, $year, $socidp)
+function get_ca_propal ($db, $year, $socid)
{
$sql = "SELECT sum(f.price - f.remise) as sum FROM ".MAIN_DB_PREFIX."propal as f WHERE fk_statut in (1,2,4) AND date_format(f.datep, '%Y') = $year ";
- if ($socidp)
+ if ($socid)
{
- $sql .= " AND f.fk_soc = $socidp";
+ $sql .= " AND f.fk_soc = $socid";
}
$result = $db->query($sql);
@@ -43,7 +43,7 @@ function get_ca_propal ($db, $year, $socidp)
}
-function get_ca ($db, $year, $socidp)
+function get_ca ($db, $year, $socid)
{
$sql = "SELECT sum(f.amount) as sum FROM ".MAIN_DB_PREFIX."facture as f";
@@ -52,9 +52,9 @@ function get_ca ($db, $year, $socidp)
$sql .= " AND f.paye = 1";
}
$sql .= " AND date_format(f.datef , '%Y') = $year ";
- if ($socidp)
+ if ($socid)
{
- $sql .= " AND f.fk_soc = $socidp";
+ $sql .= " AND f.fk_soc = $socid";
}
$result = $db->query($sql);
diff --git a/htdocs/compta/stats/prev.php b/htdocs/compta/stats/prev.php
index 7a55e5423e5..03b26d83f2c 100644
--- a/htdocs/compta/stats/prev.php
+++ b/htdocs/compta/stats/prev.php
@@ -27,7 +27,7 @@ require("./pre.inc.php");
*/
if ($user->societe_id > 0)
{
- $socidp = $user->societe_id;
+ $socid = $user->societe_id;
}
@@ -98,9 +98,9 @@ print '';
$sql = "SELECT sum(f.price) as amount, date_format(f.datep,'%Y-%m') as dm";
$sql .= " FROM ".MAIN_DB_PREFIX."propal as f WHERE fk_statut in $in";
-if ($socidp)
+if ($socid)
{
- $sql .= " AND f.fk_soc = $socidp";
+ $sql .= " AND f.fk_soc = $socid";
}
$sql .= " GROUP BY dm DESC";
@@ -110,9 +110,9 @@ print ' ';
$sql = "SELECT sum(f.price) as amount, year(f.datep) as dm";
$sql .= " FROM ".MAIN_DB_PREFIX."propal as f WHERE fk_statut in $in";
-if ($socidp)
+if ($socid)
{
- $sql .= " AND f.fk_soc = $socidp";
+ $sql .= " AND f.fk_soc = $socid";
}
$sql .= " GROUP BY dm DESC";
@@ -122,9 +122,9 @@ print "'.$contrat->error.'
';
}
- $_GET["socid"]=$_POST["socidp"];
+ $_GET["socid"]=$_POST["socid"];
$_GET["action"]='create';
$action = '';
}
@@ -330,7 +330,7 @@ if ($_GET["action"] == 'create')
print ' ';
@@ -268,11 +268,11 @@ if ($_GET["id"] > 0)
print ' ';
if ($_GET['action'] == 'classer')
{
- $html->form_project($_SERVER['PHP_SELF'].'?id='.$commande->id, $commande->socidp, $commande->projet_id, 'projetid');
+ $html->form_project($_SERVER['PHP_SELF'].'?id='.$commande->id, $commande->socid, $commande->projet_id, 'projetid');
}
else
{
- $html->form_project($_SERVER['PHP_SELF'].'?id='.$commande->id, $commande->socidp, $commande->projet_id, 'none');
+ $html->form_project($_SERVER['PHP_SELF'].'?id='.$commande->id, $commande->socid, $commande->projet_id, 'none');
}
print '
';
* Commandes en traitement
*/
$sql = "SELECT c.rowid, c.ref, s.nom, s.idp";
-if (!$user->rights->commercial->client->voir && !$socidp) $sql .= ", sc.fk_soc, sc.fk_user";
+if (!$user->rights->commercial->client->voir && !$socid) $sql .= ", sc.fk_soc, sc.fk_user";
$sql .= " FROM ".MAIN_DB_PREFIX."commande as c, ".MAIN_DB_PREFIX."societe as s";
-if (!$user->rights->commercial->client->voir && !$socidp) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+if (!$user->rights->commercial->client->voir && !$socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
$sql .= " WHERE c.fk_soc = s.idp AND c.fk_statut = 2";
-if ($socidp) $sql .= " AND c.fk_soc = $socidp";
-if (!$user->rights->commercial->client->voir && !$socidp) $sql .= " AND s.idp = sc.fk_soc AND sc.fk_user = " .$user->id;
+if ($socid) $sql .= " AND c.fk_soc = $socid";
+if (!$user->rights->commercial->client->voir && !$socid) $sql .= " AND s.idp = sc.fk_soc AND sc.fk_user = " .$user->id;
$resql = $db->query($sql);
if ( $resql )
{
@@ -174,12 +174,12 @@ if ( $resql )
* Expeditions à valider
*/
$sql = "SELECT e.rowid, e.ref, s.nom, s.idp, c.ref as commande_ref, c.rowid as commande_id";
-if (!$user->rights->commercial->client->voir && !$socidp) $sql .= ", sc.fk_soc, sc.fk_user";
+if (!$user->rights->commercial->client->voir && !$socid) $sql .= ", sc.fk_soc, sc.fk_user";
$sql .= " FROM ".MAIN_DB_PREFIX."expedition as e, ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."commande as c";
-if (!$user->rights->commercial->client->voir && !$socidp) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+if (!$user->rights->commercial->client->voir && !$socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
$sql .= " WHERE e.fk_commande = c.rowid AND c.fk_soc = s.idp AND e.fk_statut = 1";
-if ($socidp) $sql .= " AND c.fk_soc = $socidp";
-if (!$user->rights->commercial->client->voir && !$socidp) $sql .= " AND s.idp = sc.fk_soc AND sc.fk_user = " .$user->id;
+if ($socid) $sql .= " AND c.fk_soc = $socid";
+if (!$user->rights->commercial->client->voir && !$socid) $sql .= " AND s.idp = sc.fk_soc AND sc.fk_user = " .$user->id;
$sql .= " ORDER BY e.date_expedition DESC";
$sql .= $db->plimit(5, 0);
diff --git a/htdocs/expedition/liste.php b/htdocs/expedition/liste.php
index a1a46567e09..0b1e4122395 100644
--- a/htdocs/expedition/liste.php
+++ b/htdocs/expedition/liste.php
@@ -35,7 +35,7 @@ if (!$user->rights->expedition->lire) accessforbidden();
if ($user->societe_id > 0)
{
$action = '';
- $socidp = $user->societe_id;
+ $socid = $user->societe_id;
}
$sortfield=isset($_GET["sortfield"])?$_GET["sortfield"]:"";
@@ -58,17 +58,17 @@ $offset = $limit * $_GET["page"] ;
llxHeader('',$langs->trans('ListOfSendings'),'ch-expedition.html');
$sql = "SELECT e.rowid, e.ref,".$db->pdate("e.date_expedition")." as date_expedition, e.fk_statut, s.nom as socname, s.idp, c.ref as comref, c.rowid as comid";
-if (!$user->rights->commercial->client->voir && !$socidp) $sql .= ", sc.fk_soc, sc.fk_user";
+if (!$user->rights->commercial->client->voir && !$socid) $sql .= ", sc.fk_soc, sc.fk_user";
$sql .= " FROM ".MAIN_DB_PREFIX."expedition as e";
-if (!$user->rights->commercial->client->voir && !$socidp) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc, ".MAIN_DB_PREFIX."commande as c";
-if ($socidp) $sql.=", ".MAIN_DB_PREFIX."commande as c";
-if ($user->rights->commercial->client->voir && !$socidp) $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."commande as c ON c.rowid = e.fk_commande";
+if (!$user->rights->commercial->client->voir && !$socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc, ".MAIN_DB_PREFIX."commande as c";
+if ($socid) $sql.=", ".MAIN_DB_PREFIX."commande as c";
+if ($user->rights->commercial->client->voir && !$socid) $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."commande as c ON c.rowid = e.fk_commande";
$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON s.idp = c.fk_soc";
$sql_add = " WHERE ";
-if ($socidp)
+if ($socid)
{
- $sql.= $sql_add . " e.fk_commande = c.rowid AND c.fk_soc = ".$socidp;
+ $sql.= $sql_add . " e.fk_commande = c.rowid AND c.fk_soc = ".$socid;
$sql_add = " AND ";
}
if ($_POST["sf_ref"])
@@ -76,7 +76,7 @@ if ($_POST["sf_ref"])
$sql.= $sql_add . " e.ref like '%".addslashes($_POST["sf_ref"])."%'";
$sql_add = " AND ";
}
-if (!$user->rights->commercial->client->voir && !$socidp) //restriction
+if (!$user->rights->commercial->client->voir && !$socid) //restriction
{
$sql .= $sql_add . " e.fk_commande = c.rowid AND c.fk_soc = sc.fk_soc AND sc.fk_user = " .$user->id;
}
@@ -91,17 +91,17 @@ if ($resql)
{
$num = $db->num_rows($resql);
- print_barre_liste($langs->trans('ListOfSendings'), $_GET["page"], "liste.php","&socidp=$socidp",$sortfield,$sortorder,'',$num);
+ print_barre_liste($langs->trans('ListOfSendings'), $_GET["page"], "liste.php","&socid=$socid",$sortfield,$sortorder,'',$num);
$i = 0;
print '';
print '';
- print_liste_field_titre($langs->trans("Ref"),"liste.php","e.ref","","&socidp=$socidp",'width="15%"',$sortfield);
- print_liste_field_titre($langs->trans("Company"),"liste.php","s.nom", "", "&socidp=$socidp",'width="25%" align="left"',$sortfield);
- print_liste_field_titre($langs->trans("Order"),"liste.php","c.ref", "", "&socidp=$socidp",'width="25%" align="left"',$sortfield);
- print_liste_field_titre($langs->trans("Date"),"liste.php","e.date_expedition","","&socidp=$socidp", 'width="25%" align="right" colspan="2"',$sortfield);
- print_liste_field_titre($langs->trans("Status"),"liste.php","e.fk_statut","","&socidp=$socidp",'width="10%" align="center"',$sortfield);
+ print_liste_field_titre($langs->trans("Ref"),"liste.php","e.ref","","&socid=$socid",'width="15%"',$sortfield);
+ print_liste_field_titre($langs->trans("Company"),"liste.php","s.nom", "", "&socid=$socid",'width="25%" align="left"',$sortfield);
+ print_liste_field_titre($langs->trans("Order"),"liste.php","c.ref", "", "&socid=$socid",'width="25%" align="left"',$sortfield);
+ print_liste_field_titre($langs->trans("Date"),"liste.php","e.date_expedition","","&socid=$socid", 'width="25%" align="right" colspan="2"',$sortfield);
+ print_liste_field_titre($langs->trans("Status"),"liste.php","e.fk_statut","","&socid=$socid",'width="10%" align="center"',$sortfield);
print " \n";
$var=True;
diff --git a/htdocs/expedition/mods/pdf/pdf_expedition_merou.modules.php b/htdocs/expedition/mods/pdf/pdf_expedition_merou.modules.php
index 7f57f152037..efda5ce637a 100644
--- a/htdocs/expedition/mods/pdf/pdf_expedition_merou.modules.php
+++ b/htdocs/expedition/mods/pdf/pdf_expedition_merou.modules.php
@@ -100,7 +100,7 @@ Class pdf_expedition_merou extends ModelePdfExpedition
{
//Creation du Client
$soc = new Societe($this->db);
- $soc->fetch($this->expe->commande->socidp);
+ $soc->fetch($this->expe->commande->socid);
//Creation de l expediteur
$this->expediteur = $soc;
diff --git a/htdocs/facture.class.php b/htdocs/facture.class.php
index 8f695f1f3f8..d0217fb0339 100644
--- a/htdocs/facture.class.php
+++ b/htdocs/facture.class.php
@@ -49,7 +49,7 @@ class Facture extends CommonObject
var $id;
- var $socidp; // Id client
+ var $socid; // Id client
var $client; // Objet societe client (à charger par fetch_client)
var $number;
@@ -91,17 +91,17 @@ class Facture extends CommonObject
/**
* \brief Constructeur de la classe
* \param DB handler accès base de données
- * \param socidp id societe ('' par defaut)
+ * \param socid id societe ('' par defaut)
* \param facid id facture ('' par defaut)
*/
- function Facture($DB, $socidp='', $facid='')
+ function Facture($DB, $socid='', $facid='')
{
$this->db = $DB;
$this->table = 'facture';
$this->tabledetail = 'facturedet';
$this->id = $facid;
- $this->socidp = $socidp;
+ $this->socid = $socid;
$this->amount = 0;
$this->remise = 0;
@@ -134,7 +134,7 @@ class Facture extends CommonObject
dolibarr_syslog("Facture::create");
$soc = new Societe($this->db);
- $soc->fetch($this->socidp);
+ $soc->fetch($this->socid);
$this->db->begin();
@@ -160,7 +160,7 @@ class Facture extends CommonObject
$datelim=$this->calculate_date_lim_reglement();
// Insertion dans la base
- $socid = $this->socidp;
+ $socid = $this->socid;
$amount = $this->amount;
$remise = $this->remise;
@@ -310,7 +310,7 @@ class Facture extends CommonObject
$facture->fk_facture_source = $this->fk_facture_source;
$facture->type = $this->type;
- $facture->socidp = $this->socidp;
+ $facture->socid = $this->socid;
$facture->date = $this->date;
$facture->note_public = $this->note_public;
$facture->note = $this->note;
@@ -337,7 +337,7 @@ class Facture extends CommonObject
}
}
- dolibarr_syslog("Facture::create_clone invertdetail=$invertdetail socidp=".$this->socidp." nboflines=".sizeof($facture->lignes));
+ dolibarr_syslog("Facture::create_clone invertdetail=$invertdetail socid=".$this->socid." nboflines=".sizeof($facture->lignes));
$facid = $facture->create($user);
@@ -418,7 +418,7 @@ class Facture extends CommonObject
$this->paye = $obj->paye;
$this->close_code = $obj->close_code;
$this->close_note = $obj->close_note;
- $this->socidp = $obj->fk_soc;
+ $this->socid = $obj->fk_soc;
$this->statut = $obj->fk_statut;
$this->date_lim_reglement = $obj->dlr;
$this->mode_reglement_id = $obj->fk_mode_reglement;
@@ -1181,7 +1181,7 @@ class Facture extends CommonObject
{
// Classe la société rattachée comme client
$soc=new Societe($this->db);
- $soc->id = $this->socidp;
+ $soc->id = $this->socid;
$result=$soc->set_as_client();
$this->ref = $numfa;
@@ -2238,7 +2238,7 @@ class Facture extends CommonObject
dolibarr_syslog("Facture::demande_prelevement $this->statut $this->paye $this->mode_reglement_id");
$soc = new Societe($this->db);
- $soc->id = $this->socidp;
+ $soc->id = $this->socid;
$soc->rib();
if ($this->statut > 0 && $this->paye == 0 && $this->mode_reglement_id == 3)
{
@@ -2539,7 +2539,7 @@ class Facture extends CommonObject
$this->ref = 'SPECIMEN';
$this->specimen=1;
$socid = rand(1, $num_socs);
- $this->socidp = $socids[$socid];
+ $this->socid = $socids[$socid];
$this->date = time();
$this->date_lim_reglement=$this->date+3600*24*30;
$this->cond_reglement_code = 'RECEP';
diff --git a/htdocs/fichinter/fiche.php b/htdocs/fichinter/fiche.php
index 7da16542ddb..59194a4ce61 100644
--- a/htdocs/fichinter/fiche.php
+++ b/htdocs/fichinter/fiche.php
@@ -43,17 +43,17 @@ $user->getrights("ficheinter");
if (!$user->rights->ficheinter->lire) accessforbidden();
-if ($_GET["socidp"])
+if ($_GET["socid"])
{
$societe=new Societe($db);
- $societe->fetch($_GET["socidp"]);
+ $societe->fetch($_GET["socid"]);
}
// Sécurité accés client
if ($user->societe_id > 0)
{
$action = '';
- $socidp = $user->societe_id;
+ $socid = $user->societe_id;
}
@@ -73,7 +73,7 @@ if ($_POST["action"] == 'add')
$fichinter = new Fichinter($db);
$fichinter->date = $db->idate(mktime(12, 1 , 1, $_POST["pmonth"], $_POST["pday"], $_POST["pyear"]));
- $fichinter->socidp = $_POST["socidp"];
+ $fichinter->socid = $_POST["socid"];
$fichinter->duree = $_POST["duree"];
$fichinter->projet_id = $_POST["projetidp"];
$fichinter->author = $user->id;
@@ -89,7 +89,7 @@ if ($_POST["action"] == 'update')
$fichinter = new Fichinter($db);
$fichinter->date = $db->idate(mktime(12, 1 , 1, $_POST["remonth"], $_POST["reday"], $_POST["reyear"]));
- $fichinter->socidp = $_POST["socidp"];
+ $fichinter->socid = $_POST["socid"];
$fichinter->duree = $_POST["duree"];
$fichinter->projet_id = $_POST["projetidp"];
$fichinter->author = $user->id;
@@ -159,7 +159,7 @@ if ($_GET["action"] == 'create')
$syear = date("Y", time());
print '';
- print '".$langs->trans("Company")." ".$societe->getNomUrl(1)." ".$langs->trans("Date")." ";
@@ -180,7 +180,7 @@ if ($_GET["action"] == 'create')
print ' '.$langs->trans("Project").' ';
print ''.$langs->trans("Add").' ';
+ print ''.$langs->trans("Add").' ';
}
}
diff --git a/htdocs/fichinter/fichinter.class.php b/htdocs/fichinter/fichinter.class.php
index fcdde10c94c..d295c325c63 100644
--- a/htdocs/fichinter/fichinter.class.php
+++ b/htdocs/fichinter/fichinter.class.php
@@ -39,7 +39,7 @@ class Fichinter extends CommonObject
var $id;
- var $socidp; // Id client
+ var $socid; // Id client
var $client; // Objet societe client (à charger par fetch_client)
var $author;
@@ -53,14 +53,14 @@ class Fichinter extends CommonObject
/**
* \brief Constructeur de la classe
* \param DB Handler accès base de données
- * \param socidp Id societe
+ * \param socid Id societe
*/
- function Fichinter($DB, $socidp="")
+ function Fichinter($DB, $socid="")
{
global $langs;
$this->db = $DB ;
- $this->socidp = $socidp;
+ $this->socid = $socid;
$this->products = array();
$this->projet_id = 0;
@@ -85,7 +85,7 @@ class Fichinter extends CommonObject
$sql .= ",fk_projet";
}
$sql .= ") ";
- $sql .= " VALUES ($this->socidp, $this->date, now(), '$this->ref', $this->author, '".addslashes($this->note)."', $this->duree";
+ $sql .= " VALUES ($this->socid, $this->date, now(), '$this->ref', $this->author, '".addslashes($this->note)."', $this->duree";
if ($this->projet_id) {
$sql .= ", $this->projet_id";
}
@@ -200,7 +200,7 @@ class Fichinter extends CommonObject
$this->duree = $obj->duree;
$this->ref = $obj->ref;
$this->note = $obj->note;
- $this->socidp = $obj->fk_soc;
+ $this->socid = $obj->fk_soc;
$this->societe_id = $obj->fk_soc; // A virer, obsolete
$this->projet_id = $obj->fk_projet;
$this->statut = $obj->fk_statut;
diff --git a/htdocs/fichinter/index.php b/htdocs/fichinter/index.php
index 16420c960ef..5e36923e27c 100644
--- a/htdocs/fichinter/index.php
+++ b/htdocs/fichinter/index.php
@@ -44,7 +44,7 @@ llxHeader();
$sortorder=$_GET["sortorder"]?$_GET["sortorder"]:$_POST["sortorder"];
$sortfield=$_GET["sortfield"]?$_GET["sortfield"]:$_POST["sortfield"];
-$socid=$_GET["socidp"]?$_GET["socidp"]:$_POST["socidp"];
+$socid=$_GET["socid"]?$_GET["socid"]:$_POST["socid"];
if (! $sortorder) $sortorder="DESC";
if (! $sortfield) $sortfield="f.datei";
diff --git a/htdocs/fourn/commande/fiche.php b/htdocs/fourn/commande/fiche.php
index 4b75103c932..d82f7610cd0 100644
--- a/htdocs/fourn/commande/fiche.php
+++ b/htdocs/fourn/commande/fiche.php
@@ -39,11 +39,11 @@ if (!$user->rights->fournisseur->commande->lire) accessforbidden();
// Sécurité accés client
-$socidp=0;
+$socid=0;
if ($user->societe_id > 0)
{
$action = '';
- $socidp = $user->societe_id;
+ $socid = $user->societe_id;
}
$mesg='';
@@ -134,7 +134,7 @@ if ($_POST["action"] == 'confirm_valid' && $_POST["confirm"] == 'yes' && $user->
$commande = new CommandeFournisseur($db);
$commande->fetch($_GET["id"]);
$soc = new Societe($db);
- $soc->fetch($commande->socidp);
+ $soc->fetch($commande->socid);
$result = $commande->valid($user);
if ($result >= 0)
{
@@ -268,7 +268,7 @@ if ($_GET["id"] > 0)
if ( $commande->fetch($_GET["id"]) == 0)
{
$soc = new Societe($db);
- $soc->fetch($commande->socidp);
+ $soc->fetch($commande->socid);
$author = new User($db);
$author->id = $commande->user_author_id;
@@ -324,7 +324,7 @@ if ($_GET["id"] > 0)
require_once(DOL_DOCUMENT_ROOT ."/notify.class.php");
$notify=new Notify($db);
$text.=''.$langs->trans("Project").' ';
$proj = new Project($db);
- $html->select_array("projetid",$proj->liste_array($commande->socidp));
+ $html->select_array("projetid",$proj->liste_array($commande->socid));
print "
';
diff --git a/htdocs/fourn/commande/history.php b/htdocs/fourn/commande/history.php
index 4bae969edbe..b715a6c9754 100644
--- a/htdocs/fourn/commande/history.php
+++ b/htdocs/fourn/commande/history.php
@@ -51,7 +51,7 @@ if ($_GET["id"] > 0)
if ( $commande->fetch($_GET["id"]) == 0)
{
- $soc->fetch($commande->socidp);
+ $soc->fetch($commande->socid);
$author = new User($db);
$author->id = $commande->user_author_id;
diff --git a/htdocs/fourn/commande/index.php b/htdocs/fourn/commande/index.php
index 1b01bb725ac..9d2267f9eeb 100644
--- a/htdocs/fourn/commande/index.php
+++ b/htdocs/fourn/commande/index.php
@@ -37,7 +37,7 @@ llxHeader('',"Commandes Fournisseurs");
if ($user->societe_id > 0)
{
$action = '';
- $socidp = $user->societe_id;
+ $socid = $user->societe_id;
}
$commande = new CommandeFournisseur($db);
diff --git a/htdocs/fourn/commande/liste.php b/htdocs/fourn/commande/liste.php
index 44b7af167f9..42a7ee08272 100644
--- a/htdocs/fourn/commande/liste.php
+++ b/htdocs/fourn/commande/liste.php
@@ -78,7 +78,7 @@ $sql .= " WHERE cf.fk_soc = s.idp ";
if ($socid)
{
- $sql .= " AND s.idp=$socid";
+ $sql .= " AND s.idp=".$socid;
}
if (strlen($_GET["statut"]))
diff --git a/htdocs/fourn/commande/modules/modules_commandefournisseur.php b/htdocs/fourn/commande/modules/modules_commandefournisseur.php
index 08b76eaae15..984350a7de1 100644
--- a/htdocs/fourn/commande/modules/modules_commandefournisseur.php
+++ b/htdocs/fourn/commande/modules/modules_commandefournisseur.php
@@ -190,7 +190,7 @@ function commande_supplier_delete_preview($db, $propalid)
$comfourn = new CommandeFournisseur($db,"",$propalid);
$comfourn->fetch($propalid);
$client = new Societe($db);
- $client->fetch($comfourn->socidp);
+ $client->fetch($comfourn->socid);
if ($conf->fournisseur->commande->dir_output)
{
diff --git a/htdocs/fourn/commande/modules/pdf/pdf_muscadet.modules.php b/htdocs/fourn/commande/modules/pdf/pdf_muscadet.modules.php
index 3f7cbb17c92..20bce753819 100644
--- a/htdocs/fourn/commande/modules/pdf/pdf_muscadet.modules.php
+++ b/htdocs/fourn/commande/modules/pdf/pdf_muscadet.modules.php
@@ -728,7 +728,7 @@ class pdf_muscadet extends ModelePDFCommandesSuppliers
$pdf->MultiCell(80,5, $langs->trans("BillTo").":");
//
$client = new Societe($this->db);
- $client->fetch($com->socidp);
+ $client->fetch($com->socid);
$com->client = $client;
//
diff --git a/htdocs/fourn/commande/note.php b/htdocs/fourn/commande/note.php
index 21adf98b646..bc0d732d807 100644
--- a/htdocs/fourn/commande/note.php
+++ b/htdocs/fourn/commande/note.php
@@ -73,7 +73,7 @@ if ($_GET["id"] > 0)
if ( $commande->fetch($_GET["id"]) == 0)
{
$soc = new Societe($db);
- $soc->fetch($commande->socidp);
+ $soc->fetch($commande->socid);
$author = new User($db);
$author->id = $commande->user_author_id;
diff --git a/htdocs/fourn/contact.php b/htdocs/fourn/contact.php
index bcff3a4795b..3c8ce3772d3 100644
--- a/htdocs/fourn/contact.php
+++ b/htdocs/fourn/contact.php
@@ -41,7 +41,7 @@ llxHeader();
if ($user->societe_id > 0)
{
$action = '';
- $socidp = $user->societe_id;
+ $socid = $user->societe_id;
}
$page=$_GET["page"];
@@ -61,11 +61,11 @@ $offset = $limit * $page ;
*/
$sql = "SELECT s.idp, s.nom, st.libelle as stcomm, p.idp as cidp, p.name, p.firstname, p.email, p.phone";
-if (!$user->rights->commercial->client->voir && !$socidp) $sql .= ", sc.fk_soc, sc.fk_user ";
+if (!$user->rights->commercial->client->voir && !$socid) $sql .= ", sc.fk_soc, sc.fk_user ";
$sql .= " FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."socpeople as p, ".MAIN_DB_PREFIX."c_stcomm as st";
-if (!$user->rights->commercial->client->voir && !$socidp) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+if (!$user->rights->commercial->client->voir && !$socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
$sql .= " WHERE s.fk_stcomm = st.id AND s.fournisseur = 1 AND s.idp = p.fk_soc";
-if (!$user->rights->commercial->client->voir && !$socidp) $sql .= " AND s.idp = sc.fk_soc AND sc.fk_user = " .$user->id;
+if (!$user->rights->commercial->client->voir && !$socid) $sql .= " AND s.idp = sc.fk_soc AND sc.fk_user = " .$user->id;
if (strlen($stcomm)) {
$sql .= " AND s.fk_stcomm=$stcomm";
@@ -81,8 +81,8 @@ if ($contactname) {
$sortorder = "ASC";
}
-if ($socidp) {
- $sql .= " AND s.idp = $socidp";
+if ($socid) {
+ $sql .= " AND s.idp = $socid";
}
$sql .= " ORDER BY $sortfield $sortorder " . $db->plimit( $limit, $offset);
@@ -113,7 +113,7 @@ if ($result) {
print ''.img_object($langs->trans("ShowContact"),"contact").' '.$obj->name.' '.$obj->firstname.' ';
- print ''.img_object($langs->trans("ShowCompany"),"company").' '.$obj->nom.' '.img_object($langs->trans("ShowCompany"),"company").' '.$obj->nom.' '.$obj->email.' ';
print ''.$obj->phone.' ';
diff --git a/htdocs/fourn/facture/fiche.php b/htdocs/fourn/facture/fiche.php
index 52d9798f615..419b39458b6 100644
--- a/htdocs/fourn/facture/fiche.php
+++ b/htdocs/fourn/facture/fiche.php
@@ -45,7 +45,7 @@ $langs->load('companies');
if ($user->societe_id > 0)
{
$action = '';
- $socidp = $user->societe_id;
+ $socid = $user->societe_id;
}
@@ -149,7 +149,7 @@ if ($_POST['action'] == 'add' && $user->rights->fournisseur->facture->creer)
$facfou = new FactureFournisseur($db);
$facfou->ref = $_POST['facnumber'];
- $facfou->socidp = $_POST['socidp'];
+ $facfou->socid = $_POST['socid'];
$facfou->libelle = $_POST['libelle'];
$facfou->date = $datefacture;
$facfou->date_echeance = mktime(12,0,0,$_POST['echmonth'],$_POST['echday'],$_POST['echyear']);
@@ -316,11 +316,11 @@ if ($_GET['action'] == 'create' or $_GET['action'] == 'copy')
if ($_GET['socid'])
{
print $societe->getNomUrl(1);
- print ''.$langs->trans('NotePublic').' ';
@@ -402,9 +402,9 @@ else
$fac->fetch($_GET['facid']);
$societe = new Fournisseur($db);
- if ($societe->fetch($fac->socidp))
+ if ($societe->fetch($fac->socid))
{
- $addons[0][0] = DOL_URL_ROOT.'/fourn/fiche.php?socid='.$fac->socidp;
+ $addons[0][0] = DOL_URL_ROOT.'/fourn/fiche.php?socid='.$fac->socid;
$addons[0][1] = $societe->nom;
}
@@ -557,11 +557,11 @@ else
if ($conf->produit->enabled)
{
print '
";
@@ -123,15 +123,15 @@ if ($_GET["id"] || $_GET["ref"])
$sql = "SELECT distinct(s.nom), s.idp, s.code_client, c.rowid, c.total_ht as amount, c.ref,";
$sql.= " ".$db->pdate("c.date_creation")." as date, c.fk_statut as statut, c.rowid as commandeid";
- if (!$user->rights->commercial->client->voir && !$socidp) $sql .= ", sc.fk_soc, sc.fk_user ";
+ if (!$user->rights->commercial->client->voir && !$socid) $sql .= ", sc.fk_soc, sc.fk_user ";
$sql.= " FROM ".MAIN_DB_PREFIX."societe as s,".MAIN_DB_PREFIX."commande_fournisseur as c, ".MAIN_DB_PREFIX."commande_fournisseurdet as d";
- if (!$user->rights->commercial->client->voir && !$socidp) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+ if (!$user->rights->commercial->client->voir && !$socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
$sql.= " WHERE c.fk_soc = s.idp";
$sql.= " AND d.fk_commande = c.rowid AND d.fk_product =".$product->id;
- if (!$user->rights->commercial->client->voir && !$socidp) $sql .= " AND s.idp = sc.fk_soc AND sc.fk_user = " .$user->id;
- if ($socidp)
+ if (!$user->rights->commercial->client->voir && !$socid) $sql .= " AND s.idp = sc.fk_soc AND sc.fk_user = " .$user->id;
+ if ($socid)
{
- $sql .= " AND c.fk_soc = ".$socidp;
+ $sql .= " AND c.fk_soc = ".$socid;
}
$sql.= " ORDER BY $sortfield $sortorder ";
$sql.= $db->plimit($conf->liste_limit +1, $offset);
diff --git a/htdocs/product/stats/contrat.php b/htdocs/product/stats/contrat.php
index fea1b8d7f42..caa740041ad 100644
--- a/htdocs/product/stats/contrat.php
+++ b/htdocs/product/stats/contrat.php
@@ -50,7 +50,7 @@ if (! $sortorder) $sortorder="DESC";
if (! $sortfield) $sortfield="c.datec";
// Securite
-$socidp = 0;
+$socid = 0;
if ($user->societe_id > 0)
{
$action = '';
@@ -112,7 +112,7 @@ if ($_GET["id"] || $_GET["ref"])
print $product->getLibStatut(2);
print ' ';
- show_stats_for_company($product,$socidp);
+ show_stats_for_company($product,$socid);
print "
";
diff --git a/htdocs/product/stats/facture.php b/htdocs/product/stats/facture.php
index bdf098d48d7..ad2c79c29ec 100644
--- a/htdocs/product/stats/facture.php
+++ b/htdocs/product/stats/facture.php
@@ -51,10 +51,10 @@ if (! $sortorder) $sortorder="DESC";
if (! $sortfield) $sortfield="f.datef";
// Securite
-$socidp = 0;
+$socid = 0;
if ($user->societe_id > 0)
{
- $socidp = $user->societe_id;
+ $socid = $user->societe_id;
}
@@ -108,7 +108,7 @@ if ($_GET["id"] || $_GET["ref"])
print $product->getLibStatut(2);
print ' ';
- show_stats_for_company($product,$socidp);
+ show_stats_for_company($product,$socid);
print "
";
@@ -117,15 +117,15 @@ if ($_GET["id"] || $_GET["ref"])
$sql = "SELECT distinct(s.nom), s.idp, s.code_client, f.facnumber, f.amount as amount,";
$sql.= " ".$db->pdate("f.datef")." as date, f.paye, f.fk_statut as statut, f.rowid as facid";
- if (!$user->rights->commercial->client->voir && !$socidp) $sql .= ", sc.fk_soc, sc.fk_user ";
+ if (!$user->rights->commercial->client->voir && !$socid) $sql .= ", sc.fk_soc, sc.fk_user ";
$sql.= " FROM ".MAIN_DB_PREFIX."societe as s,".MAIN_DB_PREFIX."facture as f, ".MAIN_DB_PREFIX."facturedet as d";
- if (!$user->rights->commercial->client->voir && !$socidp) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+ if (!$user->rights->commercial->client->voir && !$socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
$sql.= " WHERE f.fk_soc = s.idp";
$sql.= " AND d.fk_facture = f.rowid AND d.fk_product =".$product->id;
- if (!$user->rights->commercial->client->voir && !$socidp) $sql .= " AND s.idp = sc.fk_soc AND sc.fk_user = " .$user->id;
- if ($socidp)
+ if (!$user->rights->commercial->client->voir && !$socid) $sql .= " AND s.idp = sc.fk_soc AND sc.fk_user = " .$user->id;
+ if ($socid)
{
- $sql .= " AND f.fk_soc = $socidp";
+ $sql .= " AND f.fk_soc = $socid";
}
$sql.= " ORDER BY $sortfield $sortorder ";
$sql.= $db->plimit($conf->liste_limit +1, $offset);
@@ -161,7 +161,7 @@ if ($_GET["id"] || $_GET["ref"])
print ''.img_object($langs->trans("ShowBill"),"bill").' ';
print $objp->facnumber;
print " '.img_object($langs->trans("ShowCompany"),"company").' '.dolibarr_trunc($objp->nom,44).' '.img_object($langs->trans("ShowCompany"),"company").' '.dolibarr_trunc($objp->nom,44).' ".$objp->code_client." \n";
print "";
print dolibarr_print_date($objp->date)." ";
diff --git a/htdocs/product/stats/facture_fournisseur.php b/htdocs/product/stats/facture_fournisseur.php
index 1bceaa6b39b..e587af64f8e 100644
--- a/htdocs/product/stats/facture_fournisseur.php
+++ b/htdocs/product/stats/facture_fournisseur.php
@@ -52,10 +52,10 @@ if (! $sortorder) $sortorder="DESC";
if (! $sortfield) $sortfield="f.datef";
// Securite
-$socidp = 0;
+$socid = 0;
if ($user->societe_id > 0)
{
- $socidp = $user->societe_id;
+ $socid = $user->societe_id;
}
@@ -109,7 +109,7 @@ if ($_GET["id"] || $_GET["ref"])
print $product->getLibStatut(2);
print ' ';
- show_stats_for_company($product,$socidp);
+ show_stats_for_company($product,$socid);
print "
";
@@ -118,15 +118,15 @@ if ($_GET["id"] || $_GET["ref"])
$sql = "SELECT distinct(s.nom), s.idp, s.code_client, f.facnumber, f.amount as amount,";
$sql.= " ".$db->pdate("f.datef")." as date, f.paye, f.fk_statut as statut, f.rowid as facid";
- if (!$user->rights->commercial->client->voir && !$socidp) $sql .= ", sc.fk_soc, sc.fk_user ";
+ if (!$user->rights->commercial->client->voir && !$socid) $sql .= ", sc.fk_soc, sc.fk_user ";
$sql.= " FROM ".MAIN_DB_PREFIX."societe as s,".MAIN_DB_PREFIX."facture_fourn as f, ".MAIN_DB_PREFIX."facture_fourn_det as d";
- if (!$user->rights->commercial->client->voir && !$socidp) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+ if (!$user->rights->commercial->client->voir && !$socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
$sql.= " WHERE f.fk_soc = s.idp";
$sql.= " AND d.fk_facture_fourn = f.rowid AND d.fk_product =".$product->id;
- if (!$user->rights->commercial->client->voir && !$socidp) $sql .= " AND s.idp = sc.fk_soc AND sc.fk_user = " .$user->id;
- if ($socidp)
+ if (!$user->rights->commercial->client->voir && !$socid) $sql .= " AND s.idp = sc.fk_soc AND sc.fk_user = " .$user->id;
+ if ($socid)
{
- $sql .= " AND f.fk_soc = $socidp";
+ $sql .= " AND f.fk_soc = $socid";
}
$sql.= " ORDER BY $sortfield $sortorder ";
$sql.= $db->plimit($conf->liste_limit +1, $offset);
@@ -162,7 +162,7 @@ if ($_GET["id"] || $_GET["ref"])
print ''.img_object($langs->trans("ShowBill"),"bill").' ';
print $objp->facnumber;
print " '.img_object($langs->trans("ShowCompany"),"company").' '.dolibarr_trunc($objp->nom,44).' '.img_object($langs->trans("ShowCompany"),"company").' '.dolibarr_trunc($objp->nom,44).' ".$objp->code_client." \n";
print "";
print dolibarr_print_date($objp->date)." ";
diff --git a/htdocs/product/stats/fiche.php b/htdocs/product/stats/fiche.php
index fe9520a0f60..34801bb8a65 100644
--- a/htdocs/product/stats/fiche.php
+++ b/htdocs/product/stats/fiche.php
@@ -103,7 +103,7 @@ if ($_GET["id"] || $_GET["ref"])
print $product->getLibStatut(2);
print '';
- show_stats_for_company($product,$socidp);
+ show_stats_for_company($product,$socid);
print '
';
print '';
diff --git a/htdocs/product/stats/propal.php b/htdocs/product/stats/propal.php
index 370b0fdc7d6..a43be3f1393 100644
--- a/htdocs/product/stats/propal.php
+++ b/htdocs/product/stats/propal.php
@@ -49,15 +49,15 @@ if (! $sortfield) $sortfield="p.datec";
// Securite
-$socidp = 0;
+$socid = 0;
if ($user->societe_id > 0)
{
$action = '';
- $socidp = $user->societe_id;
+ $socid = $user->societe_id;
}
else
{
- $socidp = 0;
+ $socid = 0;
}
@@ -111,7 +111,7 @@ if ($_GET["id"] || $_GET["ref"])
print $product->getLibStatut(2);
print '';
- show_stats_for_company($product,$socidp);
+ show_stats_for_company($product,$socid);
print "
";
@@ -120,15 +120,15 @@ if ($_GET["id"] || $_GET["ref"])
$sql = "SELECT distinct(s.nom), s.idp, p.rowid as propalid, p.ref, p.total as amount,";
$sql.= $db->pdate("p.datec")." as date, p.fk_statut as statut";
- if (!$user->rights->commercial->client->voir && !$socidp) $sql .= ", sc.fk_soc, sc.fk_user ";
+ if (!$user->rights->commercial->client->voir && !$socid) $sql .= ", sc.fk_soc, sc.fk_user ";
$sql.= " FROM ".MAIN_DB_PREFIX."societe as s,".MAIN_DB_PREFIX."propal as p, ".MAIN_DB_PREFIX."propaldet as d";
- if (!$user->rights->commercial->client->voir && !$socidp) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+ if (!$user->rights->commercial->client->voir && !$socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
$sql.= " WHERE p.fk_soc = s.idp";
$sql.= " AND d.fk_propal = p.rowid AND d.fk_product =".$product->id;
- if (!$user->rights->commercial->client->voir && !$socidp) $sql .= " AND s.idp = sc.fk_soc AND sc.fk_user = " .$user->id;
- if ($socidp)
+ if (!$user->rights->commercial->client->voir && !$socid) $sql .= " AND s.idp = sc.fk_soc AND sc.fk_user = " .$user->id;
+ if ($socid)
{
- $sql .= " AND p.fk_soc = $socidp";
+ $sql .= " AND p.fk_soc = $socid";
}
$sql .= " ORDER BY $sortfield $sortorder ";
$sql.= $db->plimit($conf->liste_limit +1, $offset);
diff --git a/htdocs/project.class.php b/htdocs/project.class.php
index 716ad039d47..e1348a35fbe 100644
--- a/htdocs/project.class.php
+++ b/htdocs/project.class.php
@@ -37,7 +37,7 @@ class Project
var $db;
var $ref;
var $title;
- var $socidp;
+ var $socid;
/**
* \brief Constructeur de la classe
@@ -59,7 +59,7 @@ class Project
if (trim($this->ref))
{
$sql = "INSERT INTO ".MAIN_DB_PREFIX."projet (ref, title, fk_soc, fk_user_creat, dateo) ";
- $sql .= " VALUES ('".addslashes($this->ref)."', '".addslashes($this->title)."', $this->socidp, ".$user->id.",now()) ;";
+ $sql .= " VALUES ('".addslashes($this->ref)."', '".addslashes($this->title)."', $this->socid, ".$user->id.",now()) ;";
if ($this->db->query($sql) )
{
diff --git a/htdocs/projet/activity/index.php b/htdocs/projet/activity/index.php
index 8d329c527cb..f9732044fc7 100644
--- a/htdocs/projet/activity/index.php
+++ b/htdocs/projet/activity/index.php
@@ -38,7 +38,7 @@ if (!$user->rights->projet->lire) accessforbidden();
if ($user->societe_id > 0)
{
$action = '';
- $socidp = $user->societe_id;
+ $socid = $user->societe_id;
}
llxHeader("",$langs->trans("Activity"));
@@ -63,12 +63,12 @@ print ' '.$langs->trans("NbOpenTasks").' ';
print "\n";
$sql = "SELECT p.title, p.rowid, count(t.rowid)";
-if (!$user->rights->commercial->client->voir && !$socidp) $sql .= ", sc.fk_soc, sc.fk_user";
+if (!$user->rights->commercial->client->voir && !$socid) $sql .= ", sc.fk_soc, sc.fk_user";
$sql .= " FROM ".MAIN_DB_PREFIX."projet as p";
$sql .= " , ".MAIN_DB_PREFIX."projet_task as t";
-if (!$user->rights->commercial->client->voir && !$socidp) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+if (!$user->rights->commercial->client->voir && !$socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
$sql .= " WHERE t.fk_projet = p.rowid";
-if (!$user->rights->commercial->client->voir && !$socidp) $sql .= " AND p.fk_soc = sc.fk_soc AND sc.fk_user = " .$user->id;
+if (!$user->rights->commercial->client->voir && !$socid) $sql .= " AND p.fk_soc = sc.fk_soc AND sc.fk_user = " .$user->id;
$sql .= " GROUP BY p.rowid";
@@ -109,13 +109,13 @@ print 'Temps ';
print "\n";
$sql = "SELECT p.title, p.rowid, sum(tt.task_duration)";
-if (!$user->rights->commercial->client->voir && !$socidp) $sql .= ", sc.fk_soc, sc.fk_user";
+if (!$user->rights->commercial->client->voir && !$socid) $sql .= ", sc.fk_soc, sc.fk_user";
$sql .= " FROM ".MAIN_DB_PREFIX."projet as p";
$sql .= " , ".MAIN_DB_PREFIX."projet_task as t";
$sql .= " , ".MAIN_DB_PREFIX."projet_task_time as tt";
-if (!$user->rights->commercial->client->voir && !$socidp) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+if (!$user->rights->commercial->client->voir && !$socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
$sql .= " WHERE t.fk_projet = p.rowid";
-if (!$user->rights->commercial->client->voir && !$socidp) $sql .= " AND p.fk_soc = sc.fk_soc AND sc.fk_user = " .$user->id;
+if (!$user->rights->commercial->client->voir && !$socid) $sql .= " AND p.fk_soc = sc.fk_soc AND sc.fk_user = " .$user->id;
$sql .= " AND tt.fk_task = t.rowid";
$sql .= " AND week(task_date) = ".strftime("%W",time());
$sql .= " GROUP BY p.rowid";
@@ -154,13 +154,13 @@ print 'Nb heures ';
print "\n";
$sql = "SELECT p.title, p.rowid, sum(tt.task_duration)";
-if (!$user->rights->commercial->client->voir && !$socidp) $sql .= ", sc.fk_soc, sc.fk_user";
+if (!$user->rights->commercial->client->voir && !$socid) $sql .= ", sc.fk_soc, sc.fk_user";
$sql .= " FROM ".MAIN_DB_PREFIX."projet as p";
$sql .= " , ".MAIN_DB_PREFIX."projet_task as t";
$sql .= " , ".MAIN_DB_PREFIX."projet_task_time as tt";
-if (!$user->rights->commercial->client->voir && !$socidp) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+if (!$user->rights->commercial->client->voir && !$socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
$sql .= " WHERE t.fk_projet = p.rowid";
-if (!$user->rights->commercial->client->voir && !$socidp) $sql .= " AND p.fk_soc = sc.fk_soc AND sc.fk_user = " .$user->id;
+if (!$user->rights->commercial->client->voir && !$socid) $sql .= " AND p.fk_soc = sc.fk_soc AND sc.fk_user = " .$user->id;
$sql .= " AND tt.fk_task = t.rowid";
$sql .= " AND month(task_date) = ".strftime("%m",$now);
$sql .= " GROUP BY p.rowid";
@@ -199,13 +199,13 @@ print 'Nb heures ';
print "\n";
$sql = "SELECT p.title, p.rowid, sum(tt.task_duration)";
-if (!$user->rights->commercial->client->voir && !$socidp) $sql .= ", sc.fk_soc, sc.fk_user";
+if (!$user->rights->commercial->client->voir && !$socid) $sql .= ", sc.fk_soc, sc.fk_user";
$sql .= " FROM ".MAIN_DB_PREFIX."projet as p";
$sql .= " , ".MAIN_DB_PREFIX."projet_task as t";
$sql .= " , ".MAIN_DB_PREFIX."projet_task_time as tt";
-if (!$user->rights->commercial->client->voir && !$socidp) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+if (!$user->rights->commercial->client->voir && !$socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
$sql .= " WHERE t.fk_projet = p.rowid";
-if (!$user->rights->commercial->client->voir && !$socidp) $sql .= " AND p.fk_soc = sc.fk_soc AND sc.fk_user = " .$user->id;
+if (!$user->rights->commercial->client->voir && !$socid) $sql .= " AND p.fk_soc = sc.fk_soc AND sc.fk_user = " .$user->id;
$sql .= " AND tt.fk_task = t.rowid";
$sql .= " AND YEAR(task_date) = ".strftime("%Y",$now);
$sql .= " GROUP BY p.rowid";
diff --git a/htdocs/projet/activity/myactivity.php b/htdocs/projet/activity/myactivity.php
index 62b1e085024..7112363c835 100644
--- a/htdocs/projet/activity/myactivity.php
+++ b/htdocs/projet/activity/myactivity.php
@@ -38,7 +38,7 @@ if (!$user->rights->projet->lire) accessforbidden();
*/
if ($user->societe_id > 0)
{
- $socidp = $user->societe_id;
+ $socid = $user->societe_id;
}
$langs->load("projects");
@@ -64,15 +64,15 @@ print ''.$langs->trans("NbOpenTasks").' ';
print "\n";
$sql = "SELECT p.title, p.rowid, count(t.rowid)";
-if (!$user->rights->commercial->client->voir && !$socidp) $sql .= ", sc.fk_soc, sc.fk_user";
+if (!$user->rights->commercial->client->voir && !$socid) $sql .= ", sc.fk_soc, sc.fk_user";
$sql .= " FROM ".MAIN_DB_PREFIX."projet as p";
$sql .= " , ".MAIN_DB_PREFIX."projet_task as t";
-if (!$user->rights->commercial->client->voir && !$socidp) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+if (!$user->rights->commercial->client->voir && !$socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
$sql .= " WHERE t.fk_projet = p.rowid";
-if (!$user->rights->commercial->client->voir && !$socidp) $sql .= " AND p.fk_soc = sc.fk_soc AND sc.fk_user = " .$user->id;
-if ($socidp)
+if (!$user->rights->commercial->client->voir && !$socid) $sql .= " AND p.fk_soc = sc.fk_soc AND sc.fk_user = " .$user->id;
+if ($socid)
{
- $sql .= " AND p.fk_soc = ".$socidp;
+ $sql .= " AND p.fk_soc = ".$socid;
}
$sql .= " GROUP BY p.rowid";
diff --git a/htdocs/projet/commandes.php b/htdocs/projet/commandes.php
index e69c04f522c..a3fd01c8060 100644
--- a/htdocs/projet/commandes.php
+++ b/htdocs/projet/commandes.php
@@ -48,7 +48,7 @@ if ($projetid == '') accessforbidden();
if ($user->societe_id > 0)
{
- $socidp = $user->societe_id;
+ $socid = $user->societe_id;
}
// Protection restriction commercial
@@ -59,7 +59,7 @@ if ($projetid)
if (!$user->rights->commercial->client->voir) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc ";
$sql.= " WHERE p.rowid = ".$projetid;
if (!$user->rights->commercial->client->voir) $sql .= " AND p.fk_soc = sc.fk_soc AND sc.fk_user = ".$user->id;
- if ($socidp) $sql .= " AND p.fk_soc = ".$socidp;
+ if ($socid) $sql .= " AND p.fk_soc = ".$socid;
if ( $db->query($sql) )
{
@@ -129,7 +129,7 @@ print '';
if ($conf->commande->enabled && $user->rights->commande->creer)
{
$langs->load("orders");
- print ''.$langs->trans("AddOrder").' ';
+ print ''.$langs->trans("AddOrder").' ';
}
print '';
diff --git a/htdocs/projet/facture.php b/htdocs/projet/facture.php
index 199344136e5..31efd1d76e9 100644
--- a/htdocs/projet/facture.php
+++ b/htdocs/projet/facture.php
@@ -49,7 +49,7 @@ if ($projetid == '') accessforbidden();
if ($user->societe_id > 0)
{
- $socidp = $user->societe_id;
+ $socid = $user->societe_id;
}
// Protection restriction commercial
@@ -60,7 +60,7 @@ if ($projetid)
if (!$user->rights->commercial->client->voir) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc ";
$sql.= " WHERE p.rowid = ".$projetid;
if (!$user->rights->commercial->client->voir) $sql .= " AND p.fk_soc = sc.fk_soc AND sc.fk_user = ".$user->id;
- if ($socidp) $sql .= " AND p.fk_soc = ".$socidp;
+ if ($socid) $sql .= " AND p.fk_soc = ".$socid;
if ( $db->query($sql) )
{
@@ -129,7 +129,7 @@ print '';
if ($conf->facture->enabled && $user->rights->facture->creer)
{
- print ''.$langs->trans("AddBill").' ';
+ print ''.$langs->trans("AddBill").' ';
}
print '';
diff --git a/htdocs/projet/fiche.php b/htdocs/projet/fiche.php
index 9a977cf95d9..bda8b7cf499 100644
--- a/htdocs/projet/fiche.php
+++ b/htdocs/projet/fiche.php
@@ -44,7 +44,7 @@ if ($projetid == '' && ($_GET['action'] != "create" && $_POST['action'] != "add"
if ($user->societe_id > 0)
{
- $socidp = $user->societe_id;
+ $socid = $user->societe_id;
}
// Protection restriction commercial
@@ -55,7 +55,7 @@ if ($projetid && !$user->rights->commercial->client->voir)
if (!$user->rights->commercial->client->voir) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc ";
$sql.= " WHERE p.rowid = ".$projetid;
if (!$user->rights->commercial->client->voir) $sql .= " AND p.fk_soc = sc.fk_soc AND sc.fk_user = ".$user->id;
- if ($socidp) $sql .= " AND p.fk_soc = ".$socidp;
+ if ($socid) $sql .= " AND p.fk_soc = ".$socid;
if ( $db->query($sql) )
{
@@ -67,7 +67,7 @@ if ($projetid && !$user->rights->commercial->client->voir)
if ($_POST["action"] == 'add' && $user->rights->projet->creer)
{
$pro = new Project($db);
- $pro->socidp = $_GET["socidp"];
+ $pro->socid = $_GET["socid"];
$pro->ref = $_POST["ref"];
$pro->title = $_POST["title"];
$result = $pro->create($user);
@@ -133,7 +133,7 @@ if ($_GET["action"] == 'create' && $user->rights->projet->creer)
if ($mesg) print $mesg;
- print '