diff --git a/htdocs/comm/index.php b/htdocs/comm/index.php index bf7566784b4..4eb7457a90b 100644 --- a/htdocs/comm/index.php +++ b/htdocs/comm/index.php @@ -140,7 +140,7 @@ if ($conf->contrat->enabled && $user->rights->contrat->lire) */ if ($conf->propal->enabled && $user->rights->propale->lire) { - $sql = "SELECT p.rowid, p.ref, p.total_ht, s.rowid as socid, s.nom, s.client"; + $sql = "SELECT p.rowid, p.ref, p.total_ht, s.rowid as socid, s.nom as name, s.client, s.canvas"; $sql.= " FROM ".MAIN_DB_PREFIX."propal as p"; $sql.= ", ".MAIN_DB_PREFIX."societe as s"; if (!$user->rights->societe->client->voir && !$socid) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc"; @@ -158,8 +158,8 @@ if ($conf->propal->enabled && $user->rights->propale->lire) if ($num > 0) { print ''; - print ""; - print ""; + print ''; + print ''; $i = 0; $var=true; @@ -174,8 +174,9 @@ if ($conf->propal->enabled && $user->rights->propale->lire) print ''; print ''; print ''; @@ -205,7 +206,7 @@ if ($conf->commande->enabled && $user->rights->commande->lire) { $langs->load("orders"); - $sql = "SELECT c.rowid, c.ref, c.total_ttc, s.rowid as socid, s.nom, s.client"; + $sql = "SELECT c.rowid, c.ref, c.total_ttc, s.rowid as socid, s.nom as name, s.client, s.canvas"; $sql.= " FROM ".MAIN_DB_PREFIX."commande as c"; $sql.= ", ".MAIN_DB_PREFIX."societe as s"; if (!$user->rights->societe->client->voir && !$socid) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc"; @@ -235,8 +236,9 @@ if ($conf->commande->enabled && $user->rights->commande->lire) print ''; print ''; print ''; @@ -277,7 +279,7 @@ $max=3; if ($conf->propal->enabled && $user->rights->propale->lire) { - $sql = "SELECT s.nom, s.rowid, 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"; @@ -326,12 +328,18 @@ if ($conf->propal->enabled && $user->rights->propale->lire) print ''; - print ''; - print "\n"; - print "\n"; - print "\n"; - print "\n"; + print ''; + print ''."\n"; + print ''."\n"; + print ''."\n"; + print ''."\n"; $i++; $var=!$var; } @@ -352,7 +360,7 @@ if ($conf->societe->enabled && $user->rights->societe->lire) { $langs->load("boxes"); - $sql = "SELECT s.rowid,s.nom,s.client,s.datec,s.tms"; + $sql = "SELECT s.rowid, s.nom as name, s.client, s.datec,s.tms"; $sql.= " FROM ".MAIN_DB_PREFIX."societe as s"; if (!$user->rights->societe->client->voir && !$socid) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc"; $sql.= " WHERE s.client IN (1, 2, 3)"; @@ -376,15 +384,15 @@ if ($conf->societe->enabled && $user->rights->societe->lire) print ''; if ($num) { - $company=new Societe($db); while ($i < $num) { $objp = $db->fetch_object($resql); - $company->id=$objp->rowid; - $company->nom=$objp->nom; - $company->client=$objp->client; + $companystatic->id=$objp->rowid; + $companystatic->name=$objp->name; + $companystatic->client=$objp->client; + $companystatic->canvas=$objp->canvas; print ''; - print ''; + print ''; print ''; if ($num) { - $company=new Societe($db); while ($i < $num && $i < $max) { $objp = $db->fetch_object($result); - $company->id=$objp->rowid; - $company->nom=$objp->nom; - print ''; - print ''; + $companystatic->id=$objp->rowid; + $companystatic->name=$objp->name; + $companystatic->canvas=$objp->canvas; + print ''; + print ''; print ''; print ''; $var=!$var; @@ -485,7 +493,8 @@ if ($conf->contrat->enabled && $user->rights->contrat->lire && 0) // TODO A REFA { $langs->load("contracts"); - $sql = "SELECT s.nom, s.rowid, c.statut, c.rowid as contratid, p.ref, c.mise_en_service as datemes, c.fin_validite as datefin, c.date_cloture as dateclo"; + $sql = "SELECT s.nom as name, s.rowid, s.canvas, "; + $sql.= " c.statut, c.rowid as contratid, p.ref, c.mise_en_service as datemes, c.fin_validite as datefin, c.date_cloture as dateclo"; $sql.= " FROM ".MAIN_DB_PREFIX."societe as s"; $sql.= ", ".MAIN_DB_PREFIX."contrat as c"; $sql.= ", ".MAIN_DB_PREFIX."product as p"; @@ -517,7 +526,12 @@ if ($conf->contrat->enabled && $user->rights->contrat->lire && 0) // TODO A REFA { $obj = $db->fetch_object($resql); print ""; - print "\n"; + print ''."\n"; print "\n"; $var=!$var; $i++; @@ -590,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->nom=$obj->nom; + $companystatic->name=$obj->name; $companystatic->client=$obj->client; + $companystatic->canvas=$obj->canvas; print $companystatic->getNomUrl(1,'customer',16); print ''.price($obj->total_ht).'
'.img_object($langs->trans("ShowOrder"),"order").' '.$obj->ref.''; $companystatic->id=$obj->socid; - $companystatic->nom=$obj->nom; + $companystatic->name=$obj->name; $companystatic->client=$obj->client; + $companystatic->canvas=$obj->canvas; print $companystatic->getNomUrl(1,'customer',16); print ''.price($obj->total_ttc).'
'.img_object($langs->trans("ShowCompany"),"company").' '.dol_trunc($objp->nom,44).'"; - print dol_print_date($db->jdate($objp->dp),'day')."".price($objp->total_ht)."".$propalstatic->LibStatut($objp->fk_statut,3)."
'; + $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).'
'.$company->getNomUrl(1,'customer',48).''.$companystatic->getNomUrl(1,'customer',48).''; if ($objp->client == 2 || $objp->client == 3) print $langs->trans("Prospect"); if ($objp->client == 3) print ' / '; @@ -412,7 +420,7 @@ if ($conf->fournisseur->enabled && $user->rights->societe->lire) { $langs->load("boxes"); - $sql = "SELECT s.nom, s.rowid, s.datec as dc, s.tms as dm"; + $sql = "SELECT s.nom as name, s.rowid, s.datec as dc, s.canvas, s.tms as dm"; $sql.= " FROM ".MAIN_DB_PREFIX."societe as s"; if (!$user->rights->societe->client->voir && !$user->societe_id) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc"; $sql.= " WHERE s.fournisseur = 1"; @@ -435,14 +443,14 @@ if ($conf->fournisseur->enabled && $user->rights->societe->lire) print '
'.$company->getNomUrl(1,'supplier',48).'
'.$companystatic->getNomUrl(1,'supplier',44).''.dol_print_date($db->jdate($objp->dm),'day').'
contratid."\">".img_object($langs->trans("ShowContract","contract"))." ".$obj->ref."rowid."\">".img_object($langs->trans("ShowCompany","company"))." ".$obj->nom."'; + $companystatic->id=$objp->rowid; + $companystatic->name=$objp->name; + $companystatic->canvas=$objp->canvas; + print $companystatic->getNomUrl(1,'customer',44); + print '".$staticcontrat->LibStatut($obj->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).'