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

Look: Modif esthtiques mineures

Browse Source
This commit is contained in:
Laurent Destailleur 2005-08-11 19:04:42 +00:00
parent ffa8294885
commit 4b6622d5ad
2 changed files with 61 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
htdocs/fourn/fournisseur.facture.class.php
View File

@ -143,9 +143,9 @@ class FactureFournisseur
} }
} }
else else
{ {
if ($this->db->errno() == DB_ERROR_RECORD_ALREADY_EXISTS) if ($this->db->errno() == 'DB_ERROR_RECORD_ALREADY_EXISTS')
{ {
$this->error=$langs->trans("ErrorBillRefAlreadyExists"); $this->error=$langs->trans("ErrorBillRefAlreadyExists");
$this->db->rollback(); $this->db->rollback();
return -1; return -1;
@ -482,13 +482,13 @@ class FactureFournisseur
} }
} }
/** /**
* \brief Renvoi le libellé court d'un statut donné * \brief Renvoi le libellé court d'un statut donné
* \param paye etat paye * \param paye etat paye
* \param statut id statut * \param statut id statut
* \param amount amount already payed * \param amount amount already payed
* \return string Libellé court du statut * \return string Libellé court du statut
*/ */
function PayedLibStatut($paye,$statut,$amount=0) function PayedLibStatut($paye,$statut,$amount=0)
{ {
global $langs; global $langs;
@ -505,6 +505,37 @@ class FactureFournisseur
return $langs->trans("BillStatusPayed"); return $langs->trans("BillStatusPayed");
} }
} }
/**
* \brief Charge indicateurs this->nbtodo et this->nbtodolate de tableau de bord
* \return int <0 si ko, >0 si ok
*/
function load_board()
{
global $conf;
$this->nbtodo=$this->nbtodolate=0;
$sql = "SELECT ff.rowid,".$this->db->pdate("ff.date_lim_reglement")." as datefin";
$sql.= " FROM ".MAIN_DB_PREFIX."facture_fourn as ff";
$sql.= " WHERE ff.paye=0";
$resql=$this->db->query($sql);
if ($resql)
{
while ($obj=$this->db->fetch_object($resql))
{
$this->nbtodo++;
if ($obj->datefin < (time() - $conf->facture->fournisseur->warning_delay)) $this->nbtodolate++;
}
return 1;
}
else
{
dolibarr_print_error($this->db);
$this->error=$this->db->error();
return -1;
}
}
} }
?> ?>

36
htdocs/fourn/index.php
View File

@ -22,10 +22,10 @@
*/ */
/** /**
\file htdocs/fourn/index.php \file htdocs/fourn/index.php
\ingroup fournisseur \ingroup fournisseur
\brief Page accueil de la zone fournisseurs \brief Page accueil de la zone fournisseurs
\version $Revision$ \version $Revision$
*/ */
require("./pre.inc.php"); require("./pre.inc.php");
@ -34,9 +34,12 @@ if (!$user->rights->societe->lire)
accessforbidden(); accessforbidden();
$page = $_GET["page"]; $page = isset($_GET["page"])?$_GET["page"]:'';
$sortorder = $_GET["sortorder"]; $sortorder = isset($_GET["sortorder"])?$_GET["sortorder"]:'';
$sortfield = $_GET["sortfield"]; $sortfield = isset($_GET["sortfield"])?$_GET["sortfield"]:'';
$socname = isset($_GET["socname"])?$_GET["socname"]:'';
$search_nom = isset($_GET["search_nom"])?$_GET["search_nom"]:'';
$search_ville = isset($_GET["search_ville"])?$_GET["search_ville"]:'';
$langs->load("suppliers"); $langs->load("suppliers");
$langs->load("orders"); $langs->load("orders");
@ -44,9 +47,8 @@ $langs->load("companies");
llxHeader(); llxHeader();
/* // Sécurité accés client
* Sécurité accés client $socidp='';
*/
if ($user->societe_id > 0) if ($user->societe_id > 0)
{ {
$action = ''; $action = '';
@ -74,13 +76,13 @@ if ($socname) {
$sortfield = "lower(s.nom)"; $sortfield = "lower(s.nom)";
$sortorder = "ASC"; $sortorder = "ASC";
} }
if (strlen($_GET["search_nom"])) if ($search_nom)
{ {
$sql .= " AND s.nom LIKE '%".$_GET["search_nom"]."%'"; $sql .= " AND s.nom LIKE '%".$search_nom."%'";
} }
if (strlen($_GET["search_ville"])) if ($search_ville)
{ {
$sql .= " AND s.ville LIKE '%".$_GET["search_ville"]."%'"; $sql .= " AND s.ville LIKE '%".$search_ville."%'";
} }
$sql .= " ORDER BY $sortfield $sortorder " . $db->plimit($conf->liste_limit+1, $offset); $sql .= " ORDER BY $sortfield $sortorder " . $db->plimit($conf->liste_limit+1, $offset);
@ -102,8 +104,8 @@ if ($resql)
print '<tr class="liste_titre">'; print '<tr class="liste_titre">';
print '<form action="index.php" method="GET">'; print '<form action="index.php" method="GET">';
print '<td class="liste_titre"><input type="text" class="flat" name="search_nom" value="'.$_GET["search_nom"].'"></td>'; print '<td class="liste_titre"><input type="text" class="flat" name="search_nom" value="'.$search_nom.'"></td>';
print '<td class="liste_titre"><input type="text" class="flat" name="search_ville" value="'.$_GET["search_ville"].'"></td>'; print '<td class="liste_titre"><input type="text" class="flat" name="search_ville" value="'.$search_ville.'"></td>';
print '<td class="liste_titre" colspan="2" align="right"><input class="liste_titre" type="image" src="'.DOL_URL_ROOT.'/theme/'.$conf->theme.'/img/search.png" alt="'.$langs->trans("Search").'"></td>'; print '<td class="liste_titre" colspan="2" align="right"><input class="liste_titre" type="image" src="'.DOL_URL_ROOT.'/theme/'.$conf->theme.'/img/search.png" alt="'.$langs->trans("Search").'"></td>';
print '</form>'; print '</form>';
print '</tr>'; print '</tr>';
@ -134,5 +136,5 @@ else
$db->close(); $db->close();
llxFooter("<em>Derni&egrave;re modification $Date$ r&eacute;vision $Revision$</em>"); llxFooter('$Date$ - $Revision$');
?> ?>