/[dolibarr]/dolibarr/htdocs/comm/fiche.php
ViewVC logotype

Diff of /dolibarr/htdocs/comm/fiche.php

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 1.97 by eldy, Wed Aug 31 20:47:26 2005 UTC revision 1.98 by eldy, Thu Sep 1 19:40:45 2005 UTC
# Line 33  require_once("./pre.inc.php"); Line 33  require_once("./pre.inc.php");
33  if (!$user->rights->societe->lire) accessforbidden();  if (!$user->rights->societe->lire) accessforbidden();
34    
35  require_once(DOL_DOCUMENT_ROOT."/contact.class.php");  require_once(DOL_DOCUMENT_ROOT."/contact.class.php");
36    require_once(DOL_DOCUMENT_ROOT."/propal.class.php");
37  require_once(DOL_DOCUMENT_ROOT."/actioncomm.class.php");  require_once(DOL_DOCUMENT_ROOT."/actioncomm.class.php");
38  require_once(DOL_DOCUMENT_ROOT."/commande/commande.class.php");  require_once(DOL_DOCUMENT_ROOT."/commande/commande.class.php");
39  require_once(DOL_DOCUMENT_ROOT."/contrat/contrat.class.php");  require_once(DOL_DOCUMENT_ROOT."/contrat/contrat.class.php");
# Line 315  if ($_socid > 0) Line 316  if ($_socid > 0)
316       */       */
317      if ($conf->propal->enabled)      if ($conf->propal->enabled)
318      {      {
319            $propal_static=new Propal($db);
320    
321          print '<table class="noborder" width="100%">';          print '<table class="noborder" width="100%">';
322    
323          $sql = "SELECT s.nom, s.idp, p.rowid as propalid, p.price, p.ref, p.remise, ".$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.fk_statut, p.price, p.ref, p.remise, ".$db->pdate("p.datep")." as dp, c.label as statut, c.id as statutid";
324          $sql .= " FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."propal as p, ".MAIN_DB_PREFIX."c_propalst as c";          $sql .= " FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."propal as p, ".MAIN_DB_PREFIX."c_propalst as c";
325          $sql .= " WHERE p.fk_soc = s.idp AND p.fk_statut = c.id";          $sql .= " WHERE p.fk_soc = s.idp AND p.fk_statut = c.id";
326          $sql .= " AND s.idp = ".$objsoc->id;          $sql .= " AND s.idp = ".$objsoc->id;
# Line 347  if ($_socid > 0) Line 350  if ($_socid > 0)
350                  }                  }
351                  print '</td><td align="right" width="80">'.dolibarr_print_date($objp->dp)."</td>\n";                  print '</td><td align="right" width="80">'.dolibarr_print_date($objp->dp)."</td>\n";
352                  print '<td align="right" width="120">'.price($objp->price).'</td>';                  print '<td align="right" width="120">'.price($objp->price).'</td>';
353                  print '<td align="center" width="100">'.$objp->statut.'</td></tr>';                  print '<td align="center" width="100">'.$propal_static->labelstatut_short[$objp->fk_statut].'</td></tr>';
354                  $var=!$var;                  $var=!$var;
355                  $i++;                  $i++;
356              }              }

Legend:
Removed from v.1.97  
changed lines
  Added in v.1.98

savannah-hackers-public@gnu.org
ViewVC Help
Powered by ViewVC 1.1.26