lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Mise jour des noms de tables

Browse Source
This commit is contained in:
Rodolphe Quiedeville 2003-05-25 17:47:31 +00:00
parent cb8025f4ae
commit f1e876d9bd
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
htdocs/compta/propal.php3
View File

@ -68,14 +68,15 @@ if ($action == 'setstatut') {
* *
* *
*/ */
if ($propalid) { if ($propalid)
{
$propal = new Propal($db); $propal = new Propal($db);
$propal->fetch($propalid); $propal->fetch($propalid);
if ($valid == 1)
if ($valid == 1) { {
$propal->valid($user->id); $propal->valid($user->id);
} }
/* /*
* *
*/ */
@ -86,7 +87,7 @@ if ($propalid) {
* *
*/ */
$sql = "SELECT s.nom, s.idp, p.price, p.fk_projet,p.remise, p.tva, p.total, p.ref,".$db->pdate("p.datep")." as dp, c.id as statut, c.label as lst, p.note, x.firstname, x.name, x.fax, x.phone, x.email, p.fk_user_author, p.fk_user_valid, p.fk_user_cloture, p.datec, p.date_valid, p.date_cloture"; $sql = "SELECT s.nom, s.idp, p.price, p.fk_projet,p.remise, p.tva, p.total, p.ref,".$db->pdate("p.datep")." as dp, c.id as statut, c.label as lst, p.note, x.firstname, x.name, x.fax, x.phone, x.email, p.fk_user_author, p.fk_user_valid, p.fk_user_cloture, p.datec, p.date_valid, p.date_cloture";
$sql .= " FROM societe as s, llx_propal as p, c_propalst as c, socpeople as x"; $sql .= " FROM llx_societe as s, llx_propal as p, c_propalst as c, llx_socpeople as x";
$sql .= " WHERE p.fk_soc = s.idp AND p.fk_statut = c.id AND x.idp = p.fk_soc_contact AND p.rowid = $propalid"; $sql .= " WHERE p.fk_soc = s.idp AND p.fk_statut = c.id AND x.idp = p.fk_soc_contact AND p.rowid = $propalid";
$result = $db->query($sql); $result = $db->query($sql);
@ -329,7 +330,7 @@ if ($propalid) {
print "</table>"; print "</table>";
$sql = "SELECT s.nom, s.idp, p.rowid as propalid, p.price - p.remise as price, p.ref,".$db->pdate("p.datep")." as dp, c.label as statut, c.id as statutid"; $sql = "SELECT s.nom, s.idp, p.rowid as propalid, p.price - p.remise as price, p.ref,".$db->pdate("p.datep")." as dp, c.label as statut, c.id as statutid";
$sql .= " FROM societe as s, llx_propal as p, c_propalst as c "; $sql .= " FROM llx_societe as s, llx_propal as p, c_propalst as c ";
$sql .= " WHERE p.fk_soc = s.idp AND p.fk_statut = c.id AND p.fk_statut in(2,4)"; $sql .= " WHERE p.fk_soc = s.idp AND p.fk_statut = c.id AND p.fk_statut in(2,4)";
if ($socidp) { if ($socidp) {