diff --git a/htdocs/comm/index.php b/htdocs/comm/index.php index aac872cd2f2..31cc3a32f2a 100644 --- a/htdocs/comm/index.php +++ b/htdocs/comm/index.php @@ -158,8 +158,8 @@ if ($conf->propal->enabled && $user->rights->propale->lire) if ($num > 0) { print ''; - print ""; - print ""; + print ''; + print ''; $i = 0; $var=true; @@ -279,7 +279,7 @@ $max=3; 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.= ", ".MAIN_DB_PREFIX."propal as p"; 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 ''; print ''; - print "\n"; - print "\n"; - print "\n"; - print "\n"; + print ''."\n"; + print ''."\n"; + print ''."\n"; + print ''."\n"; $i++; $var=!$var; } @@ -604,12 +604,12 @@ if ($conf->propal->enabled && $user->rights->propale->lire) print ""; - print "\n"; - print "\n"; - print ""; - print "\n"; - print "\n"; + print ''."\n"; + print ''."\n"; + print ''; + print ''."\n"; + print ''."\n"; $i++; $total += $obj->total_ttc; }
".$langs->trans("ProposalsDraft")."
'.$langs->trans("ProposalsDraft").'
'; - $companystatic->id=$obj->socid; - $companystatic->name=$obj->name; - $companystatic->client=$obj->client; - $companystatic->canvas=$obj->canvas; + $companystatic->id=$objp->socid; + $companystatic->name=$objp->name; + $companystatic->client=$objp->client; + $companystatic->canvas=$objp->canvas; print $companystatic->getNomUrl(1,'customer',44); print '"; - print dol_print_date($db->jdate($objp->dp),'day')."".price($objp->total_ht)."".$propalstatic->LibStatut($objp->fk_statut,3)."
'; + print dol_print_date($db->jdate($objp->dp),'day').''.price($objp->total_ht).''.$propalstatic->LibStatut($objp->fk_statut,3).'
rowid."\">".img_object($langs->trans("ShowCompany"),"company")." ".dol_trunc($obj->nom,44).""; - print dol_print_date($db->jdate($obj->dp),'day')."".price($obj->total_ttc)."".$propalstatic->LibStatut($obj->fk_statut,3)."
'.img_object($langs->trans("ShowCompany"),"company").' '.dol_trunc($obj->nom,44).''; + print dol_print_date($db->jdate($obj->dp),'day').''.price($obj->total_ttc).''.$propalstatic->LibStatut($obj->fk_statut,3).'