";
diff --git a/htdocs/compta/fiche.php b/htdocs/compta/fiche.php
index 2d903257b8f..770c13091e3 100644
--- a/htdocs/compta/fiche.php
+++ b/htdocs/compta/fiche.php
@@ -73,7 +73,7 @@ if ($mode == 'search')
{
if ($mode-search == 'soc')
{
- $sql = "SELECT s.idp FROM ".MAIN_DB_PREFIX."societe as s ";
+ $sql = "SELECT s.rowid FROM ".MAIN_DB_PREFIX."societe as s ";
$sql .= " WHERE lower(s.nom) like '%".strtolower($socname)."%'";
}
@@ -82,7 +82,7 @@ if ($mode == 'search')
if ( $db->num_rows() == 1)
{
$obj = $db->fetch_object();
- $socid = $obj->idp;
+ $socid = $obj->rowid;
}
$db->free();
}
@@ -109,7 +109,7 @@ $contactstatic = new Contact($db);
if ($socid > 0)
{
$societe = new Societe($db);
- $societe->fetch($socid, $to); // si $to='next' ajouter " AND s.idp > $socid ORDER BY idp ASC LIMIT 1";
+ $societe->fetch($socid, $to); // si $to='next' ajouter " AND s.rowid > $socid ORDER BY idp ASC LIMIT 1";
if ($societe->id <= 0)
{
dolibarr_print_error($db,$societe->error);
@@ -242,14 +242,14 @@ if ($socid > 0)
print '
';
- $sql = 'SELECT f.rowid as facid, f.facnumber, f.type, f.amount, f.total, f.total_ttc,';
- $sql.= ' '.$db->pdate("f.datef").' as df, f.paye as paye, f.fk_statut as statut,';
- $sql.= ' s.nom, s.idp,';
- $sql.= ' sum(pf.amount) as am';
+ $sql = 'SELECT f.rowid as facid, f.facnumber, f.type, f.amount, f.total, f.total_ttc';
+ $sql.= ', '.$db->pdate("f.datef").' as df, f.paye as paye, f.fk_statut as statut';
+ $sql.= ', s.nom, s.rowid as socid';
+ $sql.= ', sum(pf.amount) as am';
$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';
- $sql.= " WHERE f.fk_soc = s.idp AND s.idp = ".$societe->id;
- $sql.= ' GROUP BY f.rowid';
+ $sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'paiement_facture as pf ON f.rowid=pf.fk_facture';
+ $sql.= " WHERE f.fk_soc = s.rowid AND s.rowid = ".$societe->id;
+ $sql.= ' GROUP BY f.rowid';
$sql.= " ORDER BY f.datef DESC, f.datec DESC";
$resql=$db->query($sql);
@@ -392,7 +392,7 @@ if ($socid > 0)
print '
';
print "";
- $sql = "SELECT p.idp, p.name, p.firstname, p.poste, p.phone, p.fax, p.email, p.note";
+ $sql = "SELECT p.rowid, p.name, p.firstname, p.poste, p.phone, p.fax, p.email, p.note";
$sql.= " FROM ".MAIN_DB_PREFIX."socpeople as p";
$sql.= " WHERE p.fk_soc = ".$societe->id;
$sql.= " ORDER by p.datec";
@@ -408,7 +408,7 @@ if ($socid > 0)
print "
";
diff --git a/htdocs/compta/recap-compta.php b/htdocs/compta/recap-compta.php
index a62e6c219e9..c327f22f670 100644
--- a/htdocs/compta/recap-compta.php
+++ b/htdocs/compta/recap-compta.php
@@ -55,7 +55,7 @@ llxHeader();
if ($socid > 0)
{
$societe = new Societe($db);
- $societe->fetch($socid, $to); // si $to='next' ajouter " AND s.idp > $socid ORDER BY idp ASC LIMIT 1";
+ $societe->fetch($socid, $to); // si $to='next' ajouter " AND s.rowid > $socid ORDER BY idp ASC LIMIT 1";
/*
* Affichage onglets
@@ -91,11 +91,11 @@ if ($socid > 0)
print '
';
- $sql = "SELECT s.nom, s.idp, f.facnumber, f.amount, ".$db->pdate("f.datef")." as df,";
+ $sql = "SELECT s.nom, s.rowid as socid, f.facnumber, f.amount, ".$db->pdate("f.datef")." as df,";
$sql.= " f.paye as paye, f.fk_statut as statut, f.rowid as facid,";
$sql.= " u.login, u.rowid as userid";
$sql.= " FROM ".MAIN_DB_PREFIX."societe as s,".MAIN_DB_PREFIX."facture as f,".MAIN_DB_PREFIX."user as u";
- $sql.= " WHERE f.fk_soc = s.idp AND s.idp = ".$societe->id;
+ $sql.= " WHERE f.fk_soc = s.rowid AND s.rowid = ".$societe->id;
$sql.= " AND f.fk_user_valid = u.rowid";
$sql.= " ORDER BY f.datef DESC";
diff --git a/htdocs/compta/resultat/clientfourn.php b/htdocs/compta/resultat/clientfourn.php
index 56563415bd6..40c947b9f21 100644
--- a/htdocs/compta/resultat/clientfourn.php
+++ b/htdocs/compta/resultat/clientfourn.php
@@ -85,18 +85,18 @@ print '
';
print '
Facturation clients
';
if ($modecompta == 'CREANCES-DETTES') {
- $sql = "SELECT s.nom, s.idp, sum(f.total) as amount_ht, sum(f.total_ttc) as amount_ttc";
+ $sql = "SELECT s.nom, s.rowid as socid, sum(f.total) as amount_ht, sum(f.total_ttc) as amount_ttc";
$sql .= " FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."facture as f";
- $sql .= " WHERE f.fk_soc = s.idp AND f.fk_statut in (1,2)";
+ $sql .= " WHERE f.fk_soc = s.rowid AND f.fk_statut in (1,2)";
if ($year) $sql .= " AND f.datef between '".$year."-01-01 00:00:00' and '".$year."-12-31 23:59:59'";
} else {
/*
* Liste des paiements (les anciens paiements ne sont pas vus par cette requete car, sur les
* vieilles versions, ils n'étaient pas liés via paiement_facture. On les ajoute plus loin)
*/
- $sql = "SELECT s.nom as nom, s.idp as idp, sum(pf.amount) as amount_ttc";
+ $sql = "SELECT s.nom as nom, s.rowid as socid, sum(pf.amount) as amount_ttc";
$sql .= " FROM ".MAIN_DB_PREFIX."societe as s, ".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 AND f.fk_soc = s.idp";
+ $sql .= " WHERE p.rowid = pf.fk_paiement AND pf.fk_facture = f.rowid AND f.fk_soc = s.rowid";
if ($year) $sql .= " AND p.datep between '".$year."-01-01 00:00:00' and '".$year."-12-31 23:59:59'";
}
if ($socid) $sql .= " AND f.fk_soc = $socid";
@@ -114,7 +114,7 @@ if ($result) {
$var=!$var;
print "
\n";
if ($modecompta == 'CREANCES-DETTES') print "
".price($objp->amount_ht)."
\n";
print "
".price($objp->amount_ttc)."
\n";
@@ -187,19 +187,19 @@ print '
';
*/
if ($modecompta == 'CREANCES-DETTES')
{
- $sql = "SELECT s.nom, s.idp, sum(f.total_ht) as amount_ht, sum(f.total_ttc) as amount_ttc, date_format(f.datef,'%Y-%m') as dm";
+ $sql = "SELECT s.nom, s.rowid as socid, sum(f.total_ht) as amount_ht, sum(f.total_ttc) as amount_ttc, date_format(f.datef,'%Y-%m') as dm";
$sql .= " FROM ".MAIN_DB_PREFIX."societe as s,".MAIN_DB_PREFIX."facture_fourn as f";
- $sql .= " WHERE f.fk_soc = s.idp AND f.fk_statut in (1,2)";
+ $sql .= " WHERE f.fk_soc = s.rowid AND f.fk_statut in (1,2)";
if ($year) {
$sql .= " AND f.datef between '".$year."-01-01 00:00:00' and '".$year."-12-31 23:59:59'";
}
} else {
- $sql = "SELECT s.nom, s.idp, date_format(p.datep,'%Y-%m') as dm, sum(pf.amount) as amount_ttc";
+ $sql = "SELECT s.nom, s.rowid as socid, date_format(p.datep,'%Y-%m') as dm, sum(pf.amount) as amount_ttc";
$sql .= " FROM ".MAIN_DB_PREFIX."paiementfourn as p, ".MAIN_DB_PREFIX."paiementfourn_facturefourn as pf";
$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."facture_fourn as f";
$sql .= " ON pf.fk_facturefourn = f.rowid";
$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s";
- $sql .= " ON f.fk_soc = s.idp";
+ $sql .= " ON f.fk_soc = s.rowid";
$sql .= " WHERE p.rowid = pf.fk_paiementfourn ";
if ($year) {
$sql .= " AND p.datep between '".$year."-01-01 00:00:00' and '".$year."-12-31 23:59:59'";
@@ -207,10 +207,10 @@ if ($modecompta == 'CREANCES-DETTES')
}
if ($socid)
{
- $sql .= " AND f.fk_soc = $socid";
+ $sql .= " AND f.fk_soc = ".$socid;
}
-$sql .= " GROUP BY nom, idp";
-$sql .= " ORDER BY nom, idp";
+$sql .= " GROUP BY nom, s.rowid";
+$sql .= " ORDER BY nom, s.rowid";
print '
\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 8aeccadb0e7..d1e29a4e6ab 100644
--- a/htdocs/compta/resultat/index.php
+++ b/htdocs/compta/resultat/index.php
@@ -84,7 +84,7 @@ $html->report_header($nom,$nomlink,$period,$periodlink,$description,$builddate,$
if ($modecompta == 'CREANCES-DETTES') {
$sql = "SELECT sum(f.total) as amount_ht, sum(f.total_ttc) as amount_ttc, date_format(f.datef,'%Y-%m') as dm";
$sql .= " FROM ".MAIN_DB_PREFIX."societe as s,".MAIN_DB_PREFIX."facture as f";
- $sql .= " WHERE f.fk_soc = s.idp AND f.fk_statut in (1,2)";
+ $sql .= " WHERE f.fk_soc = s.rowid AND f.fk_statut in (1,2)";
} else {
/*
* Liste des paiements (les anciens paiements ne sont pas vus par cette requete car, sur les
@@ -151,7 +151,7 @@ if ($modecompta != 'CREANCES-DETTES') {
if ($modecompta == 'CREANCES-DETTES') {
$sql = "SELECT sum(f.total_ht) as amount_ht, sum(f.total_ttc) as amount_ttc, date_format(f.datef,'%Y-%m') as dm";
$sql .= " FROM ".MAIN_DB_PREFIX."societe as s,".MAIN_DB_PREFIX."facture_fourn as f";
- $sql .= " WHERE f.fk_soc = s.idp AND f.fk_statut in (1,2)";
+ $sql .= " WHERE f.fk_soc = s.rowid AND f.fk_statut in (1,2)";
} else {
$sql = "SELECT sum(p.amount) as amount_ttc, date_format(p.datep,'%Y-%m') as dm";
$sql .= " FROM ".MAIN_DB_PREFIX."paiementfourn as p";
diff --git a/htdocs/compta/stats/casoc.php b/htdocs/compta/stats/casoc.php
index d8acb0f7bbb..5a045a525ca 100644
--- a/htdocs/compta/stats/casoc.php
+++ b/htdocs/compta/stats/casoc.php
@@ -76,9 +76,9 @@ $html->report_header($nom,$nomlink,$period,$periodlink,$description,$builddate,$
$catotal=0;
if ($modecompta == 'CREANCES-DETTES')
{
- $sql = "SELECT s.idp as rowid, s.nom as name, sum(f.total) as amount, sum(f.total_ttc) as amount_ttc";
+ $sql = "SELECT s.rowid as socid, s.nom as name, sum(f.total) as amount, sum(f.total_ttc) as amount_ttc";
$sql .= " FROM ".MAIN_DB_PREFIX."societe as s,".MAIN_DB_PREFIX."facture as f";
- $sql .= " WHERE f.fk_statut in (1,2) AND f.fk_soc = s.idp";
+ $sql .= " WHERE f.fk_statut in (1,2) AND f.fk_soc = s.rowid";
if ($year) $sql .= " AND f.datef between '".$year."-01-01 00:00:00' and '".$year."-12-31 23:59:59'";
}
else
@@ -87,14 +87,14 @@ else
* Liste des paiements (les anciens paiements ne sont pas vus par cette requete car, sur les
* vieilles versions, ils n'étaient pas liés via paiement_facture. On les ajoute plus loin)
*/
- $sql = "SELECT s.idp as rowid, s.nom as name, sum(pf.amount) as amount_ttc";
+ $sql = "SELECT s.rowid as socid, s.nom as name, sum(pf.amount) as amount_ttc";
$sql .= " FROM ".MAIN_DB_PREFIX."societe as s, ".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 AND f.fk_soc = s.idp";
+ $sql .= " WHERE p.rowid = pf.fk_paiement AND pf.fk_facture = f.rowid AND f.fk_soc = s.rowid";
if ($year) $sql .= " AND p.datep between '".$year."-01-01 00:00:00' and '".$year."-12-31 23:59:59'";
}
-if ($socid) $sql .= " AND f.fk_soc = $socid";
-$sql .= " GROUP BY rowid";
-$sql .= " ORDER BY rowid";
+if ($socid) $sql .= " AND f.fk_soc = ".$socid;
+$sql .= " GROUP BY s.rowid";
+$sql .= " ORDER BY s.rowid";
$result = $db->query($sql);
if ($result)
@@ -104,8 +104,8 @@ if ($result)
while ($i < $num)
{
$obj = $db->fetch_object($result);
- $amount[$obj->rowid] += $obj->amount_ttc;
- $name[$obj->rowid] = $obj->name;
+ $amount[$obj->socid] += $obj->amount_ttc;
+ $name[$obj->socid] = $obj->name;
$catotal+=$obj->amount_ttc;
$i++;
}
diff --git a/htdocs/compta/stats/comp.php b/htdocs/compta/stats/comp.php
index 7c7fa39f968..981c9727edb 100644
--- a/htdocs/compta/stats/comp.php
+++ b/htdocs/compta/stats/comp.php
@@ -26,11 +26,12 @@ require("./lib.inc.php");
function propals ($db, $year, $month) {
global $bc,$langs;
- $sql = "SELECT s.nom, s.idp, p.rowid as propalid, p.price, p.ref,".$db->pdate("p.datep")." as dp, c.label as statut, c.id as statutid";
- $sql .= " FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."propal as p, ".MAIN_DB_PREFIX."c_propalst as c WHERE p.fk_soc = s.idp AND p.fk_statut = c.id";
+ $sql = "SELECT s.nom, s.rowid as socid, p.rowid as propalid, p.price, p.ref,".$db->pdate("p.datep")." as dp, c.label as statut, c.id as statutid";
+ $sql.= " FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."propal as p, ".MAIN_DB_PREFIX."c_propalst as c";
+ $sql.= " WHERE p.fk_soc = s.rowid AND p.fk_statut = c.id";
$sql .= " AND c.id in (1,2,4)";
- $sql .= " AND date_format(p.datep, '%Y') = $year ";
- $sql .= " AND round(date_format(p.datep, '%m')) = $month ";
+ $sql .= " AND date_format(p.datep, '%Y') = ".$year;
+ $sql .= " AND round(date_format(p.datep, '%m')) = ".$month;
$sql .= " ORDER BY p.fk_statut";
@@ -68,14 +69,14 @@ function propals ($db, $year, $month) {
$var=!$var;
print "
\n";
} else {
diff --git a/htdocs/compta/stats/index.php b/htdocs/compta/stats/index.php
index 1d5250fe63c..2fd934ff4e7 100644
--- a/htdocs/compta/stats/index.php
+++ b/htdocs/compta/stats/index.php
@@ -305,14 +305,14 @@ if ($modecompta != 'CREANCES-DETTES')
// Factures non réglées
// \todo Y a bug ici. Il faut prendre le reste à payer et non le total des factures non réglèes !
- $sql = "SELECT f.facnumber, f.rowid, s.nom, s.idp, f.total_ttc, sum(pf.amount) as am";
+ $sql = "SELECT f.facnumber, f.rowid, s.nom, s.rowid as socid, 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";
+ $sql .= " WHERE s.rowid = f.fk_soc AND f.paye = 0 AND f.fk_statut = 1";
if ($socid)
{
$sql .= " AND f.fk_soc = $socid";
}
- $sql .= " GROUP BY f.facnumber,f.rowid,s.nom, s.idp, f.total_ttc";
+ $sql .= " GROUP BY f.facnumber,f.rowid,s.nom, s.rowid, f.total_ttc";
if ( $db->query($sql) )
{
@@ -352,16 +352,16 @@ if ($modecompta != 'CREANCES-DETTES')
Je commente toute cette partie car les chiffres affichées sont faux - Eldy.
En attendant correction.
- $sql = "SELECT sum(f.total) as tot_fht,sum(f.total_ttc) as tot_fttc, p.rowid, p.ref, s.nom, s.idp, p.total_ht, p.total_ttc
+ $sql = "SELECT sum(f.total) as tot_fht,sum(f.total_ttc) as tot_fttc, p.rowid, p.ref, s.nom, s.rowid as socid, p.total_ht, p.total_ttc
FROM ".MAIN_DB_PREFIX."commande AS p, llx_societe AS s
LEFT JOIN ".MAIN_DB_PREFIX."co_fa AS co_fa ON co_fa.fk_commande = p.rowid
LEFT JOIN ".MAIN_DB_PREFIX."facture AS f ON co_fa.fk_facture = f.rowid
- WHERE p.fk_soc = s.idp
+ WHERE p.fk_soc = s.rowid
AND p.fk_statut >=1
AND p.facture =0";
if ($socid)
{
- $sql .= " AND f.fk_soc = $socid";
+ $sql .= " AND f.fk_soc = ".$socid;
}
$sql .= " GROUP BY p.rowid";
diff --git a/htdocs/compta/tva/clients.php b/htdocs/compta/tva/clients.php
index daa45df53cb..bd8125193cf 100644
--- a/htdocs/compta/tva/clients.php
+++ b/htdocs/compta/tva/clients.php
@@ -62,13 +62,13 @@ function tva_coll($db,$y)
if ($conf->compta->mode == "CREANCES-DETTES")
{
// Si on paye la tva sur les factures dues (non brouillon)
- $sql = "SELECT s.nom as nom, s.tva_intra as tva_intra, sum(f.total) as amount, sum(f.tva) as tva, s.tva_assuj as assuj, s.idp as id_soc";
+ $sql = "SELECT s.nom as nom, s.tva_intra as tva_intra, sum(f.total) as amount, sum(f.tva) as tva, s.tva_assuj as assuj, s.rowid as socid";
$sql.= " FROM ".MAIN_DB_PREFIX."facture as f, ".MAIN_DB_PREFIX."societe as s";
$sql.= " WHERE ";
$sql.= " f.fk_statut in (1,2)";
$sql.= " AND date_format(f.datef,'%Y') = ".$y;
- $sql.= " AND s.idp = f.fk_soc ";
- $sql.= " GROUP BY s.idp";
+ $sql.= " AND s.rowid = f.fk_soc ";
+ $sql.= " GROUP BY s.rowid";
}
else
{
@@ -120,13 +120,13 @@ function tva_paye($db, $y)
if ($conf->compta->mode == "CREANCES-DETTES")
{
// Si on paye la tva sur les factures dues (non brouillon)
- $sql = "SELECT s.nom as nom, s.tva_intra as tva_intra, sum(f.total_ht) as amount, sum(f.tva) as tva, s.tva_assuj as assuj, s.idp as id_soc";
+ $sql = "SELECT s.nom as nom, s.tva_intra as tva_intra, sum(f.total_ht) as amount, sum(f.tva) as tva, s.tva_assuj as assuj, s.rowid as socid";
$sql.= " FROM ".MAIN_DB_PREFIX."facture_fourn as f, ".MAIN_DB_PREFIX."societe as s";
$sql.= " WHERE ";
$sql.= " f.fk_statut in (1,2)";
$sql.= " AND date_format(f.datef,'%Y') = ".$y;
- $sql.= " AND s.idp = f.fk_soc ";
- $sql.= " GROUP BY s.idp";
+ $sql.= " AND s.rowid = f.fk_soc ";
+ $sql.= " GROUP BY s.rowid";
}
else
{
diff --git a/htdocs/contact.class.php b/htdocs/contact.class.php
index adb31aa485c..7ce936b8f31 100644
--- a/htdocs/contact.class.php
+++ b/htdocs/contact.class.php
@@ -182,7 +182,7 @@ class Contact
$sql .= ", phone_mobile = '".addslashes($this->phone_mobile)."'";
$sql .= ", jabberid = '".addslashes($this->jabberid)."'";
if ($user) $sql .= ", fk_user_modif=".$user->id;
- $sql .= " WHERE idp=".$id;
+ $sql .= " WHERE rowid=".$id;
dolibarr_syslog("Contact.class::update sql=".$sql,LOG_DEBUG);
$result = $this->db->query($sql);
@@ -300,7 +300,7 @@ class Contact
function update_perso($id, $user=0)
{
// Mis a jour contact
- $sql = "UPDATE ".MAIN_DB_PREFIX."socpeople SET idp=".$id;
+ $sql = "UPDATE ".MAIN_DB_PREFIX."socpeople SET rowid=".$id;
if ($this->birthday) // <0 si avant 1970, >0 si apres 1970
{
@@ -316,7 +316,7 @@ class Contact
}
}
if ($user) $sql .= ", fk_user_modif=".$user->id;
- $sql .= " WHERE idp=$id";
+ $sql .= " WHERE rowid=".$id;
dolibarr_syslog("Contact::update_perso this->birthday=".$this->birthday." - sql=".$sql);
$resql = $this->db->query($sql);
@@ -371,7 +371,7 @@ class Contact
{
global $langs;
$langs->load("companies");
- $sql = "SELECT c.idp, c.fk_soc, c.civilite as civilite_id, c.name, c.firstname,";
+ $sql = "SELECT c.rowid, c.fk_soc, c.civilite as civilite_id, c.name, c.firstname,";
$sql.= " c.address, c.cp, c.ville,";
$sql.= " c.fk_pays, p.libelle as pays, p.code as pays_code,";
$sql.= " c.birthday,";
@@ -379,8 +379,8 @@ class Contact
$sql.= " u.rowid as user_id, u.login as user_login";
$sql.= " FROM ".MAIN_DB_PREFIX."socpeople as c";
$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."c_pays as p ON c.fk_pays = p.rowid";
- $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."user as u ON c.idp = u.fk_socpeople";
- $sql.= " WHERE c.idp = ". $id;
+ $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."user as u ON c.rowid = u.fk_socpeople";
+ $sql.= " WHERE c.rowid = ". $id;
dolibarr_syslog("Contact::fetch sql=".$sql);
$resql=$this->db->query($sql);
@@ -390,7 +390,7 @@ class Contact
{
$obj = $this->db->fetch_object($resql);
- $this->id = $obj->idp;
+ $this->id = $obj->rowid;
$this->civilite_id = $obj->civilite_id;
$this->name = $obj->name;
$this->firstname = $obj->firstname;
@@ -540,7 +540,7 @@ class Contact
global $conf, $langs;
$sql = "SELECT c.name, c.firstname FROM ".MAIN_DB_PREFIX."socpeople as c";
- $sql .= " WHERE c.idp = ". $id;
+ $sql .= " WHERE c.rowid = ". $id;
$resql=$this->db->query($sql);
if ($resql)
{
@@ -554,7 +554,7 @@ class Contact
}
$sql = "DELETE FROM ".MAIN_DB_PREFIX."socpeople";
- $sql .= " WHERE idp=$id";
+ $sql .= " WHERE rowid=".$id;
$result = $this->db->query($sql);
if (! $result)
@@ -580,10 +580,10 @@ class Contact
*/
function info($id)
{
- $sql = "SELECT c.idp, ".$this->db->pdate("c.datec")." as datec, c.fk_user_creat";
+ $sql = "SELECT c.rowid, ".$this->db->pdate("c.datec")." as datec, c.fk_user_creat";
$sql .= ", ".$this->db->pdate("c.tms")." as tms, c.fk_user_modif";
$sql .= " FROM ".MAIN_DB_PREFIX."socpeople as c";
- $sql .= " WHERE c.idp = ".$id;
+ $sql .= " WHERE c.rowid = ".$id;
$resql=$this->db->query($sql);
if ($resql)
@@ -592,7 +592,7 @@ class Contact
{
$obj = $this->db->fetch_object($resql);
- $this->id = $obj->idp;
+ $this->id = $obj->rowid;
if ($obj->fk_user_creat) {
$cuser = new User($this->db, $obj->fk_user_creat);
@@ -747,7 +747,7 @@ class Contact
// Charge tableau des id de société socids
$socids = array();
- $sql = "SELECT idp FROM ".MAIN_DB_PREFIX."societe LIMIT 10";
+ $sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."societe LIMIT 10";
$resql = $this->db->query($sql);
if ($resql)
{
diff --git a/htdocs/contact/exportimport.php b/htdocs/contact/exportimport.php
index 01eb9e9e04b..f53265a0483 100644
--- a/htdocs/contact/exportimport.php
+++ b/htdocs/contact/exportimport.php
@@ -49,7 +49,7 @@ if ($contactid && ! $user->rights->commercial->client->voir)
{
$sql = "SELECT sc.fk_soc, sp.fk_soc";
$sql .= " FROM ".MAIN_DB_PREFIX."societe_commerciaux as sc, ".MAIN_DB_PREFIX."socpeople as sp";
- $sql .= " WHERE sp.idp = ".$contactid;
+ $sql .= " WHERE sp.rowid = ".$contactid;
if (! $user->rights->commercial->client->voir && ! $socid)
{
$sql .= " AND sc.fk_soc = sp.fk_soc AND sc.fk_user = ".$user->id;
diff --git a/htdocs/contact/fiche.php b/htdocs/contact/fiche.php
index 32f744c99b2..b32e698e2e5 100644
--- a/htdocs/contact/fiche.php
+++ b/htdocs/contact/fiche.php
@@ -58,7 +58,7 @@ if ($contactid && !$user->rights->commercial->client->voir)
{
$sql = "SELECT sc.fk_soc, sp.fk_soc";
$sql .= " FROM ".MAIN_DB_PREFIX."societe_commerciaux as sc, ".MAIN_DB_PREFIX."socpeople as sp";
- $sql .= " WHERE sp.idp = ".$contactid;
+ $sql .= " WHERE sp.rowid = ".$contactid;
if (!$user->rights->commercial->client->voir && !$user->societe_id > 0)
{
$sql .= " AND sc.fk_soc = sp.fk_soc AND sc.fk_user = ".$user->id;
diff --git a/htdocs/contact/index.php b/htdocs/contact/index.php
index cd16d4e1d1c..81b8939e5ed 100644
--- a/htdocs/contact/index.php
+++ b/htdocs/contact/index.php
@@ -104,13 +104,13 @@ if ($_POST["button_removefilter"])
llxHeader();
-$sql = "SELECT s.idp, s.nom, ";
-$sql.= " p.idp as cidp, p.name, p.firstname, p.email, p.phone, p.phone_mobile, p.fax";
+$sql = "SELECT s.rowid as socid, s.nom, ";
+$sql.= " p.rowid as cidp, p.name, p.firstname, p.email, p.phone, p.phone_mobile, p.fax";
if (!$user->rights->commercial->client->voir && !$socid) $sql .= ", sc.fk_soc, sc.fk_user";
$sql.= " FROM ";
if (!$user->rights->commercial->client->voir && !$socid) $sql .= MAIN_DB_PREFIX."societe_commerciaux as sc,";
$sql.= " ".MAIN_DB_PREFIX."socpeople as p";
-$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON s.idp = p.fk_soc";
+$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON s.rowid = p.fk_soc";
$sql.= " WHERE 1=1 ";
if ($_GET["userid"]) // statut commercial
@@ -119,7 +119,7 @@ if ($_GET["userid"]) // statut commercial
}
if (!$user->rights->commercial->client->voir && !$socid) //restriction
{
- $sql .= " AND s.idp = sc.fk_soc AND sc.fk_user = " .$user->id;
+ $sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
}
if ($search_nom) // filtre sur le nom
{
@@ -155,7 +155,7 @@ if ($sall)
}
if ($socid)
{
- $sql .= " AND s.idp = $socid";
+ $sql .= " AND s.rowid = ".$socid;
}
if($_GET["view"] == "recent")
@@ -261,9 +261,9 @@ if ($result)
print ' '.$obj->name.'';
print '
';
$i++;
}
diff --git a/htdocs/expedition/liste.php b/htdocs/expedition/liste.php
index 0b1e4122395..e372f1eff66 100644
--- a/htdocs/expedition/liste.php
+++ b/htdocs/expedition/liste.php
@@ -57,13 +57,13 @@ $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";
+$sql = "SELECT e.rowid, e.ref,".$db->pdate("e.date_expedition")." as date_expedition, e.fk_statut, s.nom as socname, s.rowid as socid, c.ref as comref, c.rowid as comid";
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 && !$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.= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON s.rowid = c.fk_soc";
$sql_add = " WHERE ";
if ($socid)
@@ -111,9 +111,9 @@ if ($resql)
$var=!$var;
print "
";
diff --git a/htdocs/fourn/facture/index.php b/htdocs/fourn/facture/index.php
index 691da68ee7d..483a16a2a50 100644
--- a/htdocs/fourn/facture/index.php
+++ b/htdocs/fourn/facture/index.php
@@ -64,7 +64,7 @@ if ($_POST["mode"] == 'search')
{
if ($_POST["mode-search"] == 'soc')
{
- $sql = "SELECT s.idp FROM ".MAIN_DB_PREFIX."societe as s ";
+ $sql = "SELECT s.rowid FROM ".MAIN_DB_PREFIX."societe as s ";
$sql.= " WHERE s.nom like '%".addslashes(strtolower($socname))."%'";
}
@@ -73,7 +73,7 @@ if ($_POST["mode"] == 'search')
if ( $db->num_rows() == 1)
{
$obj = $db->fetch_object();
- $socid = $obj->idp;
+ $socid = $obj->rowid;
}
$db->free();
}
@@ -89,17 +89,17 @@ if ($_POST["mode"] == 'search')
llxHeader();
-$sql = "SELECT s.idp as socid, s.nom, ";
+$sql = "SELECT s.rowid as socid, s.nom, ";
$sql.= " ".$db->pdate("fac.datef")." as datef, ".$db->pdate("fac.date_lim_reglement")." as date_echeance,";
$sql.= " fac.total_ht, fac.total_ttc, fac.paye as paye, fac.fk_statut as fk_statut, fac.libelle, fac.rowid as facid, fac.facnumber";
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 fac";
if (!$user->rights->commercial->client->voir && !$socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
-$sql.= " WHERE fac.fk_soc = s.idp";
+$sql.= " WHERE fac.fk_soc = s.rowid";
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;
+ $sql .= " AND s.rowid = ".$socid;
}
if ($_GET["filtre"])
{
diff --git a/htdocs/fourn/facture/paiement.php b/htdocs/fourn/facture/paiement.php
index 7aac6e0a01c..2a7ac664bea 100644
--- a/htdocs/fourn/facture/paiement.php
+++ b/htdocs/fourn/facture/paiement.php
@@ -200,13 +200,13 @@ if ($action == 'create' || $action == 'add_paiement')
$facture = new FactureFournisseur($db);
$facture->fetch($facid);
- $sql = 'SELECT s.nom,s.idp, f.amount, f.total_ttc as total, f.facnumber';
+ $sql = 'SELECT s.nom, s.rowid as socid, f.amount, f.total_ttc as total, f.facnumber';
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';
if (!$user->rights->commercial->client->voir && !$socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
- $sql .= ' WHERE f.fk_soc = s.idp';
+ $sql .= ' WHERE f.fk_soc = s.rowid';
$sql .= ' AND f.rowid = '.$facid;
- if (!$user->rights->commercial->client->voir && !$socid) $sql .= " AND s.idp = sc.fk_soc AND sc.fk_user = " .$user->id;
+ if (!$user->rights->commercial->client->voir && !$socid) $sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
$resql = $db->query($sql);
if ($resql)
{
@@ -221,7 +221,7 @@ if ($action == 'create' || $action == 'add_paiement')
print '';
print '';
print '';
- print '';
+ print '';
print '';
print '
';
@@ -355,7 +355,7 @@ if (! $_GET['action'] && ! $_POST['action'])
$sql = 'SELECT p.rowid, '.$db->pdate('p.datep').' as dp, p.amount as pamount,';
$sql.= ' f.amount, f.facnumber, f.rowid as facid,';
- $sql.= ' s.idp, s.nom,';
+ $sql.= ' s.rowid as socid, s.nom,';
$sql.= ' c.libelle as paiement_type, p.num_paiement,';
$sql.= ' ba.rowid as bid, ba.label';
if (!$user->rights->commercial->client->voir) $sql .= ", sc.fk_soc, sc.fk_user ";
@@ -364,10 +364,10 @@ if (! $_GET['action'] && ! $_POST['action'])
$sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'paiementfourn_facturefourn AS pf ON p.rowid=pf.fk_paiementfourn';
$sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'facture_fourn AS f ON f.rowid=pf.fk_facturefourn ';
$sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_paiement AS c ON p.fk_paiement = c.id';
- $sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'societe AS s ON s.idp = f.fk_soc';
+ $sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'societe AS s ON s.rowid = f.fk_soc';
$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 (!$user->rights->commercial->client->voir) $sql .= " WHERE s.idp = sc.fk_soc AND sc.fk_user = " .$user->id;
+ if (!$user->rights->commercial->client->voir) $sql .= " WHERE s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
if ($socid)
{
$sql .= ' WHERE f.fk_soc = '.$socid;
@@ -406,7 +406,7 @@ if (! $_GET['action'] && ! $_POST['action'])
else print ' ';
print '';
print '
\n";
diff --git a/htdocs/socnote.php b/htdocs/socnote.php
index ca8ecfea9de..0abfcb63899 100644
--- a/htdocs/socnote.php
+++ b/htdocs/socnote.php
@@ -43,7 +43,7 @@ $socid = restrictedArea($user, 'societe', $socid);
if ($_POST["action"] == 'add')
{
- $sql = "UPDATE ".MAIN_DB_PREFIX."societe SET note='".addslashes($_POST["note"])."' WHERE idp=".$_POST["socid"];
+ $sql = "UPDATE ".MAIN_DB_PREFIX."societe SET note='".addslashes($_POST["note"])."' WHERE rowid=".$_POST["socid"];
$result = $db->query($sql);
$_GET["socid"]=$_POST["socid"]; // Pour retour sur fiche
diff --git a/htdocs/telephonie/adsl/fiche.php b/htdocs/telephonie/adsl/fiche.php
index 6a4c3ec7136..4408bd98ee6 100644
--- a/htdocs/telephonie/adsl/fiche.php
+++ b/htdocs/telephonie/adsl/fiche.php
@@ -321,7 +321,7 @@ if ($_GET["action"] == 'create')
print '
Client
';
$ff = array();
- $sql = "SELECT idp, nom, ville FROM ".MAIN_DB_PREFIX."societe WHERE client=1 ORDER BY nom ";
+ $sql = "SELECT rowid, nom, ville FROM ".MAIN_DB_PREFIX."societe WHERE client=1 ORDER BY nom ";
if ( $db->query( $sql) )
{
$num = $db->num_rows();
@@ -412,7 +412,7 @@ elseif ($_GET["action"] == 'create_line' && $_GET["client"] > 0)
print '
Client (Agence/Filiale)
';
$ff = array();
- $sql = "SELECT idp, nom, ville FROM ".MAIN_DB_PREFIX."societe WHERE client=1 ORDER BY nom ";
+ $sql = "SELECT rowid, nom, ville FROM ".MAIN_DB_PREFIX."societe WHERE client=1 ORDER BY nom ";
if ( $db->query( $sql) )
{
$num = $db->num_rows();
@@ -433,7 +433,7 @@ elseif ($_GET["action"] == 'create_line' && $_GET["client"] > 0)
print '
Client à facturer
';
$ff = array();
- $sql = "SELECT idp, nom, ville FROM ".MAIN_DB_PREFIX."societe WHERE client=1 ORDER BY nom ";
+ $sql = "SELECT rowid, nom, ville FROM ".MAIN_DB_PREFIX."societe WHERE client=1 ORDER BY nom ";
if ( $db->query( $sql) )
{
$num = $db->num_rows();
@@ -485,9 +485,9 @@ elseif ($_GET["action"] == 'create_line' && $_GET["client"] > 0)
print '
Fournisseur
';
$ff = array();
- $sql = "SELECT f.idp, f.nom FROM ".MAIN_DB_PREFIX."societe as f";
+ $sql = "SELECT f.rowid, f.nom FROM ".MAIN_DB_PREFIX."societe as f";
$sql .= " , ".MAIN_DB_PREFIX."telephonie_adsl_fournisseur as fa";
- $sql .= " WHERE fa.commande_active = 1 AND fa.fk_soc = f.idp ORDER BY f.nom ";
+ $sql .= " WHERE fa.commande_active = 1 AND fa.fk_soc = f.rowid ORDER BY f.nom ";
if ( $db->query( $sql) )
{
$num = $db->num_rows();
diff --git a/htdocs/telephonie/adsl/liste.php b/htdocs/telephonie/adsl/liste.php
index 389165298ff..57f9a93e181 100644
--- a/htdocs/telephonie/adsl/liste.php
+++ b/htdocs/telephonie/adsl/liste.php
@@ -54,11 +54,11 @@ if ($sortfield == "") $sortfield="la.statut ASC, s.nom";
*/
$sql = "SELECT la.rowid, fk_client, s.nom as nom, la.numero_ligne, la.statut, t.intitule";
-$sql .= " , s.idp";
+$sql .= " , s.rowid as socid";
$sql .= " FROM ".MAIN_DB_PREFIX."telephonie_adsl_ligne as la";
$sql .= " , ".MAIN_DB_PREFIX."societe as s";
$sql .= " , ".MAIN_DB_PREFIX."telephonie_adsl_type as t";
-$sql .= " WHERE la.fk_client = s.idp";
+$sql .= " WHERE la.fk_client = s.rowid";
$sql .= " AND t.rowid = la.fk_type";
if ($_GET["search_ligne"])
@@ -133,9 +133,9 @@ if ($resql)
print ''.dolibarr_print_phone($obj->numero_ligne)."
\n";
diff --git a/htdocs/telephonie/client/factures.php b/htdocs/telephonie/client/factures.php
index 8ed14ebc350..d966bc1097f 100644
--- a/htdocs/telephonie/client/factures.php
+++ b/htdocs/telephonie/client/factures.php
@@ -109,13 +109,13 @@ if ($_GET["id"])
$pagenext = $page + 1;
$sql = "SELECT f.rowid, f.date, sum(f.cout_vente) as cout_vente, f.fk_facture";
- $sql .= " ,s.nom, s.idp";
+ $sql .= " ,s.nom, s.rowid as socid";
$sql .= " FROM ".MAIN_DB_PREFIX."telephonie_facture as f";
$sql .= " , ".MAIN_DB_PREFIX."societe as s";
$sql .= " , ".MAIN_DB_PREFIX."telephonie_societe_ligne as l";
- $sql .= " WHERE s.idp = l.fk_soc_facture AND l.rowid = f.fk_ligne";
- $sql .= " AND s.idp = ".$soc->id;
+ $sql .= " WHERE s.rowid = l.fk_soc_facture AND l.rowid = f.fk_ligne";
+ $sql .= " AND s.rowid = ".$soc->id;
$sql .= " GROUP BY f.fk_facture";
$sql .= " ORDER BY $sortfield $sortorder " . $db->plimit($conf->liste_limit+1, $offset);
diff --git a/htdocs/telephonie/client/fiche.php b/htdocs/telephonie/client/fiche.php
index 7c859d5e468..63452cda0a4 100644
--- a/htdocs/telephonie/client/fiche.php
+++ b/htdocs/telephonie/client/fiche.php
@@ -168,10 +168,10 @@ if ($_GET["id"])
$sql .= " , ".MAIN_DB_PREFIX."telephonie_contrat as c";
$sql .= " , ".MAIN_DB_PREFIX."societe as ss";
$sql .= " WHERE c.fk_client_comm = ".$soc->id;
- $sql .= " AND c.fk_soc = ss.idp ";
+ $sql .= " AND c.fk_soc = ss.rowid ";
$sql .= " AND l.fk_contrat = c.rowid";
$sql .= " GROUP BY c.rowid";
- $sql .= " ORDER BY ss.idp ASC";
+ $sql .= " ORDER BY ss.rowid ASC";
$resql = $db->query($sql);
diff --git a/htdocs/telephonie/client/index.php b/htdocs/telephonie/client/index.php
index 2692cd80154..26ff56e19c6 100644
--- a/htdocs/telephonie/client/index.php
+++ b/htdocs/telephonie/client/index.php
@@ -56,10 +56,10 @@ print '
';
print ' ';
-$sql = "SELECT distinct s.idp ";
+$sql = "SELECT distinct s.rowid as socid ";
$sql .= " FROM ".MAIN_DB_PREFIX."telephonie_societe_ligne as l";
$sql .= " , ".MAIN_DB_PREFIX."societe as s";
-$sql .= " WHERE s.idp = l.fk_client_comm ";
+$sql .= " WHERE s.rowid = l.fk_client_comm ";
$sql .= " AND l.fk_commercial_suiv = ".$user->id;
$resql = $db->query($sql);
if ($resql)
@@ -92,12 +92,12 @@ print ' ';
* Liste
*
*/
-$sql = "SELECT s.idp as socid, s.nom, max(sc.datec) as dam";
+$sql = "SELECT s.rowid as socid, s.nom, max(sc.datec) as dam";
$sql .= " FROM ".MAIN_DB_PREFIX."societe as s";
$sql .= ",".MAIN_DB_PREFIX."societe_consult as sc";
-$sql .= " WHERE s.idp = sc.fk_soc";
+$sql .= " WHERE s.rowid = sc.fk_soc";
$sql .= " AND sc.fk_user = ".$user->id;
-$sql .= " GROUP BY s.idp";
+$sql .= " GROUP BY s.rowid";
$sql .= " ORDER BY dam DESC LIMIT 10";
$resql = $db->query($sql);
@@ -138,14 +138,14 @@ print '
';
* Liste
*
*/
-$sql = "SELECT s.idp as socid, s.nom, count(l.ligne) as ligne";
+$sql = "SELECT s.rowid as socid, s.nom, count(l.ligne) as ligne";
$sql .= " FROM ".MAIN_DB_PREFIX."societe as s,".MAIN_DB_PREFIX."telephonie_societe_ligne as l";
$sql .= ",".MAIN_DB_PREFIX."societe_perms as sp";
-$sql .= " WHERE l.fk_client_comm = s.idp ";
-$sql .= " AND s.idp = sp.fk_soc";
+$sql .= " WHERE l.fk_client_comm = s.rowid ";
+$sql .= " AND s.rowid = sp.fk_soc";
$sql .= " AND sp.fk_user = ".$user->id." AND sp.pread = 1";
-$sql .= " GROUP BY s.idp";
+$sql .= " GROUP BY s.rowid";
$sql .= " ORDER BY s.datec DESC LIMIT 10";
$resql = $db->query($sql);
@@ -191,12 +191,12 @@ else
print " ";
/* Commentaires */
-$sql = "SELECT s.idp as socid, s.nom, c.commentaire";
+$sql = "SELECT s.rowid as socid, s.nom, c.commentaire";
$sql .= " FROM ".MAIN_DB_PREFIX."societe as s,".MAIN_DB_PREFIX."telephonie_societe_commentaire as c";
$sql .= ",".MAIN_DB_PREFIX."societe_perms as sp";
-$sql .= " WHERE c.fk_soc = s.idp ";
-$sql .= " AND s.idp = sp.fk_soc";
+$sql .= " WHERE c.fk_soc = s.rowid ";
+$sql .= " AND s.rowid = sp.fk_soc";
$sql .= " AND sp.fk_user = ".$user->id." AND sp.pread = 1";
$sql .= " ORDER BY c.datec DESC LIMIT 10";
diff --git a/htdocs/telephonie/client/lignes.php b/htdocs/telephonie/client/lignes.php
index fbb60b06c5a..9284cac00cf 100644
--- a/htdocs/telephonie/client/lignes.php
+++ b/htdocs/telephonie/client/lignes.php
@@ -113,16 +113,16 @@ if ($_GET["id"])
/* Lignes */
- $sql = "SELECT s.idp as socid, f.nom as fournisseur, s.nom";
+ $sql = "SELECT s.rowid as socid, f.nom as fournisseur, s.nom";
$sql .= ", ss.nom as agence, ss.ville, ss.code_client";
$sql .= " , l.ligne, l.statut, l.rowid, l.remise";
$sql .= " FROM ".MAIN_DB_PREFIX."societe as s,".MAIN_DB_PREFIX."telephonie_societe_ligne as l";
$sql .= " , ".MAIN_DB_PREFIX."societe as ss";
$sql .= " , ".MAIN_DB_PREFIX."telephonie_fournisseur as f";
- $sql .= " WHERE l.fk_client_comm = s.idp AND l.fk_fournisseur = f.rowid";
- $sql .= " AND l.fk_soc = ss.idp ";
- $sql .= " AND s.idp = ".$soc->id;
- $sql .= " ORDER BY ss.idp ASC";
+ $sql .= " WHERE l.fk_client_comm = s.rowid AND l.fk_fournisseur = f.rowid";
+ $sql .= " AND l.fk_soc = ss.rowid ";
+ $sql .= " AND s.rowid = ".$soc->id;
+ $sql .= " ORDER BY ss.rowid ASC";
$resql = $db->query($sql);
diff --git a/htdocs/telephonie/client/liste.php b/htdocs/telephonie/client/liste.php
index 0f6f1f5b73e..27c15f1d989 100644
--- a/htdocs/telephonie/client/liste.php
+++ b/htdocs/telephonie/client/liste.php
@@ -58,11 +58,11 @@ $pagenext = $page + 1;
*
*
*/
-$sql = "SELECT s.idp as socid, s.nom, count(l.ligne) as ligne, cs.ca";
+$sql = "SELECT s.rowid as socid, s.nom, count(l.ligne) as ligne, cs.ca";
$sql .= " FROM ".MAIN_DB_PREFIX."societe as s";
-$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe_perms as sp ON sp.fk_soc = s.idp ";
-$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."telephonie_client_stats as cs ON cs.fk_client_comm = s.idp";
-$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."telephonie_societe_ligne as l ON l.fk_client_comm = s.idp";
+$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe_perms as sp ON sp.fk_soc = s.rowid ";
+$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."telephonie_client_stats as cs ON cs.fk_client_comm = s.rowid";
+$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."telephonie_societe_ligne as l ON l.fk_client_comm = s.rowid";
$sql .= " WHERE sp.fk_user = ".$user->id." AND sp.pread = 1";
@@ -72,7 +72,7 @@ if ($_GET["search_client"])
$sql .= " AND s.nom LIKE '%".$sel."%'";
}
-$sql .= " GROUP BY s.idp";
+$sql .= " GROUP BY s.rowid";
$sql .= " ORDER BY $sortfield $sortorder " . $db->plimit($conf->liste_limit+1, $offset);
$result = $db->query($sql);
diff --git a/htdocs/telephonie/client/my.php b/htdocs/telephonie/client/my.php
index 340d7c2b664..b0a4b90c6da 100644
--- a/htdocs/telephonie/client/my.php
+++ b/htdocs/telephonie/client/my.php
@@ -58,10 +58,10 @@ $pagenext = $page + 1;
*
*
*/
-$sql = "SELECT s.idp as socid, s.nom, count(l.ligne) as ligne, cs.ca";
+$sql = "SELECT s.rowid as socid, s.nom, count(l.ligne) as ligne, cs.ca";
$sql .= " FROM ".MAIN_DB_PREFIX."societe as s";
-$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."telephonie_societe_ligne AS l ON l.fk_client_comm = s.idp";
-$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."telephonie_client_stats as cs ON cs.fk_client_comm = s.idp";
+$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."telephonie_societe_ligne AS l ON l.fk_client_comm = s.rowid";
+$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."telephonie_client_stats as cs ON cs.fk_client_comm = s.rowid";
$sql .= " WHERE l.fk_commercial_suiv = ".$user->id;
if ($_GET["search_client"])
@@ -70,7 +70,7 @@ if ($_GET["search_client"])
$sql .= " AND s.nom LIKE '%".$sel."%'";
}
-$sql .= " GROUP BY s.idp";
+$sql .= " GROUP BY s.rowid";
$sql .= " ORDER BY $sortfield $sortorder " . $db->plimit($conf->liste_limit+1, $offset);
$result = $db->query($sql);
diff --git a/htdocs/telephonie/client/remises.php b/htdocs/telephonie/client/remises.php
index 2559a0d537d..39edce05975 100644
--- a/htdocs/telephonie/client/remises.php
+++ b/htdocs/telephonie/client/remises.php
@@ -55,14 +55,14 @@ $pagenext = $page + 1;
*
*/
-$sql = "SELECT s.idp as socid, s.nom, r.amount";
+$sql = "SELECT s.rowid as socid, s.nom, r.amount";
$sql .= " FROM ".MAIN_DB_PREFIX."societe as s";
$sql .= ",".MAIN_DB_PREFIX."telephonie_client_remise as r";
$sql .= ",".MAIN_DB_PREFIX."societe_perms as sp";
-$sql .= " WHERE r.fk_client = s.idp ";
+$sql .= " WHERE r.fk_client = s.rowid ";
$sql .= " AND r.fk_facture = 0";
-$sql .= " AND s.idp = sp.fk_soc";
+$sql .= " AND s.rowid = sp.fk_soc";
$sql .= " AND sp.fk_user = ".$user->id." AND sp.pread = 1";
if ($_GET["search_client"])
diff --git a/htdocs/telephonie/client/remisesdone.php b/htdocs/telephonie/client/remisesdone.php
index f9edcaae782..3733125482f 100644
--- a/htdocs/telephonie/client/remisesdone.php
+++ b/htdocs/telephonie/client/remisesdone.php
@@ -55,16 +55,16 @@ $pagenext = $page + 1;
*
*/
-$sql = "SELECT s.idp as socid, s.nom, r.amount, f.facnumber, r.fk_facture";
+$sql = "SELECT s.rowid as socid, s.nom, r.amount, f.facnumber, r.fk_facture";
$sql .= " FROM ".MAIN_DB_PREFIX."societe as s";
$sql .= ",".MAIN_DB_PREFIX."telephonie_client_remise as r";
$sql .= ",".MAIN_DB_PREFIX."societe_perms as sp";
$sql .= ",".MAIN_DB_PREFIX."facture as f";
-$sql .= " WHERE r.fk_client = s.idp ";
+$sql .= " WHERE r.fk_client = s.rowid ";
$sql .= " AND r.fk_facture > 0";
$sql .= " AND r.fk_facture = f.rowid";
-$sql .= " AND s.idp = sp.fk_soc";
+$sql .= " AND s.rowid = sp.fk_soc";
$sql .= " AND sp.fk_user = ".$user->id." AND sp.pread = 1";
if ($_GET["search_client"])
diff --git a/htdocs/telephonie/client/tarifs.php b/htdocs/telephonie/client/tarifs.php
index 4e0b35042a9..41d380da354 100644
--- a/htdocs/telephonie/client/tarifs.php
+++ b/htdocs/telephonie/client/tarifs.php
@@ -273,9 +273,9 @@ if ($_GET["id"])
$sql .= "," . MAIN_DB_PREFIX."societe as s";
$sql .= "," . MAIN_DB_PREFIX."user as u";
- $sql .= " WHERE t.rowid = tc.fk_tarif AND tc.fk_client = s.idp";
+ $sql .= " WHERE t.rowid = tc.fk_tarif AND tc.fk_client = s.rowid";
$sql .= " AND u.rowid = tc.fk_user";
- $sql .= " AND s.idp = ".$soc->id;
+ $sql .= " AND s.rowid = ".$soc->id;
$sql .= " ORDER BY t.libelle ASC";
if ( $db->query( $sql) )
diff --git a/htdocs/telephonie/contrat/fiche.php b/htdocs/telephonie/contrat/fiche.php
index 586d91a9985..39ca9fee42c 100644
--- a/htdocs/telephonie/contrat/fiche.php
+++ b/htdocs/telephonie/contrat/fiche.php
@@ -156,7 +156,7 @@ if ($_GET["action"] == 'create' && $user->rights->telephonie->ligne->creer)
print '
Client
';
$ff = array();
- $sql = "SELECT idp, nom, ville FROM ".MAIN_DB_PREFIX."societe WHERE client=1 AND (parent = 0 OR parent IS NULL) ORDER BY nom ";
+ $sql = "SELECT rowid, nom, ville FROM ".MAIN_DB_PREFIX."societe WHERE client=1 AND (parent = 0 OR parent IS NULL) ORDER BY nom ";
if ( $db->query( $sql) )
{
$num = $db->num_rows();
@@ -244,9 +244,9 @@ elseif ($_GET["action"] == 'create_line' && $_GET["client_comm"] > 0 && $user->r
print '
Client (Agence/Filiale)
';
$ff = array();
- $sql = "SELECT idp, nom, ville FROM ".MAIN_DB_PREFIX."societe";
+ $sql = "SELECT rowid, nom, ville FROM ".MAIN_DB_PREFIX."societe";
$sql .= " WHERE client=1";
- $sql .= " AND (idp = $socc->id OR parent = $socc->id)";
+ $sql .= " AND (rowid = ".$socc->id." OR parent = ".$socc->id.")";
$sql .= " ORDER BY nom ";
if ( $db->query( $sql) )
@@ -273,8 +273,8 @@ elseif ($_GET["action"] == 'create_line' && $_GET["client_comm"] > 0 && $user->r
print '
Client à facturer
';
$ff = array();
- $sql = "SELECT idp, nom, ville FROM ".MAIN_DB_PREFIX."societe WHERE client=1";
- $sql .= " AND (idp = $socc->id OR parent = $socc->id)";
+ $sql = "SELECT rowid, nom, ville FROM ".MAIN_DB_PREFIX."societe WHERE client=1";
+ $sql .= " AND (rowid = ".$socc->id." OR parent = ".$socc->id.")";
$sql .= " ORDER BY nom ";
if ( $db->query( $sql) )
{
@@ -338,17 +338,17 @@ elseif ($_GET["action"] == 'create_line' && $_GET["client_comm"] > 0 && $user->r
/*
* Contrats existants
*/
- $sql = "SELECT c.rowid, c.ref, s.idp as socid, s.nom ";
- $sql .= ", sf.idp as sfidp, sf.nom as sfnom";
- $sql .= ", sa.idp as saidp, sa.nom as sanom";
+ $sql = "SELECT c.rowid, c.ref, s.rowid as socid, s.nom ";
+ $sql .= ", sf.rowid as sfidp, sf.nom as sfnom";
+ $sql .= ", sa.rowid as saidp, sa.nom as sanom";
$sql .= " FROM ".MAIN_DB_PREFIX."societe as s";
$sql .= " , ".MAIN_DB_PREFIX."societe as sf";
$sql .= " , ".MAIN_DB_PREFIX."societe as sa";
$sql .= " , ".MAIN_DB_PREFIX."telephonie_contrat as c";
- $sql .= " WHERE c.fk_client_comm = s.idp";
- $sql .= " AND c.fk_soc = sa.idp";
- $sql .= " AND c.fk_soc_facture = sf.idp";
- $sql .= " AND s.idp = ".$_GET["client_comm"];
+ $sql .= " WHERE c.fk_client_comm = s.rowid";
+ $sql .= " AND c.fk_soc = sa.rowid";
+ $sql .= " AND c.fk_soc_facture = sf.rowid";
+ $sql .= " AND s.rowid = ".$_GET["client_comm"];
$result = $db->query($sql);
if ($result)
@@ -570,10 +570,10 @@ else
print '
Contact facture
';
print '
';
- $sql = "SELECT c.idp, c.name, c.firstname, c.email ";
+ $sql = "SELECT c.rowid, c.name, c.firstname, c.email ";
$sql .= "FROM ".MAIN_DB_PREFIX."socpeople as c";
$sql .= ",".MAIN_DB_PREFIX."telephonie_contrat_contact_facture as cf";
- $sql .= " WHERE c.idp = cf.fk_contact AND cf.fk_contrat = ".$contrat->id." ORDER BY name ";
+ $sql .= " WHERE c.rowid = cf.fk_contact AND cf.fk_contrat = ".$contrat->id." ORDER BY name ";
if ( $db->query( $sql) )
{
$num = $db->num_rows();
@@ -609,7 +609,7 @@ else
$sql .= " , ".MAIN_DB_PREFIX."societe as ss";
$sql .= " , ".MAIN_DB_PREFIX."telephonie_fournisseur as f";
$sql .= " WHERE l.fk_fournisseur = f.rowid";
- $sql .= " AND l.fk_soc = ss.idp ";
+ $sql .= " AND l.fk_soc = ss.rowid ";
$sql .= " AND l.fk_contrat = ".$contrat->id;
$sql .= " ORDER BY l.statut ASC, l.ligne ASC";
@@ -713,8 +713,8 @@ else
print '
