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

Fix: bad object name

Browse Source
This commit is contained in:
Regis Houssin 2011-03-16 11:51:17 +00:00
parent 63632c2189
commit a65f898613
1 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
htdocs/comm/index.php
View File

@ -158,8 +158,8 @@ if ($conf->propal->enabled && $user->rights->propale->lire)
if ($num > 0) if ($num > 0)
{ {
print '<table class="noborder" width="100%">'; print '<table class="noborder" width="100%">';
print "<tr class=\"liste_titre\">"; print '<tr class="liste_titre">';
print "<td colspan=\"3\">".$langs->trans("ProposalsDraft")."</td></tr>"; print '<td colspan="3">'.$langs->trans("ProposalsDraft").'</td></tr>';
$i = 0; $i = 0;
$var=true; $var=true;
@ -279,7 +279,7 @@ $max=3;
if ($conf->propal->enabled && $user->rights->propale->lire) if ($conf->propal->enabled && $user->rights->propale->lire)
{ {
$sql = "SELECT s.nom as name, s.rowid, s.canvas, p.rowid as propalid, p.total_ht, p.ref, p.fk_statut, p.datep as dp"; $sql = "SELECT s.nom as name, s.rowid as socid, s.client, s.canvas, p.rowid as propalid, p.total_ht, p.ref, p.fk_statut, p.datep as dp";
$sql.= " FROM ".MAIN_DB_PREFIX."societe as s"; $sql.= " FROM ".MAIN_DB_PREFIX."societe as s";
$sql.= ", ".MAIN_DB_PREFIX."propal as p"; $sql.= ", ".MAIN_DB_PREFIX."propal as p";
if (!$user->rights->societe->client->voir && !$socid) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc"; if (!$user->rights->societe->client->voir && !$socid) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
@ -329,17 +329,17 @@ if ($conf->propal->enabled && $user->rights->propale->lire)
print '</td>'; print '</td>';
print '<td align="left">'; print '<td align="left">';
$companystatic->id=$obj->socid; $companystatic->id=$objp->socid;
$companystatic->name=$obj->name; $companystatic->name=$objp->name;
$companystatic->client=$obj->client; $companystatic->client=$objp->client;
$companystatic->canvas=$obj->canvas; $companystatic->canvas=$objp->canvas;
print $companystatic->getNomUrl(1,'customer',44); print $companystatic->getNomUrl(1,'customer',44);
print '</td>'; print '</td>';
print "<td align=\"right\">"; print '<td align="right">';
print dol_print_date($db->jdate($objp->dp),'day')."</td>\n"; print dol_print_date($db->jdate($objp->dp),'day').'</td>'."\n";
print "<td align=\"right\">".price($objp->total_ht)."</td>\n"; print '<td align="right">'.price($objp->total_ht).'</td>'."\n";
print "<td align=\"center\" width=\"14\">".$propalstatic->LibStatut($objp->fk_statut,3)."</td>\n"; print '<td align="center" width="14">'.$propalstatic->LibStatut($objp->fk_statut,3).'</td>'."\n";
print "</tr>\n"; print '</tr>'."\n";
$i++; $i++;
$var=!$var; $var=!$var;
} }
@ -604,12 +604,12 @@ if ($conf->propal->enabled && $user->rights->propale->lire)
print "</td>"; print "</td>";
print "<td align=\"left\"><a href=\"fiche.php?socid=".$obj->rowid."\">".img_object($langs->trans("ShowCompany"),"company")." ".dol_trunc($obj->nom,44)."</a></td>\n"; print '<td align="left"><a href="fiche.php?socid='.$obj->rowid.'">'.img_object($langs->trans("ShowCompany"),"company").' '.dol_trunc($obj->nom,44).'</a></td>'."\n";
print "<td align=\"right\">"; print '<td align="right">';
print dol_print_date($db->jdate($obj->dp),'day')."</td>\n"; print dol_print_date($db->jdate($obj->dp),'day').'</td>'."\n";
print "<td align=\"right\">".price($obj->total_ttc)."</td>"; print '<td align="right">'.price($obj->total_ttc).'</td>';
print "<td align=\"center\" width=\"14\">".$propalstatic->LibStatut($obj->fk_statut,3)."</td>\n"; print '<td align="center" width="14">'.$propalstatic->LibStatut($obj->fk_statut,3).'</td>'."\n";
print "</tr>\n"; print '</tr>'."\n";
$i++; $i++;
$total += $obj->total_ttc; $total += $obj->total_ttc;
} }