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

Removed deprecated code

Browse Source
This commit is contained in:
Laurent Destailleur 2010-02-27 20:30:55 +00:00
parent ffd1e04f55
commit 60c262c9c5
4 changed files with 106 additions and 201 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

144
htdocs/fourn/commande/liste.php
View File

@ -1,6 +1,6 @@
<?PHP
/* Copyright (C) 2001-2006 Rodolphe Quiedeville <rodolphe@quiedeville.org>
* Copyright (C) 2004-2008 Laurent Destailleur <eldy@users.sourceforge.net>
* Copyright (C) 2004-2010 Laurent Destailleur <eldy@users.sourceforge.net>
* Copyright (C) 2005-2009 Regis Houssin <regis@dolibarr.fr>
*
* This program is free software; you can redistribute it and/or modify
@ -21,7 +21,7 @@
/**
* \file htdocs/fourn/commande/liste.php
* \ingroup fournisseur
* \brief Liste des commandes fournisseurs
* \brief List of suppliers orders
* \version $Id$
*/
@ -47,15 +47,15 @@ $result = restrictedArea($user, 'commande_fournisseur', $orderid,'');
/*
* View
*/
* View
*/
$title = $langs->trans("SuppliersOrders");
if ($socid > 0)
{
$fourn = new Fournisseur($db);
$fourn->fetch($socid);
$title .= ' (<a href="liste.php">'.$fourn->nom.'</a>)';
$fourn = new Fournisseur($db);
$fourn->fetch($socid);
$title .= ' ('.$fourn->nom.')';
}
llxHeader('',$title);
@ -97,7 +97,7 @@ if ($suser)
}
if ($sttc)
{
$sql .= " AND total_ttc = ".price2num($sttc);
$sql .= " AND total_ttc = ".price2num($sttc);
}
if ($sall)
{
@ -107,7 +107,7 @@ if ($socid) $sql.= " AND s.rowid = ".$socid;
if (strlen($_GET["statut"]))
{
$sql .= " AND fk_statut =".$_GET["statut"];
$sql .= " AND fk_statut =".$_GET["statut"];
}
$sql .= " ORDER BY $sortfield $sortorder " . $db->plimit($conf->liste_limit+1, $offset);
@ -116,88 +116,88 @@ $resql = $db->query($sql);
if ($resql)
{
$num = $db->num_rows($resql);
$i = 0;
$num = $db->num_rows($resql);
$i = 0;
print_barre_liste($title, $page, "liste.php", "", $sortfield, $sortorder, '', $num);
print '<form action="liste.php" method="GET">';
print '<table class="liste">';
print '<tr class="liste_titre">';
print_liste_field_titre($langs->trans("Ref"),$_SERVER["PHP_SELF"],"cf.ref","","",'',$sortfield,$sortorder);
print_liste_field_titre($langs->trans("Company"),$_SERVER["PHP_SELF"],"s.nom","","",'',$sortfield,$sortorder);
print_liste_field_titre($langs->trans("Author"),$_SERVER["PHP_SELF"],"u.login","","",'',$sortfield,$sortorder);
print_liste_field_titre($langs->trans("AmountTTC"),$_SERVER["PHP_SELF"],"total_ttc","","",'',$sortfield,$sortorder);
print_liste_field_titre($langs->trans("OrderDate"),$_SERVER["PHP_SELF"],"dc","","",'align="center"',$sortfield,$sortorder);
print_liste_field_titre($langs->trans("Status"),$_SERVER["PHP_SELF"],"cf.fk_statut","","",'align="right"',$sortfield,$sortorder);
print "</tr>\n";
print_barre_liste($title, $page, "liste.php", "", $sortfield, $sortorder, '', $num);
print '<form action="liste.php" method="GET">';
print '<table class="liste">';
print '<tr class="liste_titre">';
print_liste_field_titre($langs->trans("Ref"),$_SERVER["PHP_SELF"],"cf.ref","","",'',$sortfield,$sortorder);
print_liste_field_titre($langs->trans("Company"),$_SERVER["PHP_SELF"],"s.nom","","",'',$sortfield,$sortorder);
print_liste_field_titre($langs->trans("Author"),$_SERVER["PHP_SELF"],"u.login","","",'',$sortfield,$sortorder);
print_liste_field_titre($langs->trans("AmountTTC"),$_SERVER["PHP_SELF"],"total_ttc","","",'',$sortfield,$sortorder);
print_liste_field_titre($langs->trans("OrderDate"),$_SERVER["PHP_SELF"],"dc","","",'align="center"',$sortfield,$sortorder);
print_liste_field_titre($langs->trans("Status"),$_SERVER["PHP_SELF"],"cf.fk_statut","","",'align="right"',$sortfield,$sortorder);
print "</tr>\n";
print '<tr class="liste_titre">';
print '<tr class="liste_titre">';
print '<td class="liste_titre"><input type="text" class="flat" name="search_ref" value="'.$sref.'"></td>';
print '<td class="liste_titre"><input type="text" class="flat" name="search_nom" value="'.$snom.'"></td>';
print '<td class="liste_titre"><input type="text" class="flat" name="search_user" value="'.$suser.'"></td>';
print '<td class="liste_titre"><input type="text" class="flat" name="search_ttc" value="'.$sttc.'"></td>';
print '<td colspan="2" class="liste_titre" align="right">';
print '<input type="image" class="liste_titre" name="button_search" src="'.DOL_URL_ROOT.'/theme/'.$conf->theme.'/img/search.png" alt="'.$langs->trans("Search").'">';
print '</td>';
print '</tr>';
print '<td class="liste_titre"><input type="text" class="flat" name="search_ref" value="'.$sref.'"></td>';
print '<td class="liste_titre"><input type="text" class="flat" name="search_nom" value="'.$snom.'"></td>';
print '<td class="liste_titre"><input type="text" class="flat" name="search_user" value="'.$suser.'"></td>';
print '<td class="liste_titre"><input type="text" class="flat" name="search_ttc" value="'.$sttc.'"></td>';
print '<td colspan="2" class="liste_titre" align="right">';
print '<input type="image" class="liste_titre" name="button_search" src="'.DOL_URL_ROOT.'/theme/'.$conf->theme.'/img/search.png" alt="'.$langs->trans("Search").'">';
print '</td>';
print '</tr>';
$var=true;
$var=true;
$userstatic = new User($db);
$userstatic = new User($db);
while ($i < min($num,$conf->liste_limit))
{
$obj = $db->fetch_object($resql);
$var=!$var;
while ($i < min($num,$conf->liste_limit))
{
$obj = $db->fetch_object($resql);
$var=!$var;
print "<tr $bc[$var]>";
print "<tr $bc[$var]>";
// Ref
print '<td><a href="'.DOL_URL_ROOT.'/fourn/commande/fiche.php?id='.$obj->rowid.'">'.img_object($langs->trans("ShowOrder"),"order").' '.$obj->ref.'</a></td>'."\n";
// Ref
print '<td><a href="'.DOL_URL_ROOT.'/fourn/commande/fiche.php?id='.$obj->rowid.'">'.img_object($langs->trans("ShowOrder"),"order").' '.$obj->ref.'</a></td>'."\n";
// Company
print '<td><a href="'.DOL_URL_ROOT.'/fourn/fiche.php?socid='.$obj->socid.'">'.img_object($langs->trans("ShowCompany"),"company").' ';
print $obj->nom.'</a></td>'."\n";
// Company
print '<td><a href="'.DOL_URL_ROOT.'/fourn/fiche.php?socid='.$obj->socid.'">'.img_object($langs->trans("ShowCompany"),"company").' ';
print $obj->nom.'</a></td>'."\n";
// Author
$userstatic->id=$obj->fk_user_author;
$userstatic->login=$obj->login;
print "<td>";
if ($userstatic->id) print $userstatic->getLoginUrl(1);
else print "&nbsp;";
print "</td>";
// Author
$userstatic->id=$obj->fk_user_author;
$userstatic->login=$obj->login;
print "<td>";
if ($userstatic->id) print $userstatic->getLoginUrl(1);
else print "&nbsp;";
print "</td>";
// Amount
print '<td align="right" width="100">'.price($obj->total_ttc)."</td>";
// Amount
print '<td align="right" width="100">'.price($obj->total_ttc)."</td>";
// Date
print "<td align=\"center\" width=\"100\">";
if ($obj->dc)
{
print dol_print_date($obj->dc,"day");
}
else
{
print "-";
}
print '</td>';
// Date
print "<td align=\"center\" width=\"100\">";
if ($obj->dc)
{
print dol_print_date($obj->dc,"day");
}
else
{
print "-";
}
print '</td>';
// Statut
print '<td align="right">'.$commandestatic->LibStatut($obj->fk_statut, 5).'</td>';
// Statut
print '<td align="right">'.$commandestatic->LibStatut($obj->fk_statut, 5).'</td>';
print "</tr>\n";
$i++;
}
print "</table>\n";
print "</form>\n";
print "</tr>\n";
$i++;
}
print "</table>\n";
print "</form>\n";
$db->free($resql);
$db->free($resql);
}
else
{
dol_print_error($db);
dol_print_error($db);
}
$db->close();

119
htdocs/fourn/fiche-stats.php
View File

@ -1,119 +0,0 @@
<?php
/* Copyright (C) 2001-2006 Rodolphe Quiedeville <rodolphe@quiedeville.org>
* Copyright (C) 2003 Eric Seigne <erics@rycks.com>
* Copyright (C) 2004-2008 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/fiche-stats.php
* \ingroup fournisseur, facture
* \brief Page de fiche fournisseur
* \version $Id$
*/
require('./pre.inc.php');
require_once(DOL_DOCUMENT_ROOT."/contact.class.php");
require_once(DOL_DOCUMENT_ROOT."/lib/company.lib.php");
$langs->load('suppliers');
$langs->load('products');
$langs->load('bills');
$langs->load('orders');
$langs->load('companies');
$langs->load('commercial');
// Security check
$socid = isset($_GET["socid"])?$_GET["socid"]:'';
if ($user->societe_id) $socid=$user->societe_id;
$result = restrictedArea($user, 'societe',$socid,'');
/*
* Actions
*/
/*
* View
*/
$societe = new Fournisseur($db);
if ( $societe->fetch($socid) )
{
llxHeader('',$langs->trans('SupplierCard'));
/*
* Affichage onglets
*/
$head = societe_prepare_head($societe);
dol_fiche_head($head, 'supplierstat', $langs->trans("ThirdParty"),0,'company');
print '<table class="border" width="100%">';
print '<tr><td width="20%">'.$langs->trans("Name").'</td><td width="80%" colspan="3">'.$societe->nom.'</td></tr>';
print '<tr><td>'.$langs->trans('Prefix').'</td><td colspan="3">'.$societe->prefix_comm.'</td></tr>';
print '<tr><td nowrap="nowrap">';
print $langs->trans('SupplierCode').'</td><td colspan="3">';
print $societe->code_fournisseur;
if ($societe->check_codefournisseur() <> 0) print ' '.$langs->trans("WrongSupplierCode");
print '</td></tr>';
print "</table><br />";
print '<table class="border" width="100%">';
print '<tr><td valign="top" width="50%">';
$file = get_exdir($societe->id, 3) . "ca_genere-".$societe->id.".png";
if (file_exists($conf->fournisseur->dir_temp.'/'.$file))
{
$url=DOL_URL_ROOT.'/viewimage.php?modulepart=graph_fourn&amp;file='.$file;
print '<img src="'.$url.'" alt="CA genere">';
}
else
{
print $langs->trans("NoneOrBatchFileNeverRan",'batch_fournisseur_updateturnover.php, batch_fournisseur_buildgraph.php');
}
print '</td><td valign="top" width="50%">';
$file = get_exdir($societe->id, 3) . "ca_achat-".$societe->id.".png";
if (file_exists($conf->fournisseur->dir_temp.'/'.$file))
{
$url=DOL_URL_ROOT.'/viewimage.php?modulepart=graph_fourn&amp;file='.$file;
print '<img src="'.$url.'" alt="CA">';
}
else
{
print $langs->trans("NoneOrBatchFileNeverRan",'batch_fournisseur_updateturnover.php, batch_fournisseur_buildgraph.php');
}
print '</td></tr>';
print '</table>' . "\n";
print '</div>';
}
else
{
dol_print_error($db);
}
$db->close();
llxFooter('$Date$ - $Revision$');
?>

36
htdocs/fourn/fiche.php
View File

@ -265,9 +265,7 @@ if ( $societe->fetch($socid) )
/*
*
* Barre d'actions
*
*/
print '<div class="tabsAction">';
@ -314,6 +312,40 @@ if ( $societe->fetch($socid) )
*/
show_actions_done($conf,$langs,$db,$societe);
}
// deprecated
/*
print '<table class="border" width="100%">';
print '<tr><td valign="top" width="50%">';
$file = get_exdir($societe->id, 3) . "ca_genere-".$societe->id.".png";
if (file_exists($conf->fournisseur->dir_temp.'/'.$file))
{
$url=DOL_URL_ROOT.'/viewimage.php?modulepart=graph_fourn&amp;file='.$file;
print '<img src="'.$url.'" alt="CA genere">';
}
else
{
print $langs->trans("NoneOrBatchFileNeverRan",'batch_fournisseur_updateturnover.php, batch_fournisseur_buildgraph.php');
}
print '</td><td valign="top" width="50%">';
$file = get_exdir($societe->id, 3) . "ca_achat-".$societe->id.".png";
if (file_exists($conf->fournisseur->dir_temp.'/'.$file))
{
$url=DOL_URL_ROOT.'/viewimage.php?modulepart=graph_fourn&amp;file='.$file;
print '<img src="'.$url.'" alt="CA">';
}
else
{
print $langs->trans("NoneOrBatchFileNeverRan",'batch_fournisseur_updateturnover.php, batch_fournisseur_buildgraph.php');
}
print '</td></tr>';
print '</table>' . "\n";
*/
}
else
{

8
htdocs/lib/company.lib.php
View File

@ -111,14 +111,6 @@ function societe_prepare_head($objsoc)
$h++;
}
if ($objsoc->fournisseur)
{
$head[$h][0] = DOL_URL_ROOT.'/fourn/fiche-stats.php?socid='.$objsoc->id;
$head[$h][1] = $langs->trans("Statistics");
$head[$h][2] = 'supplierstat';
$h++;
}
if ($user->societe_id == 0)
{
$head[$h][0] = DOL_URL_ROOT.'/societe/info.php?socid='.$objsoc->id;