Nouveau design
This commit is contained in:
Rodolphe Quiedeville
parent
b79f7aef07
commit
b695a2e5bb
@ -24,7 +24,7 @@ require("./pre.inc.php");
|
|||||||
require("../contact.class.php");
|
require("../contact.class.php");
|
||||||
|
|
||||||
llxHeader();
|
llxHeader();
|
||||||
|
$socid = $_GET["socid"];
|
||||||
/*
|
/*
|
||||||
* Sécurité accés client
|
* Sécurité accés client
|
||||||
*/
|
*/
|
||||||
@ -33,130 +33,33 @@ if ($user->societe_id > 0)
|
|||||||
$action = '';
|
$action = '';
|
||||||
$socid = $user->societe_id;
|
$socid = $user->societe_id;
|
||||||
}
|
}
|
||||||
|
|
||||||
if ($sortorder == "")
|
|
||||||
{
|
|
||||||
$sortorder="ASC";
|
|
||||||
}
|
|
||||||
if ($sortfield == "")
|
|
||||||
{
|
|
||||||
$sortfield="nom";
|
|
||||||
}
|
|
||||||
|
|
||||||
if ($action == 'attribute_prefix')
|
|
||||||
{
|
|
||||||
$societe = new Societe($db, $socid);
|
|
||||||
$societe->attribute_prefix($db, $socid);
|
|
||||||
}
|
|
||||||
|
|
||||||
if ($action == 'recontact')
|
|
||||||
{
|
|
||||||
$dr = mktime(0, 0, 0, $remonth, $reday, $reyear);
|
|
||||||
$sql = "INSERT INTO ".MAIN_DB_PREFIX."soc_recontact (fk_soc, datere, author) VALUES ($socid, $dr,'". $GLOBALS["REMOTE_USER"]."')";
|
|
||||||
$result = $db->query($sql);
|
|
||||||
}
|
|
||||||
|
|
||||||
if ($action == 'note') {
|
|
||||||
$sql = "UPDATE ".MAIN_DB_PREFIX."societe SET note='$note' WHERE idp=$socid";
|
|
||||||
$result = $db->query($sql);
|
|
||||||
}
|
|
||||||
|
|
||||||
if ($action == 'stcomm') {
|
|
||||||
if ($stcommid <> 'null' && $stcommid <> $oldstcomm) {
|
|
||||||
$sql = "INSERT INTO socstatutlog (datel, fk_soc, fk_statut, author) ";
|
|
||||||
$sql .= " VALUES ('$dateaction',$socid,$stcommid,'" . $GLOBALS["REMOTE_USER"] . "')";
|
|
||||||
$result = @$db->query($sql);
|
|
||||||
|
|
||||||
if ($result) {
|
|
||||||
$sql = "UPDATE ".MAIN_DB_PREFIX."societe SET fk_stcomm=$stcommid WHERE idp=$socid";
|
|
||||||
$result = $db->query($sql);
|
|
||||||
} else {
|
|
||||||
$errmesg = "ERREUR DE DATE !";
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if ($actioncommid)
|
|
||||||
{
|
|
||||||
$sql = "INSERT INTO ".MAIN_DB_PREFIX."actioncomm (datea, fk_action, fk_soc, fk_user_author) VALUES ('$dateaction',$actioncommid,$socid,'" . $user->id . "')";
|
|
||||||
$result = @$db->query($sql);
|
|
||||||
|
|
||||||
if (!$result)
|
|
||||||
{
|
|
||||||
$errmesg = "ERREUR DE DATE !";
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Recherche
|
|
||||||
*
|
|
||||||
*
|
|
||||||
*/
|
|
||||||
if ($mode == 'search') {
|
|
||||||
if ($mode-search == 'soc') {
|
|
||||||
$sql = "SELECT s.idp FROM ".MAIN_DB_PREFIX."societe as s ";
|
|
||||||
$sql .= " WHERE lower(s.nom) like '%".strtolower($socname)."%'";
|
|
||||||
}
|
|
||||||
|
|
||||||
if ( $db->query($sql) ) {
|
|
||||||
if ( $db->num_rows() == 1) {
|
|
||||||
$obj = $db->fetch_object(0);
|
|
||||||
$socid = $obj->idp;
|
|
||||||
}
|
|
||||||
$db->free();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
/*
|
/*
|
||||||
*
|
*
|
||||||
* Mode fiche
|
* Mode fiche
|
||||||
*
|
*
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
if ($socid > 0)
|
$societe = new Societe($db);
|
||||||
|
|
||||||
|
if ( $societe->fetch($socid) )
|
||||||
{
|
{
|
||||||
$societe = new Societe($db, $socid);
|
$head[0][0] = 'soc.php?socid='.$societe->id;
|
||||||
|
$head[0][1] = "Fiche société";
|
||||||
|
$h = 1;
|
||||||
|
|
||||||
$sql = "SELECT s.idp, s.nom, ".$db->pdate("s.datec")." as dc, s.tel, s.fax, st.libelle as stcomm, s.fk_stcomm, s.url,s.address,s.cp,s.ville, s.note, t.libelle as typent, e.libelle as effectif, s.siren, s.prefix_comm, s.services,s.parent, s.description";
|
$head[$h][0] = DOL_URL_ROOT.'/fourn/fiche.php?socid='.$societe->id;
|
||||||
$sql .= " FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."c_stcomm as st, ".MAIN_DB_PREFIX."c_typent as t, ".MAIN_DB_PREFIX."c_effectif as e ";
|
$head[$h][1] = 'Fiche Fournisseur';
|
||||||
$sql .= " WHERE s.fk_stcomm=st.id AND s.fk_typent = t.id AND s.fk_effectif = e.id";
|
$a = $h;
|
||||||
|
$h++;
|
||||||
|
|
||||||
if ($to == 'next')
|
$head[$h][0] = DOL_URL_ROOT.'/product/liste.php?type=0&fourn_id='.$societe->id;
|
||||||
{
|
$head[$h][1] = 'Produits';
|
||||||
$sql .= " AND s.idp > $socid ORDER BY idp ASC LIMIT 1";
|
$h++;
|
||||||
}
|
|
||||||
elseif ($to == 'prev')
|
|
||||||
{
|
|
||||||
$sql .= " AND s.idp < $socid ORDER BY idp DESC LIMIT 1";
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
$sql .= " AND s.idp = $socid";
|
|
||||||
}
|
|
||||||
|
|
||||||
$result = $db->query($sql);
|
dolibarr_fiche_head($head, $a);
|
||||||
|
|
||||||
if ($result)
|
print_titre("Fiche fournisseur : $societe->nom");
|
||||||
{
|
|
||||||
$objsoc = $db->fetch_object(0);
|
|
||||||
|
|
||||||
$dac = strftime("%Y-%m-%d %H:%M", time());
|
|
||||||
if ($errmesg) {
|
|
||||||
print "<b>$errmesg</b><br>";
|
|
||||||
}
|
|
||||||
|
|
||||||
/*
|
|
||||||
*
|
|
||||||
*/
|
|
||||||
print '<table width="100%" class="noborder" cellspacing="1">';
|
|
||||||
|
|
||||||
print "<tr><td><div class=\"titre\">Fiche fournisseur : $objsoc->nom</div></td>";
|
|
||||||
|
|
||||||
print '<td><a href="facture/fiche.php?action=create&socid='.$objsoc->idp.'">Nouvelle Facture <img src="'.DOL_URL_ROOT.'/theme/'.$conf->theme.'/img/filenew.png" border="0" alt="Nouvelle facture"></a></td>';
|
|
||||||
|
|
||||||
print "<td align=\"center\">[<a href=\"../soc.php?socid=$objsoc->idp&action=edit\">Editer</a>]</td>";
|
|
||||||
print '<td align="center"><a href="'.DOL_URL_ROOT.'/product/liste.php?type=0&fourn_id='.$objsoc->idp.'">Produits</a></td>';
|
|
||||||
|
|
||||||
print "</tr></table>";
|
|
||||||
/*
|
/*
|
||||||
*
|
*
|
||||||
*
|
*
|
||||||
@ -167,8 +70,8 @@ if ($socid > 0)
|
|||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
print '<table class="border" cellpadding="3" cellspacing="0" width="100%">';
|
print '<table class="border" cellpadding="3" cellspacing="0" width="100%">';
|
||||||
print '<tr><td>Tél</td><td>'.$objsoc->tel.' </td><td>fax</td><td>'.$objsoc->fax.' </td></tr>';
|
print '<tr><td>Tél</td><td>'.$societe->tel.' </td><td>fax</td><td>'.$societe->fax.' </td></tr>';
|
||||||
print '<tr><td>Adresse</td><td colspan="3">'.nl2br($objsoc->address).'<br>'.$objsoc->cp.' '.$objsoc->ville.'</td></tr>';
|
print '<tr><td>Adresse</td><td colspan="3">'.nl2br($societe->address).'<br>'.$societe->cp.' '.$societe->ville.'</td></tr>';
|
||||||
|
|
||||||
print '</table>';
|
print '</table>';
|
||||||
/*
|
/*
|
||||||
@ -181,7 +84,7 @@ if ($socid > 0)
|
|||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
$sql = "SELECT p.rowid,p.libelle,p.facnumber,".$db->pdate("p.datef")." as df";
|
$sql = "SELECT p.rowid,p.libelle,p.facnumber,".$db->pdate("p.datef")." as df";
|
||||||
$sql .= " FROM ".MAIN_DB_PREFIX."facture_fourn as p WHERE p.fk_soc = $objsoc->idp";
|
$sql .= " FROM ".MAIN_DB_PREFIX."facture_fourn as p WHERE p.fk_soc = $societe->id";
|
||||||
$sql .= " ORDER BY p.datef DESC LIMIT 0,4";
|
$sql .= " ORDER BY p.datef DESC LIMIT 0,4";
|
||||||
if ( $db->query($sql) )
|
if ( $db->query($sql) )
|
||||||
{
|
{
|
||||||
@ -191,7 +94,7 @@ if ($socid > 0)
|
|||||||
if ($num > 0)
|
if ($num > 0)
|
||||||
{
|
{
|
||||||
print '<tr class="liste_titre">';
|
print '<tr class="liste_titre">';
|
||||||
print "<td colspan=\"2\"><a href=\"facture/index.php?socid=$objsoc->idp\">liste des factures</td></tr>";
|
print "<td colspan=\"2\"><a href=\"facture/index.php?socid=$societe->id\">liste des factures</td></tr>";
|
||||||
}
|
}
|
||||||
while ($i < $num && $i < 5)
|
while ($i < $num && $i < 5)
|
||||||
{
|
{
|
||||||
@ -231,10 +134,10 @@ if ($socid > 0)
|
|||||||
print "<tr><td><b>Prénom Nom</b></td>";
|
print "<tr><td><b>Prénom Nom</b></td>";
|
||||||
print '<td><b>Poste</b></td><td><b>Tél</b></td>';
|
print '<td><b>Poste</b></td><td><b>Tél</b></td>';
|
||||||
print "<td><b>Fax</b></td><td><b>Email</b></td>";
|
print "<td><b>Fax</b></td><td><b>Email</b></td>";
|
||||||
print "<td><a href=\"people.php?socid=$objsoc->idp&action=addcontact\">Ajouter</a></td></tr>";
|
print "<td><a href=\"people.php?socid=$societe->id&action=addcontact\">Ajouter</a></td></tr>";
|
||||||
|
|
||||||
$sql = "SELECT p.idp, p.name, p.firstname, p.poste, p.phone, p.fax, p.email, p.note";
|
$sql = "SELECT p.idp, p.name, p.firstname, p.poste, p.phone, p.fax, p.email, p.note";
|
||||||
$sql .= " FROM ".MAIN_DB_PREFIX."socpeople as p WHERE p.fk_soc = $objsoc->idp ORDER by p.datec";
|
$sql .= " FROM ".MAIN_DB_PREFIX."socpeople as p WHERE p.fk_soc = $societe->id ORDER by p.datec";
|
||||||
$result = $db->query($sql);
|
$result = $db->query($sql);
|
||||||
$i = 0 ; $num = $db->num_rows(); $tag = True;
|
$i = 0 ; $num = $db->num_rows(); $tag = True;
|
||||||
while ($i < $num)
|
while ($i < $num)
|
||||||
@ -255,116 +158,22 @@ if ($socid > 0)
|
|||||||
}
|
}
|
||||||
print "</td>";
|
print "</td>";
|
||||||
print "<td>$obj->poste </td>";
|
print "<td>$obj->poste </td>";
|
||||||
print '<td><a href="actioncomm.php?action=create&actionid=1&contactid='.$obj->idp.'&socid='.$objsoc->idp.'">'.$obj->phone.'</a> </td>';
|
print '<td><a href="actioncomm.php?action=create&actionid=1&contactid='.$obj->idp.'&socid='.$societe->id.'">'.$obj->phone.'</a> </td>';
|
||||||
print '<td><a href="actioncomm.php?action=create&actionid=2&contactid='.$obj->idp.'&socid='.$objsoc->idp.'">'.$obj->fax.'</a> </td>';
|
print '<td><a href="actioncomm.php?action=create&actionid=2&contactid='.$obj->idp.'&socid='.$societe->id.'">'.$obj->fax.'</a> </td>';
|
||||||
print '<td><a href="actioncomm.php?action=create&actionid=4&contactid='.$obj->idp.'&socid='.$objsoc->idp.'">'.$obj->email.'</a> </td>';
|
print '<td><a href="actioncomm.php?action=create&actionid=4&contactid='.$obj->idp.'&socid='.$societe->id.'">'.$obj->email.'</a> </td>';
|
||||||
print "<td><a href=\"people.php?socid=$objsoc->idp&action=editcontact&contactid=$obj->idp\">Modifier</a></td>";
|
print "<td><a href=\"people.php?socid=$societe->id&action=editcontact&contactid=$obj->idp\">Modifier</a></td>";
|
||||||
print "</tr>\n";
|
print "</tr>\n";
|
||||||
$i++;
|
$i++;
|
||||||
$tag = !$tag;
|
$tag = !$tag;
|
||||||
}
|
}
|
||||||
print "</table>";
|
print "</table></div>";
|
||||||
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
print '<table width="100%" cellspacing=0 border=0 cellpadding=2>';
|
print '<div class="tabsAction">';
|
||||||
print '<tr>';
|
print '<a class="tabAction" href="facture/fiche.php?action=create&socid='.$societe->id.'">Nouvelle Facture</a>';
|
||||||
print '<td valign="top">';
|
print '</div>';
|
||||||
/*
|
|
||||||
*
|
|
||||||
* Listes des actions
|
|
||||||
*
|
|
||||||
*/
|
|
||||||
$sql = "SELECT a.id, ".$db->pdate("a.datea")." as da, c.libelle, u.code, a.propalrowid, a.fk_user_author, fk_contact, u.rowid ";
|
|
||||||
$sql .= " FROM ".MAIN_DB_PREFIX."actioncomm as a, ".MAIN_DB_PREFIX."c_actioncomm as c, ".MAIN_DB_PREFIX."user as u ";
|
|
||||||
$sql .= " WHERE a.fk_soc = $objsoc->idp ";
|
|
||||||
$sql .= " AND u.rowid = a.fk_user_author";
|
|
||||||
$sql .= " AND c.id=a.fk_action ";
|
|
||||||
$sql .= " ORDER BY a.datea DESC, a.id DESC";
|
|
||||||
|
|
||||||
if ( $db->query($sql) )
|
|
||||||
{
|
|
||||||
print "<table width=\"100%\" cellspacing=0 border=0 cellpadding=2>\n";
|
|
||||||
print '<tr><td><a href="'.DOL_URL_ROOT.'/comm/action/index.php?socid='.$objsoc->idp.'">Actions</a></td></tr>';
|
|
||||||
|
|
||||||
$i = 0 ; $num = $db->num_rows(); $tag = True;
|
|
||||||
while ($i < $num)
|
|
||||||
{
|
|
||||||
$obj = $db->fetch_object( $i);
|
|
||||||
if ($tag)
|
|
||||||
{
|
|
||||||
print "<tr bgcolor=\"e0e0e0\">";
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
print "<tr>";
|
|
||||||
}
|
|
||||||
|
|
||||||
if ($oldyear == strftime("%Y",$obj->da) )
|
|
||||||
{
|
|
||||||
print '<td align="center">|</td>';
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
print "<TD align=\"center\">" .strftime("%Y",$obj->da)."</TD>\n";
|
|
||||||
$oldyear = strftime("%Y",$obj->da);
|
|
||||||
}
|
|
||||||
|
|
||||||
if ($oldmonth == strftime("%Y%b",$obj->da) ) {
|
|
||||||
print '<td align="center">|</td>';
|
|
||||||
} else {
|
|
||||||
print "<TD align=\"center\">" .strftime("%b",$obj->da)."</TD>\n";
|
|
||||||
$oldmonth = strftime("%Y%b",$obj->da);
|
|
||||||
}
|
|
||||||
|
|
||||||
print "<TD>" .strftime("%d",$obj->da)."</TD>\n";
|
|
||||||
print "<TD>" .strftime("%H:%M",$obj->da)."</TD>\n";
|
|
||||||
|
|
||||||
if ($obj->propalrowid) {
|
|
||||||
print '<td width="40%"><a href="propal.php?propalid='.$obj->propalrowid.'">'.$obj->libelle.'</a></td>';
|
|
||||||
} else {
|
|
||||||
print '<td width="40%">'.$obj->libelle.'</td>';
|
|
||||||
}
|
|
||||||
/*
|
|
||||||
* Contact pour cette action
|
|
||||||
*
|
|
||||||
*/
|
|
||||||
if ($obj->fk_contact) {
|
|
||||||
$contact = new Contact($db);
|
|
||||||
$contact->fetch($obj->fk_contact);
|
|
||||||
print '<td width="40%"><a href="people.php?socid='.$objsoc->idp.'&contactid='.$contact->id.'">'.$contact->fullname.'</a></td>';
|
|
||||||
} else {
|
|
||||||
print '<td width="40%"> </td>';
|
|
||||||
}
|
|
||||||
/*
|
|
||||||
*/
|
|
||||||
print '<td width="20%"><a href="'.DOL_URL_ROOT.'/user/fiche.php?id='.$obj->fk_user_author.'">'.$obj->code.'</a></td>';
|
|
||||||
print "</tr>\n";
|
|
||||||
$i++;
|
|
||||||
$tag = !$tag;
|
|
||||||
}
|
|
||||||
print "</table>";
|
|
||||||
|
|
||||||
$db->free();
|
|
||||||
} else {
|
|
||||||
print $db->error() . "<br>" . $sql;
|
|
||||||
}
|
|
||||||
print "</td></tr></table>";
|
|
||||||
/*
|
|
||||||
*
|
|
||||||
* Notes sur la societe
|
|
||||||
*
|
|
||||||
*/
|
|
||||||
print '<table border="1" width="100%" cellspacing="0" bgcolor="#e0e0e0">';
|
|
||||||
print "<tr><td>".nl2br($objsoc->note)."</td></tr>";
|
|
||||||
print "</table>";
|
|
||||||
|
|
||||||
}
|
|
||||||
else {
|
|
||||||
print $db->error() . "<br>" . $sql;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user