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

Add missing page

Browse Source
This commit is contained in:
Laurent Destailleur 2009-01-23 15:26:55 +00:00
parent c83cbc2594
commit 61cabe5911
9 changed files with 333 additions and 213 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

317
htdocs/comm/prospect/fiche.php
View File

@ -19,11 +19,11 @@
*/ */
/** /**
\file htdocs/comm/prospect/fiche.php \file htdocs/comm/prospect/fiche.php
\ingroup prospect \ingroup prospect
\brief Page de la fiche prospect \brief Page de la fiche prospect
\version $Id$ \version $Id$
*/ */
require_once("./pre.inc.php"); require_once("./pre.inc.php");
require_once(DOL_DOCUMENT_ROOT."/lib/company.lib.php"); require_once(DOL_DOCUMENT_ROOT."/lib/company.lib.php");
@ -46,23 +46,23 @@ $result = restrictedArea($user, 'societe',$socid,'');
/* /*
* Actions * Actions
*/ */
if ($_GET["action"] == 'cstc') if ($_GET["action"] == 'cstc')
{ {
$sql = "UPDATE ".MAIN_DB_PREFIX."societe SET fk_stcomm = ".$_GET["stcomm"]; $sql = "UPDATE ".MAIN_DB_PREFIX."societe SET fk_stcomm = ".$_GET["stcomm"];
$sql .= " WHERE rowid = ".$_GET["socid"]; $sql .= " WHERE rowid = ".$_GET["socid"];
$db->query($sql); $db->query($sql);
} }
// set prospect level // set prospect level
if ($_POST["action"] == 'setprospectlevel' && $user->rights->societe->creer) if ($_POST["action"] == 'setprospectlevel' && $user->rights->societe->creer)
{ {
$societe = new Societe($db, $_GET["socid"]); $societe = new Societe($db, $_GET["socid"]);
$societe->fk_prospectlevel=$_POST['prospect_level_id']; $societe->fk_prospectlevel=$_POST['prospect_level_id'];
$sql = "UPDATE ".MAIN_DB_PREFIX."societe SET fk_prospectlevel='".$_POST['prospect_level_id']; $sql = "UPDATE ".MAIN_DB_PREFIX."societe SET fk_prospectlevel='".$_POST['prospect_level_id'];
$sql.= "' WHERE rowid='".$_GET["socid"]."'"; $sql.= "' WHERE rowid='".$_GET["socid"]."'";
$result = $db->query($sql); $result = $db->query($sql);
if (! $result) dolibarr_print_error($result); if (! $result) dolibarr_print_error($result);
} }
@ -70,7 +70,7 @@ if ($_POST["action"] == 'setprospectlevel' && $user->rights->societe->creer)
* *
* Mode fiche * Mode fiche
* *
*********************************************************************************/ *********************************************************************************/
llxHeader(); llxHeader();
@ -79,14 +79,14 @@ $formcompany=new FormCompany($db);
if ($socid > 0) if ($socid > 0)
{ {
$actionstatic=new ActionComm($db); $actionstatic=new ActionComm($db);
$societe = new Prospect($db, $socid); $societe = new Prospect($db, $socid);
$result = $societe->fetch($socid); $result = $societe->fetch($socid);
if ($result < 0) if ($result < 0)
{ {
dolibarr_print_error($db); dolibarr_print_error($db);
exit; exit;
} }
/* /*
* Affichage onglets * Affichage onglets
@ -95,14 +95,14 @@ if ($socid > 0)
dolibarr_fiche_head($head, 'prospect', $langs->trans("ThirdParty")); dolibarr_fiche_head($head, 'prospect', $langs->trans("ThirdParty"));
print "<table width=\"100%\">\n"; print '<table width="100%" class="notopnoleftnoright">';
print '<tr><td valign="top" width="50%">'; print '<tr><td valign="top" width="50%" class="notopnoleft">';
print '<table class="border" width="100%">'; print '<table class="border" width="100%">';
print '<tr><td width="25%">'.$langs->trans("Name").'</td><td width="80%" colspan="3">'.$societe->nom.'</td></tr>'; print '<tr><td width="25%">'.$langs->trans("Name").'</td><td width="80%" colspan="3">'.$societe->nom.'</td></tr>';
print '<tr><td valign="top">'.$langs->trans("Address").'</td><td colspan="3">'.nl2br($societe->adresse)."</td></tr>"; print '<tr><td valign="top">'.$langs->trans("Address").'</td><td colspan="3">'.nl2br($societe->adresse)."</td></tr>";
print '<tr><td>'.$langs->trans('Zip').' / '.$langs->trans('Town').'</td><td colspan="3">'.$societe->cp." ".$societe->ville.'</td></tr>'; print '<tr><td>'.$langs->trans('Zip').' / '.$langs->trans('Town').'</td><td colspan="3">'.$societe->cp." ".$societe->ville.'</td></tr>';
// Country // Country
print '<tr><td>'.$langs->trans("Country").'</td><td colspan="3">'; print '<tr><td>'.$langs->trans("Country").'</td><td colspan="3">';
@ -110,15 +110,15 @@ if ($socid > 0)
else print $societe->pays; else print $societe->pays;
print '</td></tr>'; print '</td></tr>';
print '<tr><td>'.$langs->trans("Phone").'</td><td>'.dol_print_phone($societe->tel,$societe->pays_code,0,$societe->id,'AC_TEL').'</td><td>Fax</td><td>'.dol_print_phone($societe->fax,$societe->pays_code).'</td></tr>'; print '<tr><td>'.$langs->trans("Phone").'</td><td>'.dol_print_phone($societe->tel,$societe->pays_code,0,$societe->id,'AC_TEL').'</td><td>Fax</td><td>'.dol_print_phone($societe->fax,$societe->pays_code).'</td></tr>';
print '<tr><td>'.$langs->trans("Web")."</td><td colspan=\"3\"><a href=\"http://$societe->url\">$societe->url</a></td></tr>"; print '<tr><td>'.$langs->trans("Web")."</td><td colspan=\"3\"><a href=\"http://$societe->url\">$societe->url</a></td></tr>";
if ($societe->rubrique) if ($societe->rubrique)
{ {
print "<tr><td>Rubrique</td><td colspan=\"3\">".$societe->rubrique."</td></tr>"; print "<tr><td>Rubrique</td><td colspan=\"3\">".$societe->rubrique."</td></tr>";
} }
print '<tr><td>'.$langs->trans('JuridicalStatus').'</td><td colspan="3">'.$societe->forme_juridique.'</td></tr>'; print '<tr><td>'.$langs->trans('JuridicalStatus').'</td><td colspan="3">'.$societe->forme_juridique.'</td></tr>';
// Level // Level
print '<tr><td nowrap>'; print '<tr><td nowrap>';
@ -139,134 +139,143 @@ if ($socid > 0)
} }
print "</td>"; print "</td>";
print '</tr>'; print '</tr>';
// Status // Status
print '<tr><td>'.$langs->trans("Status").'</td><td colspan="2">'.$societe->getLibStatut(4).'</td>'; print '<tr><td>'.$langs->trans("Status").'</td><td colspan="2">'.$societe->getLibStatut(4).'</td>';
print '<td>'; print '<td>';
if ($societe->stcomm_id != -1) print '<a href="fiche.php?socid='.$societe->id.'&amp;stcomm=-1&amp;action=cstc">'.img_action(0,-1).'</a>'; if ($societe->stcomm_id != -1) print '<a href="fiche.php?socid='.$societe->id.'&amp;stcomm=-1&amp;action=cstc">'.img_action(0,-1).'</a>';
if ($societe->stcomm_id != 0) print '<a href="fiche.php?socid='.$societe->id.'&amp;stcomm=0&amp;action=cstc">'.img_action(0,0).'</a>'; if ($societe->stcomm_id != 0) print '<a href="fiche.php?socid='.$societe->id.'&amp;stcomm=0&amp;action=cstc">'.img_action(0,0).'</a>';
if ($societe->stcomm_id != 1) print '<a href="fiche.php?socid='.$societe->id.'&amp;stcomm=1&amp;action=cstc">'.img_action(0,1).'</a>'; if ($societe->stcomm_id != 1) print '<a href="fiche.php?socid='.$societe->id.'&amp;stcomm=1&amp;action=cstc">'.img_action(0,1).'</a>';
if ($societe->stcomm_id != 2) print '<a href="fiche.php?socid='.$societe->id.'&amp;stcomm=2&amp;action=cstc">'.img_action(0,2).'</a>'; if ($societe->stcomm_id != 2) print '<a href="fiche.php?socid='.$societe->id.'&amp;stcomm=2&amp;action=cstc">'.img_action(0,2).'</a>';
if ($societe->stcomm_id != 3) print '<a href="fiche.php?socid='.$societe->id.'&amp;stcomm=3&amp;action=cstc">'.img_action(0,3).'</a>'; if ($societe->stcomm_id != 3) print '<a href="fiche.php?socid='.$societe->id.'&amp;stcomm=3&amp;action=cstc">'.img_action(0,3).'</a>';
print '</td></tr>'; print '</td></tr>';
print '</table>'; print '</table>';
print "</td>\n"; print "</td>\n";
print '<td valign="top" width="50%">'; print '<td valign="top" width="50%" class="notopnoleft">';
// Nbre max d'éléments des petites listes // Nbre max d'éléments des petites listes
$MAXLIST=5; $MAXLIST=5;
$tableaushown=0; $tableaushown=0;
// Lien recap
/* print '<table class="noborder" width="100%">';
* Dernieres propales print '<tr class="liste_titre">';
* print '<td colspan="4"><table width="100%" class="noborder"><tr><td>'.$langs->trans("Summary").'</td>';
*/ print '<td align="right"><a href="'.DOL_URL_ROOT.'/comm/prospect/recap-prospect.php?socid='.$societe->id.'">'.$langs->trans("ShowProspectPreview").'</a></td></tr></table></td>';
if ($conf->propal->enabled) print '</tr>';
{ print '</table>';
$propal_static=new Propal($db); print '<br>';
print '<table class="noborder" width="100%">';
$sql = "SELECT s.nom, s.rowid as socid, p.rowid as propalid, p.fk_statut, p.total_ht, p.ref, p.remise, ";
$sql.= " ".$db->pdate("p.datep")." as dp, ".$db->pdate("p.fin_validite")." as datelimite,";
$sql.= " c.label as statut, c.id as statutid";
$sql.= " FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."propal as p, ".MAIN_DB_PREFIX."c_propalst as c";
$sql.= " WHERE p.fk_soc = s.rowid AND p.fk_statut = c.id";
$sql.= " AND s.rowid = ".$societe->id;
$sql.= " ORDER BY p.datep DESC";
$resql=$db->query($sql);
if ($resql)
{
$var=true;
$i = 0;
$num = $db->num_rows($resql);
if ($num > 0)
{
$tableaushown=1;
print '<tr class="liste_titre">';
print '<td colspan="4"><table width="100%" class="noborder"><tr><td>'.$langs->trans("LastPropals",($num<=$MAXLIST?"":$MAXLIST)).'</td><td align="right"><a href="'.DOL_URL_ROOT.'/comm/propal.php?socid='.$societe->id.'">'.$langs->trans("AllPropals").' ('.$num.')</a></td></tr></table></td>';
print '</tr>';
}
$now = gmmktime();
while ($i < $num && $i < $MAXLIST)
{
$objp = $db->fetch_object($resql);
$var=!$var;
print "<tr $bc[$var]>";
print "<td><a href=\"../propal.php?propalid=$objp->propalid\">";
print img_object($langs->trans("ShowPropal"),"propal");
print " ".$objp->ref."</a>\n";
if ( $objp->dp < ($now - $conf->propal->cloture->warning_delay) && $objp->fk_statut == 1 )
{
print " ".img_warning();
}
print "</td><td align=\"right\">".dolibarr_print_date($objp->dp,"day")."</td>\n";
print "<td align=\"right\">".price($objp->total_ht)."</td>\n";
print "<td align=\"right\">".$propal_static->LibStatut($objp->fk_statut,5)."</td></tr>\n";
$i++;
}
$db->free();
}
else
{
dolibarr_print_error($db);
}
print "</table>";
}
print "</td></tr>";
print "</table>\n</div>\n";
/*
* Barre d'action
*
*/
print '<div class="tabsAction">';
print '<a class="butAction" href="'.DOL_URL_ROOT.'/contact/fiche.php?socid='.$societe->id.'&amp;action=create">'.$langs->trans("AddContact").'</a>';
if ($conf->agenda->enabled)
{
// Updated by Matelli (See http://matelli.fr/showcases/patchs-dolibarr/add-action-button-behaviour.html)
// Don't force the user to add a "todo action"; he could report an action that he did
print '<a class="butAction" href="'.DOL_URL_ROOT.'/comm/action/fiche.php?action=create&socid='.$socid.'">'.$langs->trans("AddAction").'</a>';
}
if ($conf->propal->enabled && defined("MAIN_MODULE_PROPALE") && MAIN_MODULE_PROPALE && $user->rights->propale->creer)
{
print '<a class="butAction" href="'.DOL_URL_ROOT.'/comm/addpropal.php?socid='.$societe->id.'&amp;action=create">'.$langs->trans("AddProp").'</a>';
}
if ($conf->projet->enabled && $user->rights->projet->creer)
{
print '<a class="butAction" href="'.DOL_URL_ROOT.'/projet/fiche.php?socid='.$socid.'&action=create">'.$langs->trans("AddProject").'</a>';
}
print '</div>';
print '<br>';
/* /*
* Liste des contacts * Dernieres propales
*/ *
*/
if ($conf->propal->enabled)
{
$propal_static=new Propal($db);
print '<table class="noborder" width="100%">';
$sql = "SELECT s.nom, s.rowid as socid, p.rowid as propalid, p.fk_statut, p.total_ht, p.ref, p.remise, ";
$sql.= " ".$db->pdate("p.datep")." as dp, ".$db->pdate("p.fin_validite")." as datelimite,";
$sql.= " c.label as statut, c.id as statutid";
$sql.= " FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."propal as p, ".MAIN_DB_PREFIX."c_propalst as c";
$sql.= " WHERE p.fk_soc = s.rowid AND p.fk_statut = c.id";
$sql.= " AND s.rowid = ".$societe->id;
$sql.= " ORDER BY p.datep DESC";
$resql=$db->query($sql);
if ($resql)
{
$var=true;
$i = 0;
$num = $db->num_rows($resql);
if ($num > 0)
{
$tableaushown=1;
print '<tr class="liste_titre">';
print '<td colspan="4"><table width="100%" class="noborder"><tr><td>'.$langs->trans("LastPropals",($num<=$MAXLIST?"":$MAXLIST)).'</td><td align="right"><a href="'.DOL_URL_ROOT.'/comm/propal.php?socid='.$societe->id.'">'.$langs->trans("AllPropals").' ('.$num.')</a></td></tr></table></td>';
print '</tr>';
}
$now = gmmktime();
while ($i < $num && $i < $MAXLIST)
{
$objp = $db->fetch_object($resql);
$var=!$var;
print "<tr $bc[$var]>";
print "<td><a href=\"../propal.php?propalid=$objp->propalid\">";
print img_object($langs->trans("ShowPropal"),"propal");
print " ".$objp->ref."</a>\n";
if ( $objp->dp < ($now - $conf->propal->cloture->warning_delay) && $objp->fk_statut == 1 )
{
print " ".img_warning();
}
print "</td><td align=\"right\">".dolibarr_print_date($objp->dp,"day")."</td>\n";
print "<td align=\"right\">".price($objp->total_ht)."</td>\n";
print "<td align=\"right\">".$propal_static->LibStatut($objp->fk_statut,5)."</td></tr>\n";
$i++;
}
$db->free();
}
else
{
dolibarr_print_error($db);
}
print "</table>";
}
print "</td></tr>";
print "</table>\n</div>\n";
/*
* Barre d'action
*
*/
print '<div class="tabsAction">';
print '<a class="butAction" href="'.DOL_URL_ROOT.'/contact/fiche.php?socid='.$societe->id.'&amp;action=create">'.$langs->trans("AddContact").'</a>';
if ($conf->agenda->enabled)
{
// Updated by Matelli (See http://matelli.fr/showcases/patchs-dolibarr/add-action-button-behaviour.html)
// Don't force the user to add a "todo action"; he could report an action that he did
print '<a class="butAction" href="'.DOL_URL_ROOT.'/comm/action/fiche.php?action=create&socid='.$socid.'">'.$langs->trans("AddAction").'</a>';
}
if ($conf->propal->enabled && defined("MAIN_MODULE_PROPALE") && MAIN_MODULE_PROPALE && $user->rights->propale->creer)
{
print '<a class="butAction" href="'.DOL_URL_ROOT.'/comm/addpropal.php?socid='.$societe->id.'&amp;action=create">'.$langs->trans("AddProp").'</a>';
}
if ($conf->projet->enabled && $user->rights->projet->creer)
{
print '<a class="butAction" href="'.DOL_URL_ROOT.'/projet/fiche.php?socid='.$socid.'&action=create">'.$langs->trans("AddProject").'</a>';
}
print '</div>';
print '<br>';
/*
* Liste des contacts
*/
show_contacts($conf,$langs,$db,$societe); show_contacts($conf,$langs,$db,$societe);
/* /*
* Listes des actions a faire * Listes des actions a faire
*/ */
show_actions_todo($conf,$langs,$db,$societe); show_actions_todo($conf,$langs,$db,$societe);
/* /*
* Listes des actions effectuees * Listes des actions effectuees
*/ */
show_actions_done($conf,$langs,$db,$societe); show_actions_done($conf,$langs,$db,$societe);
} }

96
htdocs/comm/prospect/recap-prospect.php Normal file
View File

@ -0,0 +1,96 @@
<?php
/* Copyright (C) 2001-2004 Rodolphe Quiedeville <rodolphe@quiedeville.org>
* Copyright (C) 2004-2009 Laurent Destailleur <eldy@users.sourceforge.net>
*
* 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
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
/**
\file htdocs/fourn/recap-fourn.php
\ingroup fournisseur
\brief Page de fiche recap fournisseur
\version $Id$
*/
require("./pre.inc.php");
require_once(DOL_DOCUMENT_ROOT."/lib/company.lib.php");
require_once(DOL_DOCUMENT_ROOT."/facture.class.php");
$langs->load("companies");
if ($conf->facture->enabled) $langs->load("bills");
// Sécurité accés client
$socid = $_GET["socid"];
if ($user->societe_id > 0)
{
$action = '';
$socid = $user->societe_id;
}
/*
*
* Mode fiche
*
*/
llxHeader();
if ($socid > 0)
{
$societe = new Societe($db);
$societe->fetch($socid, $to); // si $to='next' ajouter " AND s.rowid > $socid ORDER BY idp ASC LIMIT 1";
/*
* Affichage onglets
*/
$head = societe_prepare_head($societe);
dolibarr_fiche_head($head, 'prospect', $langs->trans("ThirdParty"));
print "<table width=\"100%\">\n";
print '<tr><td valign="top" width="50%">';
print '<table class="border" width="100%">';
// Nom
print '<tr><td width="20%">'.$langs->trans("Name").'</td><td width="80%" colspan="3">'.$societe->nom.'</td></tr>';
// Prefix
print '<tr><td>'.$langs->trans("Prefix").'</td><td colspan="3">';
print ($societe->prefix_comm?$societe->prefix_comm:'&nbsp;');
print '</td></tr>';
print "</table>";
print "</td></tr></table>\n";
print '</div>';
print $langs->trans("FeatureNotYetAvailable");
}
else
{
dolibarr_print_error($db);
}
$db->close();
llxFooter('$Date$ - $Revision$');
?>

49
htdocs/compta/recap-compta.php
View File

@ -1,6 +1,6 @@
<?php <?php
/* Copyright (C) 2001-2006 Rodolphe Quiedeville <rodolphe@quiedeville.org> /* Copyright (C) 2001-2006 Rodolphe Quiedeville <rodolphe@quiedeville.org>
* Copyright (C) 2004-2006 Laurent Destailleur <eldy@users.sourceforge.net> * Copyright (C) 2004-2009 Laurent Destailleur <eldy@users.sourceforge.net>
* *
* This program is free software; you can redistribute it and/or modify * 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 * it under the terms of the GNU General Public License as published by
@ -15,16 +15,13 @@
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software * along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*
* $Id$
* $Source$
*/ */
/** /**
\file htdocs/compta/recap-compta.php \file htdocs/compta/recap-compta.php
\ingroup compta \ingroup compta
\brief Page de fiche recap compta \brief Page de fiche recap compta
\version $Revision$ \version $Id$
*/ */
require("./pre.inc.php"); require("./pre.inc.php");
@ -59,11 +56,11 @@ if ($socid > 0)
* Affichage onglets * Affichage onglets
*/ */
$head = societe_prepare_head($societe); $head = societe_prepare_head($societe);
dolibarr_fiche_head($head, 'compta', $societe->nom); dolibarr_fiche_head($head, 'compta', $langs->trans("ThirdParty"));
print "<table width=\"100%\">\n"; print "<table width=\"100%\">\n";
print '<tr><td valign="top" width="50%">'; print '<tr><td valign="top" width="50%">';
print '<table class="border" width="100%">'; print '<table class="border" width="100%">';
@ -74,7 +71,7 @@ if ($socid > 0)
print '<tr><td>'.$langs->trans("Prefix").'</td><td colspan="3">'; print '<tr><td>'.$langs->trans("Prefix").'</td><td colspan="3">';
print ($societe->prefix_comm?$societe->prefix_comm:'&nbsp;'); print ($societe->prefix_comm?$societe->prefix_comm:'&nbsp;');
print '</td></tr>'; print '</td></tr>';
print "</table>"; print "</table>";
print "</td></tr></table>\n"; print "</td></tr></table>\n";
@ -86,9 +83,9 @@ if ($socid > 0)
{ {
// Factures // Factures
print_fiche_titre($langs->trans("AccountancyPreview")); print_fiche_titre($langs->trans("AccountancyPreview"));
print '<table class="noborder" width="100%">'; print '<table class="noborder" width="100%">';
$sql = "SELECT s.nom, s.rowid as socid, f.facnumber, f.amount, ".$db->pdate("f.datef")." as df,"; $sql = "SELECT s.nom, s.rowid as socid, f.facnumber, f.amount, ".$db->pdate("f.datef")." as df,";
$sql.= " f.paye as paye, f.fk_statut as statut, f.rowid as facid,"; $sql.= " f.paye as paye, f.fk_statut as statut, f.rowid as facid,";
$sql.= " u.login, u.rowid as userid"; $sql.= " u.login, u.rowid as userid";
@ -96,7 +93,7 @@ if ($socid > 0)
$sql.= " WHERE f.fk_soc = s.rowid AND s.rowid = ".$societe->id; $sql.= " WHERE f.fk_soc = s.rowid AND s.rowid = ".$societe->id;
$sql.= " AND f.fk_user_valid = u.rowid"; $sql.= " AND f.fk_user_valid = u.rowid";
$sql.= " ORDER BY f.datef DESC"; $sql.= " ORDER BY f.datef DESC";
$resql=$db->query($sql); $resql=$db->query($sql);
if ($resql) if ($resql)
{ {
@ -117,41 +114,41 @@ if ($socid > 0)
{ {
print '<tr><td colspan="7">'.$langs->trans("NoInvoice").'</td></tr>'; print '<tr><td colspan="7">'.$langs->trans("NoInvoice").'</td></tr>';
} }
$solde = 0; $solde = 0;
// Boucle sur chaque facture // Boucle sur chaque facture
for ($i = 0 ; $i < $num ; $i++) for ($i = 0 ; $i < $num ; $i++)
{ {
$objf = $db->fetch_object($resql); $objf = $db->fetch_object($resql);
$fac = new Facture($db); $fac = new Facture($db);
$ret=$fac->fetch($objf->facid); $ret=$fac->fetch($objf->facid);
if ($ret < 0) if ($ret < 0)
{ {
print $fac->error."<br>"; print $fac->error."<br>";
continue; continue;
} }
$totalpaye = $fac->getSommePaiement(); $totalpaye = $fac->getSommePaiement();
$var=!$var; $var=!$var;
print "<tr $bc[$var]>"; print "<tr $bc[$var]>";
print "<td align=\"center\">".dolibarr_print_date($fac->date)."</td>\n"; print "<td align=\"center\">".dolibarr_print_date($fac->date)."</td>\n";
print "<td><a href=\"../compta/facture.php?facid=$fac->id\">".img_object($langs->trans("ShowBill"),"bill")." ".$fac->ref."</a></td>\n"; print "<td><a href=\"../compta/facture.php?facid=$fac->id\">".img_object($langs->trans("ShowBill"),"bill")." ".$fac->ref."</a></td>\n";
print '<td aling="left">'.$fac->getLibStatut(2,$totalpaye).'</td>'; print '<td aling="left">'.$fac->getLibStatut(2,$totalpaye).'</td>';
print '<td align="right">'.price($fac->total_ttc)."</td>\n"; print '<td align="right">'.price($fac->total_ttc)."</td>\n";
$solde = $solde + $fac->total_ttc; $solde = $solde + $fac->total_ttc;
print '<td align="right">&nbsp;</td>'; print '<td align="right">&nbsp;</td>';
print '<td align="right">'.price($solde)."</td>\n"; print '<td align="right">'.price($solde)."</td>\n";
// Auteur // Auteur
print '<td nowrap="nowrap" width="50"><a href="'.DOL_URL_ROOT.'/user/fiche.php?id='.$objf->userid.'">'.img_object($langs->trans("ShowUser"),'user').' '.$objf->login.'</a></td>'; print '<td nowrap="nowrap" width="50"><a href="'.DOL_URL_ROOT.'/user/fiche.php?id='.$objf->userid.'">'.img_object($langs->trans("ShowUser"),'user').' '.$objf->login.'</a></td>';
print "</tr>\n"; print "</tr>\n";
// Paiements // Paiements
$sql = "SELECT p.rowid,".$db->pdate("p.datep")." as dp, pf.amount, p.statut,"; $sql = "SELECT p.rowid,".$db->pdate("p.datep")." as dp, pf.amount, p.statut,";
$sql.= " p.fk_user_creat, u.login, u.rowid as userid"; $sql.= " p.fk_user_creat, u.login, u.rowid as userid";
@ -160,13 +157,13 @@ if ($socid > 0)
$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."user as u ON p.fk_user_creat = u.rowid"; $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."user as u ON p.fk_user_creat = u.rowid";
$sql.= " WHERE pf.fk_paiement = p.rowid"; $sql.= " WHERE pf.fk_paiement = p.rowid";
$sql.= " AND pf.fk_facture = ".$fac->id; $sql.= " AND pf.fk_facture = ".$fac->id;
$resqlp = $db->query($sql); $resqlp = $db->query($sql);
if ($resqlp) if ($resqlp)
{ {
$nump = $db->num_rows($resqlp); $nump = $db->num_rows($resqlp);
$j = 0; $j = 0;
while ($j < $nump) while ($j < $nump)
{ {
$objp = $db->fetch_object($resqlp); $objp = $db->fetch_object($resqlp);
@ -186,7 +183,7 @@ if ($socid > 0)
print '<td nowrap="nowrap" width="50"><a href="'.DOL_URL_ROOT.'/user/fiche.php?id='.$objp->userid.'">'.img_object($langs->trans("ShowUser"),'user').' '.$objp->login.'</a></td>'; print '<td nowrap="nowrap" width="50"><a href="'.DOL_URL_ROOT.'/user/fiche.php?id='.$objp->userid.'">'.img_object($langs->trans("ShowUser"),'user').' '.$objp->login.'</a></td>';
print '</tr>'; print '</tr>';
$j++; $j++;
} }
@ -204,7 +201,7 @@ if ($socid > 0)
} }
print "</table>"; print "</table>";
print "<br>"; print "<br>";
} }
} }
else else
{ {

13
htdocs/fourn/recap-fourn.php
View File

@ -1,6 +1,6 @@
<?php <?php
/* Copyright (C) 2001-2004 Rodolphe Quiedeville <rodolphe@quiedeville.org> /* Copyright (C) 2001-2004 Rodolphe Quiedeville <rodolphe@quiedeville.org>
* Copyright (C) 2004-2006 Laurent Destailleur <eldy@users.sourceforge.net> * Copyright (C) 2004-2009 Laurent Destailleur <eldy@users.sourceforge.net>
* *
* This program is free software; you can redistribute it and/or modify * 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 * it under the terms of the GNU General Public License as published by
@ -15,16 +15,13 @@
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software * along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*
* $Id$
* $Source$
*/ */
/** /**
\file htdocs/fourn/recap-fourn.php \file htdocs/fourn/recap-fourn.php
\ingroup fournisseur \ingroup fournisseur
\brief Page de fiche recap fournisseur \brief Page de fiche recap fournisseur
\version $Revision$ \version $Id$
*/ */
require("./pre.inc.php"); require("./pre.inc.php");
@ -61,12 +58,12 @@ if ($socid > 0)
* Affichage onglets * Affichage onglets
*/ */
$head = societe_prepare_head($societe); $head = societe_prepare_head($societe);
dolibarr_fiche_head($head, 'supplier', $societe->nom); dolibarr_fiche_head($head, 'supplier', $langs->trans("ThirdParty"));
print "<table width=\"100%\">\n"; print "<table width=\"100%\">\n";
print '<tr><td valign="top" width="50%">'; print '<tr><td valign="top" width="50%">';
print '<table class="border" width="100%">'; print '<table class="border" width="100%">';

2
htdocs/langs/en_US/errors.lang
View File

@ -45,4 +45,4 @@ ErrorLDAPMakeManualTest=A .ldif file has been generated in directory %s. Try to
ErrorCantSaveADoneUserWithZeroPercentage=Can't save an action with "statut not started" if field "done by" is also filled. ErrorCantSaveADoneUserWithZeroPercentage=Can't save an action with "statut not started" if field "done by" is also filled.
ErrorBillRefAlreadyExists=Ref used for creation already exists. ErrorBillRefAlreadyExists=Ref used for creation already exists.
ErrorPleaseTypeBankTransactionReportName=Please type bank receipt name where transaction is reported (Format YYYYMM or YYYYMMDD) ErrorPleaseTypeBankTransactionReportName=Please type bank receipt name where transaction is reported (Format YYYYMM or YYYYMMDD)
ErrorRecordHasChildren=Failed to delete records since it has some childs. ErrorRecordHasChildren=Failed to delete records since it has some childs.

1
htdocs/langs/en_US/main.lang
View File

@ -404,6 +404,7 @@ AccountancyPreview=Accountancy preview
ShowCustomerPreview=Show customer preview ShowCustomerPreview=Show customer preview
ShowSupplierPreview=Show supplier preview ShowSupplierPreview=Show supplier preview
ShowAccountancyPreview=Show accountancy preview ShowAccountancyPreview=Show accountancy preview
ShowProspectPreview=Show prospect preview
RefCustomer=Ref. customer RefCustomer=Ref. customer
Currency=Currency Currency=Currency
InfoAdmin=Information for administrators InfoAdmin=Information for administrators

1
htdocs/langs/fr_FR/main.lang
View File

@ -404,6 +404,7 @@ SupplierPreview=Aperçu fournisseur
AccountancyPreview=Aperçu compta AccountancyPreview=Aperçu compta
ShowCustomerPreview=Afficher aperçu client ShowCustomerPreview=Afficher aperçu client
ShowSupplierPreview=Afficher aperçu fournisseur ShowSupplierPreview=Afficher aperçu fournisseur
ShowProspectPreview=Afficher aperçu prospect
ShowAccountancyPreview=Afficher aperçu compta ShowAccountancyPreview=Afficher aperçu compta
RefCustomer=Réf. client RefCustomer=Réf. client
Currency=Devise Currency=Devise

5
htdocs/soc.php
View File

@ -1,7 +1,7 @@
<?php <?php
/* Copyright (C) 2001-2007 Rodolphe Quiedeville <rodolphe@quiedeville.org> /* Copyright (C) 2001-2007 Rodolphe Quiedeville <rodolphe@quiedeville.org>
* Copyright (C) 2003 Brian Fraval <brian@fraval.org> * Copyright (C) 2003 Brian Fraval <brian@fraval.org>
* Copyright (C) 2004-2008 Laurent Destailleur <eldy@users.sourceforge.net> * Copyright (C) 2004-2009 Laurent Destailleur <eldy@users.sourceforge.net>
* Copyright (C) 2005 Eric Seigne <eric.seigne@ryxeo.com> * Copyright (C) 2005 Eric Seigne <eric.seigne@ryxeo.com>
* Copyright (C) 2005-2007 Regis Houssin <regis@dolibarr.fr> * Copyright (C) 2005-2007 Regis Houssin <regis@dolibarr.fr>
* Copyright (C) 2008 Patrick Raguin <patrick.raguin@auuguria.net> * Copyright (C) 2008 Patrick Raguin <patrick.raguin@auuguria.net>
@ -255,7 +255,8 @@ if ($_REQUEST["action"] == 'confirm_delete' && $_REQUEST["confirm"] == 'yes' &&
else else
{ {
$reload = 0; $reload = 0;
$mesg=$soc->error; $langs->load("errors");
$mesg=$langs->trans($soc->error);
$_GET["action"]=''; $_GET["action"]='';
} }
} }

62
htdocs/societe.class.php
View File

@ -45,7 +45,7 @@ class Societe extends CommonObject
var $id; var $id;
var $nom; var $nom;
var $nom_particulier; var $nom_particulier;
var $prenom; var $prenom;
var $particulier; var $particulier;
var $adresse; var $adresse;
@ -137,7 +137,7 @@ class Societe extends CommonObject
function create($user='') function create($user='')
{ {
global $langs,$conf; global $langs,$conf;
// clean parameters // clean parameters
$this->nom=trim($this->nom); $this->nom=trim($this->nom);
@ -344,7 +344,7 @@ class Societe extends CommonObject
$this->effectif_id=trim($this->effectif_id); $this->effectif_id=trim($this->effectif_id);
$this->forme_juridique_code=trim($this->forme_juridique_code); $this->forme_juridique_code=trim($this->forme_juridique_code);
//Gencod //Gencod
$this->gencod=trim($this->gencod); $this->gencod=trim($this->gencod);
@ -385,7 +385,7 @@ class Societe extends CommonObject
$sql .= ",tva_intra = '" . addslashes($this->tva_intra) ."'"; $sql .= ",tva_intra = '" . addslashes($this->tva_intra) ."'";
$sql .= ",capital = '" . addslashes($this->capital) ."'"; $sql .= ",capital = '" . addslashes($this->capital) ."'";
$sql .= ",prefix_comm = ".($this->prefix_comm?"'".addslashes($this->prefix_comm)."'":"null"); $sql .= ",prefix_comm = ".($this->prefix_comm?"'".addslashes($this->prefix_comm)."'":"null");
$sql .= ",fk_effectif = ".($this->effectif_id?"'".$this->effectif_id."'":"null"); $sql .= ",fk_effectif = ".($this->effectif_id?"'".$this->effectif_id."'":"null");
@ -397,7 +397,7 @@ class Societe extends CommonObject
$sql .= ",client = " . $this->client; $sql .= ",client = " . $this->client;
$sql .= ",fournisseur = " . $this->fournisseur; $sql .= ",fournisseur = " . $this->fournisseur;
$sql .= ",gencod = ".($this->gencod?"'".$this->gencod."'":"null"); $sql .= ",gencod = ".($this->gencod?"'".$this->gencod."'":"null");
if ($allowmodcodeclient) if ($allowmodcodeclient)
{ {
@ -427,7 +427,7 @@ class Societe extends CommonObject
$sql .= ", fk_user_modif = ".($user->id > 0 ? "'".$user->id."'":"null"); $sql .= ", fk_user_modif = ".($user->id > 0 ? "'".$user->id."'":"null");
$sql .= " WHERE rowid = '" . $id ."'"; $sql .= " WHERE rowid = '" . $id ."'";
dolibarr_syslog("Societe::update sql=".$sql); dolibarr_syslog("Societe::update sql=".$sql);
$resql=$this->db->query($sql); $resql=$this->db->query($sql);
if ($resql) if ($resql)
@ -694,9 +694,27 @@ class Societe extends CommonObject
dolibarr_syslog("Societe::Delete"); dolibarr_syslog("Societe::Delete");
$sqr = 0; $sqr = 0;
// \Todo
// Check if third party can be deleted // Check if third party can be deleted
$nbpropal=0;
$sql = "SELECT COUNT(*) as nb from ".MAIN_DB_PREFIX."propal";
$sql.= " WHERE fk_soc = " . $id;
$resql=$this->db->query($sql);
if ($resql)
{
$obj=$this->db->fetch_object($resql);
$nbpropal=$obj->nb;
if ($nbpropal > 0)
{
$this->error="ErrorRecordHasChildren";
return -1;
}
}
else
{
$this->error .= $this->db->lasterror();
dolibarr_syslog("Societe::Delete erreur -1 ".$this->error);
return -1;
}
@ -705,20 +723,20 @@ class Societe extends CommonObject
// Added by Matelli (see http://matelli.fr/showcases/patchs-dolibarr/fix-third-party-deleting.html) // Added by Matelli (see http://matelli.fr/showcases/patchs-dolibarr/fix-third-party-deleting.html)
// Removing every "categorie" link with this company // Removing every "categorie" link with this company
require_once(DOL_DOCUMENT_ROOT."/categories/categorie.class.php"); require_once(DOL_DOCUMENT_ROOT."/categories/categorie.class.php");
$static_cat = new Categorie($this->db); $static_cat = new Categorie($this->db);
$toute_categs = array(); $toute_categs = array();
// Fill $toute_categs array with an array of (type => array of ("Categorie" instance)) // Fill $toute_categs array with an array of (type => array of ("Categorie" instance))
if ($this->client || $this->prospect) if ($this->client || $this->prospect)
{ {
$toute_categs ['societe'] = $static_cat->containing($this->id,'societe',2); $toute_categs ['societe'] = $static_cat->containing($this->id,'societe',2);
} }
if ($this->fournisseur) if ($this->fournisseur)
{ {
$toute_categs ['fournisseur'] = $static_cat->containing($this->id,'fournisseur',1); $toute_categs ['fournisseur'] = $static_cat->containing($this->id,'fournisseur',1);
} }
// Remove each "Categorie" // Remove each "Categorie"
foreach ($toute_categs as $type => $categs_type) foreach ($toute_categs as $type => $categs_type)
{ {
@ -727,7 +745,7 @@ class Societe extends CommonObject
$cat->del_type($this, $type); $cat->del_type($this, $type);
} }
} }
// Remove contacts // Remove contacts
$sql = "DELETE from ".MAIN_DB_PREFIX."socpeople"; $sql = "DELETE from ".MAIN_DB_PREFIX."socpeople";
$sql.= " WHERE fk_soc = " . $id; $sql.= " WHERE fk_soc = " . $id;
@ -956,7 +974,7 @@ class Societe extends CommonObject
if ($this->id) if ($this->id)
{ {
$this->db->begin(); $this->db->begin();
// Positionne remise courante // Positionne remise courante
$sql = "UPDATE ".MAIN_DB_PREFIX."societe "; $sql = "UPDATE ".MAIN_DB_PREFIX."societe ";
$sql.= " SET remise_client = '".$remise."'"; $sql.= " SET remise_client = '".$remise."'";
@ -1052,7 +1070,7 @@ class Societe extends CommonObject
if ($this->id) if ($this->id)
{ {
require_once(DOL_DOCUMENT_ROOT.'/discount.class.php'); require_once(DOL_DOCUMENT_ROOT.'/discount.class.php');
$discount = new DiscountAbsolute($this->db); $discount = new DiscountAbsolute($this->db);
$result=$discount->fetch($id); $result=$discount->fetch($id);
$result=$discount->delete(); $result=$discount->delete();
@ -1086,7 +1104,7 @@ class Societe extends CommonObject
} }
} }
/** /**
* Enter description here... * Enter description here...
* *
@ -1198,7 +1216,7 @@ class Societe extends CommonObject
$lien = '<a href="'.DOL_URL_ROOT.'/compta/fiche.php?socid='.$this->id.'">'; $lien = '<a href="'.DOL_URL_ROOT.'/compta/fiche.php?socid='.$this->id.'">';
$lienfin='</a>'; $lienfin='</a>';
} }
if (empty($lien)) if (empty($lien))
{ {
$lien = '<a href="'.DOL_URL_ROOT.'/soc.php?socid='.$this->id.'">'; $lien = '<a href="'.DOL_URL_ROOT.'/soc.php?socid='.$this->id.'">';
@ -1411,7 +1429,7 @@ class Societe extends CommonObject
require_once DOL_DOCUMENT_ROOT.'/includes/modules/societe/'.$conf->global->SOCIETE_CODECLIENT_ADDON.'.php'; require_once DOL_DOCUMENT_ROOT.'/includes/modules/societe/'.$conf->global->SOCIETE_CODECLIENT_ADDON.'.php';
$var = $conf->global->SOCIETE_CODECLIENT_ADDON; $var = $conf->global->SOCIETE_CODECLIENT_ADDON;
$mod = new $var; $mod = new $var;
$this->code_client = $mod->getNextValue($objsoc,$type); $this->code_client = $mod->getNextValue($objsoc,$type);
$this->prefixCustomerIsRequired = $mod->prefixIsRequired; $this->prefixCustomerIsRequired = $mod->prefixIsRequired;
@ -1431,10 +1449,10 @@ class Societe extends CommonObject
require_once DOL_DOCUMENT_ROOT.'/includes/modules/societe/'.$conf->global->SOCIETE_CODEFOURNISSEUR_ADDON.'.php'; require_once DOL_DOCUMENT_ROOT.'/includes/modules/societe/'.$conf->global->SOCIETE_CODEFOURNISSEUR_ADDON.'.php';
$var = $conf->global->SOCIETE_CODEFOURNISSEUR_ADDON; $var = $conf->global->SOCIETE_CODEFOURNISSEUR_ADDON;
$mod = new $var; $mod = new $var;
$this->code_fournisseur = $mod->getNextValue($objsoc,$type); $this->code_fournisseur = $mod->getNextValue($objsoc,$type);
$this->prefixSupplierIsRequired = $mod->prefixIsRequired; $this->prefixSupplierIsRequired = $mod->prefixIsRequired;
dolibarr_syslog("Societe::get_codefournisseur code_fournisseur=".$this->code_fournisseur." module=".$var); dolibarr_syslog("Societe::get_codefournisseur code_fournisseur=".$this->code_fournisseur." module=".$var);
} }
} }
@ -1567,7 +1585,7 @@ class Societe extends CommonObject
// Defini code compta dans $mod->code // Defini code compta dans $mod->code
$result = $mod->get_code($this->db, $this, $type); $result = $mod->get_code($this->db, $this, $type);
if ($type == 'customer') $this->code_compta = $mod->code; if ($type == 'customer') $this->code_compta = $mod->code;
if ($type == 'supplier') $this->code_compta_fournisseur = $mod->code; if ($type == 'supplier') $this->code_compta_fournisseur = $mod->code;
@ -1819,7 +1837,7 @@ class Societe extends CommonObject
'SI', // Slovenia 'SI', // Slovenia
'ES', // Spain 'ES', // Spain
'SE', // Sweden 'SE', // Sweden
'CH', // Switzerland 'CH', // Switzerland
); );
//print "dd".$this->pays_code; //print "dd".$this->pays_code;
return in_array($this->pays_code,$country_code_in_EEC); return in_array($this->pays_code,$country_code_in_EEC);