| '.$langs->trans("LastContracts",($num<=$MAXLIST?"":$MAXLIST)).' | ';
+ print ' | ';
print '
';
}
@@ -419,8 +435,9 @@ if ($_socid > 0)
$var=!$var;
print "";
print '| '.img_object($langs->trans("ShowContract"),"contract").' '.$objp->ref." | \n";
- print "".dolibarr_print_date($objp->dc)." | \n";
- print "".$contratstatic->LibStatut($objp->statut)." | \n";
+ print ''.dolibarr_print_date($objp->dc)." | \n";
+ print ' | ';
+ print ''.$contratstatic->LibStatut($objp->statut)." | \n";
print '
';
$i++;
}
@@ -550,11 +567,6 @@ if ($_socid > 0)
print ''.$langs->trans("AddIntervention").'';
}
- if ($conf->projet->enabled && $user->rights->projet->creer)
- {
- print ''.$langs->trans("AddProject").'';
- }
-
print ''.$langs->trans("AddAction").'';
print ''.$langs->trans("AddContact").'';
@@ -626,10 +638,7 @@ if ($_socid > 0)
print ''.$obj->poste.' | ';
print '';
- /*
- * Lien click to dial
- */
-
+ // Lien click to dial
if (strlen($obj->phone) && $user->clicktodial_enabled == 1)
{
print '';
diff --git a/htdocs/comm/index.php b/htdocs/comm/index.php
index afa8c7b8905..a7e1348d305 100644
--- a/htdocs/comm/index.php
+++ b/htdocs/comm/index.php
@@ -41,6 +41,8 @@ $user->getrights('fichinter');
$user->getrights('commande');
$user->getrights('projet');
+// Securité accès client
+$socidp='';
if ($user->societe_id > 0)
{
$socidp = $user->societe_id;
@@ -55,7 +57,7 @@ llxHeader();
* Actions
*/
-if ($_GET["action"] == 'add_bookmark')
+if (isset($_GET["action"]) && $_GET["action"] == 'add_bookmark')
{
$sql = "DELETE FROM ".MAIN_DB_PREFIX."bookmark WHERE fk_soc = ".$_GET["socidp"]." AND fk_user=".$user->id;
if (! $db->query($sql) )
@@ -69,7 +71,7 @@ if ($_GET["action"] == 'add_bookmark')
}
}
-if ($_GET["action"] == 'del_bookmark')
+if (isset($_GET["action"]) && $_GET["action"] == 'del_bookmark')
{
$sql = "DELETE FROM ".MAIN_DB_PREFIX."bookmark WHERE rowid=".$_GET["bid"];
$result = $db->query($sql);
@@ -80,11 +82,11 @@ if ($_GET["action"] == 'del_bookmark')
* Affichage page
*/
-print_titre($langs->trans("CommercialArea"));
+print_fiche_titre($langs->trans("CommercialArea"));
-print '';
+print '';
-print '| ';
+print ' | ';
/*
@@ -118,35 +120,35 @@ if ($conf->contrat->enabled) {
*/
if ($conf->propal->enabled && $user->rights->propale->lire)
{
- $sql = "SELECT p.rowid, p.ref, p.price, s.nom";
+ $sql = "SELECT p.rowid, p.ref, p.price, s.idp, s.nom";
$sql .= " FROM ".MAIN_DB_PREFIX."propal as p, ".MAIN_DB_PREFIX."societe as s";
$sql .= " WHERE p.fk_statut = 0 and p.fk_soc = s.idp";
$resql=$db->query($sql);
if ($resql)
{
- $var=true;
-
$total = 0;
$num = $db->num_rows($resql);
- $i = 0;
if ($num > 0)
{
print '
";
}
@@ -161,7 +163,7 @@ if ($conf->propal->enabled && $user->rights->propale->lire)
if ($conf->commande->enabled)
{
$langs->load("orders");
- $sql = "SELECT c.rowid, c.ref, s.nom, s.idp FROM ".MAIN_DB_PREFIX."commande as c, ".MAIN_DB_PREFIX."societe as s";
+ $sql = "SELECT c.rowid, c.ref, c.total_ttc, s.nom, s.idp FROM ".MAIN_DB_PREFIX."commande as c, ".MAIN_DB_PREFIX."societe as s";
$sql .= " WHERE c.fk_soc = s.idp AND c.fk_statut = 0";
if ($socidp)
{
@@ -170,12 +172,14 @@ if ($conf->commande->enabled)
if ( $db->query($sql) )
{
+ $total = 0;
$num = $db->num_rows();
if ($num)
{
print '
";
}
@@ -235,7 +245,7 @@ if ( $db->query($sql) )
}
}
-print ' | ';
+print ' | ';
/*
@@ -289,7 +299,7 @@ if ($user->rights->societe->lire)
* Dernières actions commerciales effectuées
*/
-$sql = "SELECT a.id, ".$db->pdate("a.datea")." as da, c.libelle, a.fk_user_author, s.nom as sname, s.idp";
+$sql = "SELECT a.id, ".$db->pdate("a.datea")." as da, c.code, c.libelle, a.fk_user_author, s.nom as sname, s.idp";
$sql .= " FROM ".MAIN_DB_PREFIX."actioncomm as a, ".MAIN_DB_PREFIX."c_actioncomm as c, ".MAIN_DB_PREFIX."societe as s";
$sql .= " WHERE c.id=a.fk_action AND a.percent >= 100 AND s.idp = a.fk_soc";
if ($socidp)
@@ -528,18 +538,7 @@ if ($conf->propal->enabled && $user->rights->propale->lire) {
print ''.img_object($langs->trans("ShowPropal"),"propal").' ';
print $objp->ref.' | ';
print ''.img_object($langs->trans("ShowCompany"),"company").' '.dolibarr_trunc($objp->nom,44).' | ';
-
- $now = time();
- $lim = 3600 * 24 * 15 ;
- if ( ($now - $objp->dp) > $lim && $objp->statutid == 1 )
- {
- print " > 15 jours | ";
- }
- else
- {
- print " | ";
- }
-
+ print " | ";
print "";
print dolibarr_print_date($objp->dp)." | \n";
print "".price($objp->price)." | \n";
diff --git a/htdocs/comm/prospect/index.php b/htdocs/comm/prospect/index.php
index 7ba44633282..036a3d8c8fa 100644
--- a/htdocs/comm/prospect/index.php
+++ b/htdocs/comm/prospect/index.php
@@ -61,11 +61,11 @@ function valeur($sql)
*
*/
-print_titre($langs->trans("ProspectionArea"));
+print_fiche_titre($langs->trans("ProspectionArea"));
-print '';
+print '';
-print '| ';
+print ' | | ';
if ($conf->propal->enabled)
{
@@ -165,7 +165,7 @@ if ($conf->propal->enabled && $user->rights->propale->lire)
* Actions commerciales a faire
*
*/
-print ' | ';
+print ' | ';
$sql = "SELECT a.id, ".$db->pdate("a.datea")." as da, c.code, c.libelle, a.fk_user_author, s.nom as sname, s.idp";
$sql .= " FROM ".MAIN_DB_PREFIX."actioncomm as a, ".MAIN_DB_PREFIX."c_actioncomm as c, ".MAIN_DB_PREFIX."societe as s";
diff --git a/htdocs/comm/prospect/prospects.php b/htdocs/comm/prospect/prospects.php
index 42fe61d2a95..5907704ad29 100644
--- a/htdocs/comm/prospect/prospects.php
+++ b/htdocs/comm/prospect/prospects.php
@@ -44,11 +44,7 @@ if ($_GET["action"] == 'cstc')
$db->query($sql);
}
-dolibarr_user_page_param($db, $user, $_GET);
-
-/*
- * Sécurité accés client
- */
+// Sécurité accés client
if ($user->societe_id > 0)
{
$action = '';
diff --git a/htdocs/comm/remise.php b/htdocs/comm/remise.php
index e141fe32337..0b1401ae652 100644
--- a/htdocs/comm/remise.php
+++ b/htdocs/comm/remise.php
@@ -1,6 +1,6 @@
- * Copyright (C) 2004 Laurent Destailleur
+ * Copyright (C) 2004-2005 Laurent Destailleur
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -43,35 +43,31 @@ $langs->load("companies");
if ($_POST["action"] == 'setremise')
{
- $soc = New Societe($db);
- $soc->fetch($_GET["id"]);
- $soc->set_remise_client($_POST["remise"],$user);
-
-
- Header("Location: remise.php?id=".$_GET["id"]);
-
+ $soc = New Societe($db);
+ $soc->fetch($_GET["id"]);
+ $soc->set_remise_client($_POST["remise"],$user);
+
+ Header("Location: remise.php?id=".$_GET["id"]);
+ exit;
}
llxHeader();
-
-/*
- *
- */
$_socid = $_GET["id"];
-/*
- * Sécurité si un client essaye d'accéder à une autre fiche que la sienne
- */
+
+
+// Sécurité si un client essaye d'accéder à une autre fiche que la sienne
if ($user->societe_id > 0)
{
- $_socid = $user->societe_id;
+ $_socid = $user->societe_id;
}
+
+
/*********************************************************************************
*
* Mode fiche
*
- *
*********************************************************************************/
if ($_socid > 0)
{
@@ -156,52 +152,26 @@ if ($_socid > 0)
print '';
print '";
print "";
- print "
";
-
- /*
- *
- */
print " | \n";
-
- /*
- *
- *
- */
print " ";
print " | \n";
print '
';
- /*
- *
- * Notes sur la societe
- *
- */
- if ($objsoc->note)
- {
- print '';
- print "| ".nl2br($objsoc->note)." | ";
- print " ";
- }
- /*
- *
- */
/*
- *
* Liste de l'historique des remises
- *
*/
$sql = "SELECT rc.rowid,rc.remise_client,".$db->pdate("rc.datec")." as dc, u.code";
$sql .= " FROM ".MAIN_DB_PREFIX."societe_remise as rc, ".MAIN_DB_PREFIX."user as u";
diff --git a/htdocs/comm/remx.php b/htdocs/comm/remx.php
index b484eaea3a9..03f40c58000 100644
--- a/htdocs/comm/remx.php
+++ b/htdocs/comm/remx.php
@@ -1,6 +1,6 @@
- * Copyright (C) 2004 Laurent Destailleur
+ * Copyright (C) 2004-2005 Laurent Destailleur
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -23,14 +23,11 @@
/**
\file htdocs/comm/remx.php
\ingroup commercial
- \brief Onglet ???
+ \brief Onglet de définition des avoirs
\version $Revision$
*/
require_once("./pre.inc.php");
-require_once("../contact.class.php");
-//require_once("../cactioncomm.class.php");
-//require_once("../actioncomm.class.php");
$user->getrights('propale');
$user->getrights('commande');
@@ -38,6 +35,7 @@ $user->getrights('projet');
$langs->load("orders");
+$langs->load("bills");
$langs->load("companies");
@@ -47,25 +45,21 @@ if ($_POST["action"] == 'setremise')
$soc->fetch($_GET["id"]);
$soc->set_remise_except($_POST["remise"],$user);
-
Header("Location: remx.php?id=".$_GET["id"]);
}
llxHeader();
-
-/*
- *
- */
$_socid = $_GET["id"];
-/*
- * Sécurité si un client essaye d'accéder à une autre fiche que la sienne
- */
+
+// Sécurité si un client essaye d'accéder à une autre fiche que la sienne
if ($user->societe_id > 0)
{
$_socid = $user->societe_id;
}
+
+
/*********************************************************************************
*
* Mode fiche
@@ -96,19 +90,53 @@ if ($_socid > 0)
if ($objsoc->client==1)
{
- $head[$h][0] = DOL_URL_ROOT.'/comm/fiche.php?socid='.$objsoc->id;
- $head[$h][1] = 'Client';
- $h++;
- }
-
- if ($objsoc->client==1)
- {
- $head[$h][0] = DOL_URL_ROOT.'/comm/remx.php?id='.$objsoc->id;
- $head[$h][1] = 'Remises exceptionnelles';
$hselected=$h;
+ $head[$h][0] = DOL_URL_ROOT.'/comm/fiche.php?socid='.$objsoc->id;
+ $head[$h][1] = $langs->trans("Customer");
$h++;
}
+ if ($objsoc->client==2)
+ {
+ $hselected=$h;
+ $head[$h][0] = DOL_URL_ROOT.'/comm/prospect/fiche.php?id='.$obj->socid;
+ $head[$h][1] = $langs->trans("Prospect");
+ $h++;
+ }
+ if ($objsoc->fournisseur)
+ {
+ $head[$h][0] = DOL_URL_ROOT.'/fourn/fiche.php?socid='.$objsoc->id;
+ $head[$h][1] = $langs->trans("Supplier");
+ $h++;
+ }
+
+ if ($conf->compta->enabled) {
+ $head[$h][0] = DOL_URL_ROOT.'/compta/fiche.php?socid='.$objsoc->id;
+ $head[$h][1] = $langs->trans("Accountancy");
+ $h++;
+ }
+ $head[$h][0] = DOL_URL_ROOT.'/socnote.php?socid='.$objsoc->id;
+ $head[$h][1] = $langs->trans("Note");
+ $h++;
+
+ if ($user->societe_id == 0)
+ {
+ $head[$h][0] = DOL_URL_ROOT.'/docsoc.php?socid='.$objsoc->id;
+ $head[$h][1] = $langs->trans("Documents");
+ $h++;
+ }
+
+ $head[$h][0] = DOL_URL_ROOT.'/societe/notify/fiche.php?socid='.$objsoc->id;
+ $head[$h][1] = $langs->trans("Notifications");
+ $h++;
+
+ if ($user->societe_id == 0)
+ {
+ $head[$h][0] = DOL_URL_ROOT."/comm/index.php?socidp=$objsoc->id&action=add_bookmark";
+ $head[$h][1] = ' ';
+ $head[$h][2] = 'image';
+ }
+
dolibarr_fiche_head($head, $hselected, $objsoc->nom);
/*
@@ -118,114 +146,125 @@ if ($_socid > 0)
print ' |