Fix: Mise au format unix de fichier php

This commit is contained in:
Laurent Destailleur 2005-09-04 19:10:18 +00:00
parent e02f80ea23
commit 3a74b33a8a
3 changed files with 1449 additions and 1449 deletions

View File

@ -1,481 +1,481 @@
<?php <?php
/* Copyright (C) 2001-2005 Rodolphe Quiedeville <rodolphe@quiedeville.org> /* Copyright (C) 2001-2005 Rodolphe Quiedeville <rodolphe@quiedeville.org>
* Copyright (C) 2004-2005 Laurent Destailleur <eldy@users.sourceforge.net> * Copyright (C) 2004-2005 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
* the Free Software Foundation; either version 2 of the License, or * the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version. * (at your option) any later version.
* *
* This program is distributed in the hope that it will be useful, * This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of * but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details. * GNU General Public License for more details.
* *
* 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$ * $Id$
* $Source$ * $Source$
*/ */
/** /**
\file htdocs/compta/index.php \file htdocs/compta/index.php
\ingroup compta \ingroup compta
\brief Page accueil zone comptabilité \brief Page accueil zone comptabilité
\version $Revision$ \version $Revision$
*/ */
require("./pre.inc.php"); require("./pre.inc.php");
$user->getrights(); // On a besoin des permissions sur plusieurs modules $user->getrights(); // On a besoin des permissions sur plusieurs modules
$langs->load("compta"); $langs->load("compta");
$langs->load("bills"); $langs->load("bills");
// Sécurité accés client // Sécurité accés client
$socidp=''; $socidp='';
if ($user->societe_id > 0) if ($user->societe_id > 0)
{ {
$action = ''; $action = '';
$socidp = $user->societe_id; $socidp = $user->societe_id;
} }
llxHeader("",$langs->trans("AccountancyTreasuryArea")); llxHeader("",$langs->trans("AccountancyTreasuryArea"));
/* /*
* Actions * Actions
*/ */
if (isset($_GET["action"]) && $_GET["action"] == 'add_bookmark') if (isset($_GET["action"]) && $_GET["action"] == 'add_bookmark')
{ {
$sql = "DELETE FROM ".MAIN_DB_PREFIX."bookmark WHERE fk_soc = ".$socidp." AND fk_user=".$user->id; $sql = "DELETE FROM ".MAIN_DB_PREFIX."bookmark WHERE fk_soc = ".$socidp." AND fk_user=".$user->id;
if (! $db->query($sql) ) if (! $db->query($sql) )
{ {
dolibarr_print_error($db); dolibarr_print_error($db);
} }
$sql = "INSERT INTO ".MAIN_DB_PREFIX."bookmark (fk_soc, dateb, fk_user) VALUES ($socidp, now(),".$user->id.");"; $sql = "INSERT INTO ".MAIN_DB_PREFIX."bookmark (fk_soc, dateb, fk_user) VALUES ($socidp, now(),".$user->id.");";
if (! $db->query($sql) ) if (! $db->query($sql) )
{ {
dolibarr_print_error($db); dolibarr_print_error($db);
} }
} }
if (isset($_GET["action"]) && $_GET["action"] == 'del_bookmark') if (isset($_GET["action"]) && $_GET["action"] == 'del_bookmark')
{ {
$sql = "DELETE FROM ".MAIN_DB_PREFIX."bookmark WHERE rowid=".$_GET["bid"]; $sql = "DELETE FROM ".MAIN_DB_PREFIX."bookmark WHERE rowid=".$_GET["bid"];
$result = $db->query($sql); $result = $db->query($sql);
} }
/* /*
* Affichage page * Affichage page
* *
*/ */
print_fiche_titre($langs->trans("AccountancyTreasuryArea")); print_fiche_titre($langs->trans("AccountancyTreasuryArea"));
print '<table border="0" width="100%" class="notopnoleftnoright">'; print '<table border="0" width="100%" class="notopnoleftnoright">';
print '<tr><td valign="top" width="30%" class="notopnoleft">'; print '<tr><td valign="top" width="30%" class="notopnoleft">';
/* /*
* Zone recherche facture * Zone recherche facture
*/ */
if ($conf->facture->enabled) { if ($conf->facture->enabled) {
print '<form method="post" action="facture.php">'; print '<form method="post" action="facture.php">';
print '<table class="noborder" width="100%">'; print '<table class="noborder" width="100%">';
print "<tr class=\"liste_titre\">"; print "<tr class=\"liste_titre\">";
print '<td colspan="3">'.$langs->trans("SearchABill").'</td></tr>'; print '<td colspan="3">'.$langs->trans("SearchABill").'</td></tr>';
print "<tr $bc[0]><td>".$langs->trans("Ref").':</td><td><input type="text" name="sf_ref" class="flat" size="18"></td>'; print "<tr $bc[0]><td>".$langs->trans("Ref").':</td><td><input type="text" name="sf_ref" class="flat" size="18"></td>';
print '<td rowspan="2"><input type="submit" value="'.$langs->trans("Search").'" class="button"></td></tr>'; print '<td rowspan="2"><input type="submit" value="'.$langs->trans("Search").'" class="button"></td></tr>';
print "<tr $bc[0]><td>".$langs->trans("Other").':</td><td><input type="text" name="sall" class="flat" size="18"></td>'; print "<tr $bc[0]><td>".$langs->trans("Other").':</td><td><input type="text" name="sall" class="flat" size="18"></td>';
print '</tr>'; print '</tr>';
print "</table></form><br>"; print "</table></form><br>";
} }
/** /**
* Factures brouillons * Factures brouillons
*/ */
if ($conf->facture->enabled && $user->rights->facture->lire) if ($conf->facture->enabled && $user->rights->facture->lire)
{ {
$sql = "SELECT f.facnumber, f.rowid, f.total_ttc, s.nom, s.idp"; $sql = "SELECT f.facnumber, f.rowid, f.total_ttc, s.nom, s.idp";
$sql .= " FROM ".MAIN_DB_PREFIX."facture as f, ".MAIN_DB_PREFIX."societe as s"; $sql .= " FROM ".MAIN_DB_PREFIX."facture as f, ".MAIN_DB_PREFIX."societe as s";
$sql .= " WHERE s.idp = f.fk_soc AND f.fk_statut = 0"; $sql .= " WHERE s.idp = f.fk_soc AND f.fk_statut = 0";
if ($socidp) if ($socidp)
{ {
$sql .= " AND f.fk_soc = $socidp"; $sql .= " AND f.fk_soc = $socidp";
} }
$resql = $db->query($sql); $resql = $db->query($sql);
if ( $resql ) if ( $resql )
{ {
$num = $db->num_rows($resql); $num = $db->num_rows($resql);
if ($num) if ($num)
{ {
print '<table class="noborder" width="100%">'; print '<table class="noborder" width="100%">';
print '<tr class="liste_titre">'; print '<tr class="liste_titre">';
print '<td colspan="3">'.$langs->trans("DraftBills").' ('.$num.')</td></tr>'; print '<td colspan="3">'.$langs->trans("DraftBills").' ('.$num.')</td></tr>';
$i = 0; $i = 0;
$tot_ttc = 0; $tot_ttc = 0;
$var = True; $var = True;
while ($i < $num && $i < 20) while ($i < $num && $i < 20)
{ {
$obj = $db->fetch_object($resql); $obj = $db->fetch_object($resql);
$var=!$var; $var=!$var;
print '<tr '.$bc[$var].'><td nowrap><a href="facture.php?facid='.$obj->rowid.'">'.img_object($langs->trans("ShowBill"),"bill").' '.$obj->facnumber.'</a></td>'; print '<tr '.$bc[$var].'><td nowrap><a href="facture.php?facid='.$obj->rowid.'">'.img_object($langs->trans("ShowBill"),"bill").' '.$obj->facnumber.'</a></td>';
print '<td><a href="fiche.php?socid='.$obj->idp.'">'.img_object($langs->trans("ShowCompany"),"company").' '.dolibarr_trunc($obj->nom,20).'</a></td>'; print '<td><a href="fiche.php?socid='.$obj->idp.'">'.img_object($langs->trans("ShowCompany"),"company").' '.dolibarr_trunc($obj->nom,20).'</a></td>';
print '<td align="right">'.price($obj->total_ttc).'</td>'; print '<td align="right">'.price($obj->total_ttc).'</td>';
print '</tr>'; print '</tr>';
$tot_ttc+=$obj->total_ttc; $tot_ttc+=$obj->total_ttc;
$i++; $i++;
} }
print '<tr class="liste_total"><td colspan="2" align="left">'.$langs->trans("Total").'</td>'; print '<tr class="liste_total"><td colspan="2" align="left">'.$langs->trans("Total").'</td>';
print '<td align="right">'.price($tot_ttc).'</td>'; print '<td align="right">'.price($tot_ttc).'</td>';
print '</tr>'; print '</tr>';
print "</table><br>"; print "</table><br>";
} }
$db->free($resql); $db->free($resql);
} }
else else
{ {
dolibarr_print_error($db); dolibarr_print_error($db);
} }
} }
/** /**
* Charges a payer * Charges a payer
*/ */
if ($conf->compta->enabled) if ($conf->compta->enabled)
{ {
if ($user->societe_id == 0) if ($user->societe_id == 0)
{ {
$sql = "SELECT c.rowid, c.amount, cc.libelle"; $sql = "SELECT c.rowid, c.amount, cc.libelle";
$sql .= " FROM ".MAIN_DB_PREFIX."chargesociales as c, ".MAIN_DB_PREFIX."c_chargesociales as cc"; $sql .= " FROM ".MAIN_DB_PREFIX."chargesociales as c, ".MAIN_DB_PREFIX."c_chargesociales as cc";
$sql .= " WHERE c.fk_type = cc.id AND c.paye=0"; $sql .= " WHERE c.fk_type = cc.id AND c.paye=0";
$resql = $db->query($sql); $resql = $db->query($sql);
if ( $resql ) if ( $resql )
{ {
$num = $db->num_rows($resql); $num = $db->num_rows($resql);
if ($num) if ($num)
{ {
print '<table class="noborder" width="100%">'; print '<table class="noborder" width="100%">';
print '<tr class="liste_titre">'; print '<tr class="liste_titre">';
print '<td colspan="2">'.$langs->trans("ContributionsToPay").' ('.$num.')</td></tr>'; print '<td colspan="2">'.$langs->trans("ContributionsToPay").' ('.$num.')</td></tr>';
$i = 0; $i = 0;
$tot_ttc=0; $tot_ttc=0;
$var = True; $var = True;
while ($i < $num) while ($i < $num)
{ {
$obj = $db->fetch_object($resql); $obj = $db->fetch_object($resql);
$var = !$var; $var = !$var;
print "<tr $bc[$var]>"; print "<tr $bc[$var]>";
print '<td><a href="'.DOL_URL_ROOT.'/compta/sociales/charges.php?id='.$obj->rowid.'">'.img_object($langs->trans("ShowBill"),"bill").' '.$obj->libelle.'</td>'; print '<td><a href="'.DOL_URL_ROOT.'/compta/sociales/charges.php?id='.$obj->rowid.'">'.img_object($langs->trans("ShowBill"),"bill").' '.$obj->libelle.'</td>';
print '<td align="right">'.price($obj->amount).'</td>'; print '<td align="right">'.price($obj->amount).'</td>';
print '</tr>'; print '</tr>';
$tot_ttc+=$obj->amount; $tot_ttc+=$obj->amount;
$i++; $i++;
} }
print '<tr class="liste_total"><td align="left">'.$langs->trans("Total").'</td>'; print '<tr class="liste_total"><td align="left">'.$langs->trans("Total").'</td>';
print '<td align="right">'.price($tot_ttc).'</td>'; print '<td align="right">'.price($tot_ttc).'</td>';
print '</tr>'; print '</tr>';
print '</table><br>'; print '</table><br>';
} }
$db->free($resql); $db->free($resql);
} }
else else
{ {
dolibarr_print_error($db); dolibarr_print_error($db);
} }
} }
} }
/** /**
* Bookmark * Bookmark
*/ */
$sql = "SELECT s.idp, s.nom,b.rowid as bid"; $sql = "SELECT s.idp, s.nom,b.rowid as bid";
$sql .= " FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."bookmark as b"; $sql .= " FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."bookmark as b";
$sql .= " WHERE b.fk_soc = s.idp AND b.fk_user = ".$user->id; $sql .= " WHERE b.fk_soc = s.idp AND b.fk_user = ".$user->id;
$sql .= " ORDER BY lower(s.nom) ASC"; $sql .= " ORDER BY lower(s.nom) ASC";
$resql = $db->query($sql); $resql = $db->query($sql);
if ( $resql ) if ( $resql )
{ {
$num = $db->num_rows($resql); $num = $db->num_rows($resql);
$i = 0; $i = 0;
if ($num) if ($num)
{ {
print '<table class="noborder" width="100%">'; print '<table class="noborder" width="100%">';
print "<tr class=\"liste_titre\"><td colspan=\"2\">".$langs->trans("Bookmarks")."</td></tr>\n"; print "<tr class=\"liste_titre\"><td colspan=\"2\">".$langs->trans("Bookmarks")."</td></tr>\n";
$var = True; $var = True;
while ($i < $num) while ($i < $num)
{ {
$obj = $db->fetch_object($resql); $obj = $db->fetch_object($resql);
$var = !$var; $var = !$var;
print "<tr $bc[$var]>"; print "<tr $bc[$var]>";
print '<td><a href="fiche.php?socid='.$obj->idp.'">'.$obj->nom.'</a></td>'; print '<td><a href="fiche.php?socid='.$obj->idp.'">'.$obj->nom.'</a></td>';
print '<td align="right"><a href="index.php?action=del_bookmark&amp;bid='.$obj->bid.'">'.img_delete().'</a></td>'; print '<td align="right"><a href="index.php?action=del_bookmark&amp;bid='.$obj->bid.'">'.img_delete().'</a></td>';
print '</tr>'; print '</tr>';
$i++; $i++;
} }
print '</table>'; print '</table>';
} }
$db->free($resql); $db->free($resql);
} }
else else
{ {
dolibarr_print_error($db); dolibarr_print_error($db);
} }
print '</td><td valign="top" width="70%" class="notopnoleftnoright">'; print '</td><td valign="top" width="70%" class="notopnoleftnoright">';
/* /*
* Commandes à facturer * Commandes à facturer
*/ */
if ($conf->commande->enabled && $user->rights->commande->lire) if ($conf->commande->enabled && $user->rights->commande->lire)
{ {
$langs->load("orders"); $langs->load("orders");
$sql = "SELECT sum(f.total) as tot_fht, sum(f.total_ttc) as tot_fttc"; $sql = "SELECT sum(f.total) as tot_fht, sum(f.total_ttc) as tot_fttc";
$sql .= " ,s.nom, s.idp, p.rowid, p.ref, p.total_ht, p.total_ttc"; $sql .= " ,s.nom, s.idp, p.rowid, p.ref, p.total_ht, p.total_ttc";
$sql .= " FROM ".MAIN_DB_PREFIX."commande AS p, llx_societe AS s"; $sql .= " FROM ".MAIN_DB_PREFIX."commande AS p, llx_societe AS s";
$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."co_fa AS co_fa ON co_fa.fk_commande = p.rowid"; $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."co_fa AS co_fa ON co_fa.fk_commande = p.rowid";
$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."facture AS f ON co_fa.fk_facture = f.rowid"; $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."facture AS f ON co_fa.fk_facture = f.rowid";
$sql .= " WHERE p.fk_soc = s.idp"; $sql .= " WHERE p.fk_soc = s.idp";
if ($socidp) if ($socidp)
{ {
$sql .= " AND p.fk_soc = $socidp"; $sql .= " AND p.fk_soc = $socidp";
} }
$sql .= " AND p.fk_statut >=1 AND p.facture=0"; $sql .= " AND p.fk_statut >=1 AND p.facture=0";
$sql .= " GROUP BY p.rowid"; $sql .= " GROUP BY p.rowid";
$resql = $db->query($sql); $resql = $db->query($sql);
if ( $resql ) if ( $resql )
{ {
$num = $db->num_rows($resql); $num = $db->num_rows($resql);
if ($num) if ($num)
{ {
$i = 0; $i = 0;
print '<table class="noborder" width="100%">'; print '<table class="noborder" width="100%">';
print "<tr class=\"liste_titre\">"; print "<tr class=\"liste_titre\">";
print '<td colspan="2">'.$langs->trans("OrdersToBill").' ('.$num.')</td>'; print '<td colspan="2">'.$langs->trans("OrdersToBill").' ('.$num.')</td>';
print '<td align="right">'.$langs->trans("AmountHT").'</td>'; print '<td align="right">'.$langs->trans("AmountHT").'</td>';
print '<td align="right">'.$langs->trans("AmountTTC").'</td>'; print '<td align="right">'.$langs->trans("AmountTTC").'</td>';
print '<td align="right">'.$langs->trans("ToBill").'</td>'; print '<td align="right">'.$langs->trans("ToBill").'</td>';
print '</tr>'; print '</tr>';
$var = True; $var = True;
$tot_ht=$tot_ttc=$tot_tobill=0; $tot_ht=$tot_ttc=$tot_tobill=0;
while ($i < $num) while ($i < $num)
{ {
$obj = $db->fetch_object($resql); $obj = $db->fetch_object($resql);
// if ($obj->total_ttc-$obj->tot_fttc >0) // if ($obj->total_ttc-$obj->tot_fttc >0)
// { // {
$var=!$var; $var=!$var;
print "<tr $bc[$var]>"; print "<tr $bc[$var]>";
print "<td width=\"20%\"><a href=\"commande/fiche.php?id=$obj->rowid\">".img_object($langs->trans("ShowOrder"),"order").'</a>&nbsp;'; print "<td width=\"20%\"><a href=\"commande/fiche.php?id=$obj->rowid\">".img_object($langs->trans("ShowOrder"),"order").'</a>&nbsp;';
print "<a href=\"commande/fiche.php?id=$obj->rowid\">".$obj->ref.'</a></td>'; print "<a href=\"commande/fiche.php?id=$obj->rowid\">".$obj->ref.'</a></td>';
print '<td><a href="fiche.php?socid='.$obj->idp.'">'.img_object($langs->trans("ShowCompany"),"company").'</a>&nbsp;'; print '<td><a href="fiche.php?socid='.$obj->idp.'">'.img_object($langs->trans("ShowCompany"),"company").'</a>&nbsp;';
print '<a href="fiche.php?socid='.$obj->idp.'">'.dolibarr_trunc($obj->nom,50).'</a></td>'; print '<a href="fiche.php?socid='.$obj->idp.'">'.dolibarr_trunc($obj->nom,50).'</a></td>';
print '<td align="right">'.price($obj->total_ht).'</td>'; print '<td align="right">'.price($obj->total_ht).'</td>';
print '<td align="right">'.price($obj->total_ttc).'</td>'; print '<td align="right">'.price($obj->total_ttc).'</td>';
print '<td align="right">'.price($obj->total_ttc-$obj->tot_fttc).'</td></tr>'; print '<td align="right">'.price($obj->total_ttc-$obj->tot_fttc).'</td></tr>';
$tot_ht += $obj->total_ht; $tot_ht += $obj->total_ht;
$tot_ttc += $obj->total_ttc; $tot_ttc += $obj->total_ttc;
$tot_tobill += ($obj->total_ttc-$obj->tot_fttc); $tot_tobill += ($obj->total_ttc-$obj->tot_fttc);
// } // }
$i++; $i++;
} }
$var=!$var; $var=!$var;
print '<tr class="liste_total"><td colspan="2" align="right">'.$langs->trans("Total").' &nbsp; <font style="font-weight: normal">('.$langs->trans("RemainderToBill").': '.price($tot_tobill).')</font> </td>'; print '<tr class="liste_total"><td colspan="2" align="right">'.$langs->trans("Total").' &nbsp; <font style="font-weight: normal">('.$langs->trans("RemainderToBill").': '.price($tot_tobill).')</font> </td>';
print '<td align="right">'.price($tot_ht).'</td>'; print '<td align="right">'.price($tot_ht).'</td>';
print '<td align="right">'.price($tot_ttc).'</td>'; print '<td align="right">'.price($tot_ttc).'</td>';
print '<td align="right">'.price($tot_tobill).'</td>'; print '<td align="right">'.price($tot_tobill).'</td>';
print '</tr>'; print '</tr>';
print '</table><br>'; print '</table><br>';
} }
$db->free($resql); $db->free($resql);
} }
else else
{ {
dolibarr_print_error($db); dolibarr_print_error($db);
} }
} }
if ($conf->facture->enabled && $user->rights->facture->lire) if ($conf->facture->enabled && $user->rights->facture->lire)
{ {
/* /*
* Factures impayées * Factures impayées
* *
*/ */
$sql = "SELECT f.facnumber, f.rowid, s.nom, s.idp, f.total, f.total_ttc, ".$db->pdate("f.date_lim_reglement")." as datelimite, sum(pf.amount) as am"; $sql = "SELECT f.facnumber, f.rowid, s.nom, s.idp, f.total, f.total_ttc, ".$db->pdate("f.date_lim_reglement")." as datelimite, sum(pf.amount) as am";
$sql.= " FROM ".MAIN_DB_PREFIX."societe as s,".MAIN_DB_PREFIX."facture as f left join ".MAIN_DB_PREFIX."paiement_facture as pf on f.rowid=pf.fk_facture"; $sql.= " FROM ".MAIN_DB_PREFIX."societe as s,".MAIN_DB_PREFIX."facture as f left join ".MAIN_DB_PREFIX."paiement_facture as pf on f.rowid=pf.fk_facture";
$sql.= " WHERE s.idp = f.fk_soc AND f.paye = 0 AND f.fk_statut = 1"; $sql.= " WHERE s.idp = f.fk_soc AND f.paye = 0 AND f.fk_statut = 1";
if ($socidp) $sql .= " AND f.fk_soc = $socidp"; if ($socidp) $sql .= " AND f.fk_soc = $socidp";
$sql.= " GROUP BY f.facnumber, f.rowid, s.nom, s.idp, f.total, f.total_ttc"; $sql.= " GROUP BY f.facnumber, f.rowid, s.nom, s.idp, f.total, f.total_ttc";
$sql.= " ORDER BY f.datef ASC "; $sql.= " ORDER BY f.datef ASC ";
$resql = $db->query($sql); $resql = $db->query($sql);
if ($resql) if ($resql)
{ {
$num = $db->num_rows($resql); $num = $db->num_rows($resql);
$i = 0; $i = 0;
if ($num) if ($num)
{ {
print '<table class="noborder" width="100%">'; print '<table class="noborder" width="100%">';
print '<tr class="liste_titre"><td colspan="2">'.$langs->trans("BillsCustomersUnpayed").' ('.$num.')</td>'; print '<tr class="liste_titre"><td colspan="2">'.$langs->trans("BillsCustomersUnpayed").' ('.$num.')</td>';
print '<td align="right">'.$langs->trans("AmountHT").'</td><td align="right">'.$langs->trans("AmountTTC").'</td><td align="right">'.$langs->trans("Received").'</td></tr>'; print '<td align="right">'.$langs->trans("AmountHT").'</td><td align="right">'.$langs->trans("AmountTTC").'</td><td align="right">'.$langs->trans("Received").'</td></tr>';
$var = True; $var = True;
$total_ttc = $totalam = $total = 0; $total_ttc = $totalam = $total = 0;
while ($i < $num) while ($i < $num)
{ {
$obj = $db->fetch_object($resql); $obj = $db->fetch_object($resql);
if ($i < $conf->liste_limit) if ($i < $conf->liste_limit)
{ {
$var=!$var; $var=!$var;
print '<tr '.$bc[$var].'>'; print '<tr '.$bc[$var].'>';
print '<td nowrap><a href="facture.php?facid='.$obj->rowid.'">'.img_object($langs->trans("ShowBill"),"bill").' '.$obj->facnumber.'</a>'; print '<td nowrap><a href="facture.php?facid='.$obj->rowid.'">'.img_object($langs->trans("ShowBill"),"bill").' '.$obj->facnumber.'</a>';
if ($obj->datelimite < (time() - $conf->facture->client->warning_delay)) print img_warning($langs->trans("Late")); if ($obj->datelimite < (time() - $conf->facture->client->warning_delay)) print img_warning($langs->trans("Late"));
print '</td>'; print '</td>';
print '<td><a href="fiche.php?socid='.$obj->idp.'">'.img_object($langs->trans("ShowCustomer"),"company").' '.dolibarr_trunc($obj->nom,44).'</a></td>'; print '<td><a href="fiche.php?socid='.$obj->idp.'">'.img_object($langs->trans("ShowCustomer"),"company").' '.dolibarr_trunc($obj->nom,44).'</a></td>';
print '<td align="right">'.price($obj->total).'</td>'; print '<td align="right">'.price($obj->total).'</td>';
print '<td align="right">'.price($obj->total_ttc).'</td>'; print '<td align="right">'.price($obj->total_ttc).'</td>';
print '<td align="right">'.price($obj->am).'</td></tr>'; print '<td align="right">'.price($obj->am).'</td></tr>';
} }
$total_ttc += $obj->total_ttc; $total_ttc += $obj->total_ttc;
$total += $obj->total; $total += $obj->total;
$totalam += $obj->am; $totalam += $obj->am;
$i++; $i++;
} }
$var=!$var; $var=!$var;
print '<tr class="liste_total"><td colspan="2" align="right">'.$langs->trans("Total").' &nbsp; <font style="font-weight: normal">('.$langs->trans("RemainderToTake").': '.price($total_ttc-$totalam).')</font> </td>'; print '<tr class="liste_total"><td colspan="2" align="right">'.$langs->trans("Total").' &nbsp; <font style="font-weight: normal">('.$langs->trans("RemainderToTake").': '.price($total_ttc-$totalam).')</font> </td>';
print '<td align="right">'.price($total).'</td>'; print '<td align="right">'.price($total).'</td>';
print '<td align="right">'.price($total_ttc).'</td>'; print '<td align="right">'.price($total_ttc).'</td>';
print '<td align="right">'.price($totalam).'</td>'; print '<td align="right">'.price($totalam).'</td>';
print '</tr>'; print '</tr>';
print '</table><br>'; print '</table><br>';
} }
$db->free($resql); $db->free($resql);
} }
else else
{ {
dolibarr_print_error($db); dolibarr_print_error($db);
} }
} }
// \todo Mettre ici recup des actions en rapport avec la compta // \todo Mettre ici recup des actions en rapport avec la compta
$resql = 0; $resql = 0;
if ($resql) if ($resql)
{ {
print '<table class="noborder" width="100%">'; print '<table class="noborder" width="100%">';
print '<tr class="liste_titre"><td colspan="2">'.$langs->trans("TasksToDo").'</td>'; print '<tr class="liste_titre"><td colspan="2">'.$langs->trans("TasksToDo").'</td>';
print "</tr>\n"; print "</tr>\n";
$var = True; $var = True;
$i = 0; $i = 0;
while ($i < $db->num_rows($resql) ) while ($i < $db->num_rows($resql) )
{ {
$obj = $db->fetch_object($resql); $obj = $db->fetch_object($resql);
$var=!$var; $var=!$var;
print "<tr $bc[$var]><td>".strftime("%d %b %Y",$obj->da)."</td><td><a href=\"action/fiche.php\">$obj->libelle $obj->label</a></td></tr>"; print "<tr $bc[$var]><td>".strftime("%d %b %Y",$obj->da)."</td><td><a href=\"action/fiche.php\">$obj->libelle $obj->label</a></td></tr>";
$i++; $i++;
} }
$db->free($resql); $db->free($resql);
print "</table><br>"; print "</table><br>";
} }
/* /*
* Factures a payer * Factures a payer
*/ */
if ($conf->facture->enabled) { if ($conf->facture->enabled) {
if ($user->societe_id == 0) if ($user->societe_id == 0)
{ {
$sql = "SELECT ff.rowid, ff.facnumber, ff.libelle, ff.total_ht, ff.total_ttc, s.nom, s.idp"; $sql = "SELECT ff.rowid, ff.facnumber, ff.libelle, ff.total_ht, ff.total_ttc, s.nom, s.idp";
$sql .= " FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."facture_fourn as ff"; $sql .= " FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."facture_fourn as ff";
$sql .= " WHERE s.idp = ff.fk_soc"; $sql .= " WHERE s.idp = ff.fk_soc";
$sql .= " AND ff.paye=0"; $sql .= " AND ff.paye=0";
$result=$db->query($sql); $result=$db->query($sql);
if ($result) if ($result)
{ {
$num = $db->num_rows(); $num = $db->num_rows();
if ($num) if ($num)
{ {
print '<table class="noborder" width="100%">'; print '<table class="noborder" width="100%">';
print '<tr class="liste_titre"><td colspan="2">'.$langs->trans("BillsSuppliersUnpayed").' ('.$num.')</td>'; print '<tr class="liste_titre"><td colspan="2">'.$langs->trans("BillsSuppliersUnpayed").' ('.$num.')</td>';
print '<td align="right">'.$langs->trans("AmountHT").'</td>'; print '<td align="right">'.$langs->trans("AmountHT").'</td>';
print '<td align="right">'.$langs->trans("AmountTTC").'</td></tr>'; print '<td align="right">'.$langs->trans("AmountTTC").'</td></tr>';
print "</tr>\n"; print "</tr>\n";
$i = 0; $i = 0;
$var = True; $var = True;
$total = $total_ttc = $totalam = 0; $total = $total_ttc = $totalam = 0;
while ($i < $num) while ($i < $num)
{ {
$obj = $db->fetch_object($result); $obj = $db->fetch_object($result);
$var = !$var; $var = !$var;
print '<tr '.$bc[$var].'><td><a href="'.DOL_URL_ROOT.'/fourn/facture/fiche.php?facid='.$obj->rowid.'">'.img_object($langs->trans("ShowBill"),"bill").' '.$obj->facnumber.'</a></td>'; print '<tr '.$bc[$var].'><td><a href="'.DOL_URL_ROOT.'/fourn/facture/fiche.php?facid='.$obj->rowid.'">'.img_object($langs->trans("ShowBill"),"bill").' '.$obj->facnumber.'</a></td>';
print '<td><a href="fiche.php?socid='.$obj->idp.'">'.img_object($langs->trans("ShowSupplier"),"company").' '.dolibarr_trunc($obj->nom,50).'</a></td>'; print '<td><a href="fiche.php?socid='.$obj->idp.'">'.img_object($langs->trans("ShowSupplier"),"company").' '.dolibarr_trunc($obj->nom,50).'</a></td>';
print '<td align="right">'.price($obj->total_ht).'</td>'; print '<td align="right">'.price($obj->total_ht).'</td>';
print '<td align="right">'.price($obj->total_ttc).'</td>'; print '<td align="right">'.price($obj->total_ttc).'</td>';
print '</tr>'; print '</tr>';
$total += $obj->total_ht; $total += $obj->total_ht;
$total_ttc += $obj->total_ttc; $total_ttc += $obj->total_ttc;
$totalam += $obj->am; $totalam += $obj->am;
$i++; $i++;
} }
$var=!$var; $var=!$var;
print '<tr class="liste_total"><td colspan="2" align="right">'.$langs->trans("Total").' &nbsp; <font style="font-weight: normal">('.$langs->trans("RemainderToPay").': '.price($total_ttc-$totalam).')</font> </td>'; print '<tr class="liste_total"><td colspan="2" align="right">'.$langs->trans("Total").' &nbsp; <font style="font-weight: normal">('.$langs->trans("RemainderToPay").': '.price($total_ttc-$totalam).')</font> </td>';
print '<td align="right">'.price($total).'</td>'; print '<td align="right">'.price($total).'</td>';
print '<td align="right">'.price($total_ttc).'</td>'; print '<td align="right">'.price($total_ttc).'</td>';
print '</tr>'; print '</tr>';
print '</table><br>'; print '</table><br>';
} }
} }
else else
{ {
dolibarr_print_error($db); dolibarr_print_error($db);
} }
} }
} }
print '</td></tr>'; print '</td></tr>';
print '</table>'; print '</table>';
$db->close(); $db->close();
llxFooter('$Date$ - $Revision$'); llxFooter('$Date$ - $Revision$');
?> ?>

File diff suppressed because it is too large Load Diff

View File

@ -1,152 +1,152 @@
<?php <?php
// //
// +----------------------------------------------------------------------+ // +----------------------------------------------------------------------+
// | PHP Version 4 | // | PHP Version 4 |
// +----------------------------------------------------------------------+ // +----------------------------------------------------------------------+
// | Copyright (c) 1997-2003 The PHP Group | // | Copyright (c) 1997-2003 The PHP Group |
// +----------------------------------------------------------------------+ // +----------------------------------------------------------------------+
// | This source file is subject to version 2.02 of the PHP license, | // | This source file is subject to version 2.02 of the PHP license, |
// | that is bundled with this package in the file LICENSE, and is | // | that is bundled with this package in the file LICENSE, and is |
// | available at through the world-wide-web at | // | available at through the world-wide-web at |
// | http://www.php.net/license/2_02.txt. | // | http://www.php.net/license/2_02.txt. |
// | If you did not receive a copy of the PHP license and are unable to | // | If you did not receive a copy of the PHP license and are unable to |
// | obtain it through the world-wide-web, please send a note to | // | obtain it through the world-wide-web, please send a note to |
// | license@php.net so we can mail you a copy immediately. | // | license@php.net so we can mail you a copy immediately. |
// +----------------------------------------------------------------------+ // +----------------------------------------------------------------------+
// | Authors: Martin Jansen <mj@php.net> | // | Authors: Martin Jansen <mj@php.net> |
// +----------------------------------------------------------------------+ // +----------------------------------------------------------------------+
// //
// $Id$ // $Id$
// //
define("AUTH_METHOD_NOT_SUPPORTED", -4); define("AUTH_METHOD_NOT_SUPPORTED", -4);
/** /**
* Storage class for fetching login data * Storage class for fetching login data
* *
* @author Martin Jansen <mj@php.net> * @author Martin Jansen <mj@php.net>
* @package Auth * @package Auth
*/ */
class Auth_Container class Auth_Container
{ {
/** /**
* User that is currently selected from the storage container. * User that is currently selected from the storage container.
* *
* @access public * @access public
*/ */
var $activeUser = ""; var $activeUser = "";
// {{{ Constructor // {{{ Constructor
/** /**
* Constructor * Constructor
* *
* Has to be overwritten by each storage class * Has to be overwritten by each storage class
* *
* @access public * @access public
*/ */
function Auth_Container() function Auth_Container()
{ {
} }
// }}} // }}}
// {{{ fetchData() // {{{ fetchData()
/** /**
* Fetch data from storage container * Fetch data from storage container
* *
* Has to be overwritten by each storage class * Has to be overwritten by each storage class
* *
* @access public * @access public
*/ */
function fetchData() function fetchData()
{ {
} }
// }}} // }}}
// {{{ verifyPassword() // {{{ verifyPassword()
/** /**
* Crypt and verfiy the entered password * Crypt and verfiy the entered password
* *
* @param string Entered password * @param string Entered password
* @param string Password from the data container (usually this password * @param string Password from the data container (usually this password
* is already encrypted. * is already encrypted.
* @param string Type of algorithm with which the password from * @param string Type of algorithm with which the password from
* the container has been crypted. (md5, crypt etc.) * the container has been crypted. (md5, crypt etc.)
* Defaults to "md5". * Defaults to "md5".
* @return bool True, if the passwords match * @return bool True, if the passwords match
*/ */
function verifyPassword($password1, $password2, $cryptType = "md5") function verifyPassword($password1, $password2, $cryptType = "md5")
{ {
switch ($cryptType) { switch ($cryptType) {
case "crypt" : case "crypt" :
return (($password2 == "**" . $password1) || return (($password2 == "**" . $password1) ||
(crypt($password1, $password2) == $password2) (crypt($password1, $password2) == $password2)
); );
break; break;
case "none" : case "none" :
return ($password1 == $password2); return ($password1 == $password2);
break; break;
case "md5" : case "md5" :
return (md5($password1) == $password2); return (md5($password1) == $password2);
break; break;
default : default :
if (function_exists($cryptType)) { if (function_exists($cryptType)) {
return ($cryptType($password1) == $password2); return ($cryptType($password1) == $password2);
} else { } else {
return false; return false;
} }
break; break;
} }
} }
// }}} // }}}
// {{{ listUsers() // {{{ listUsers()
/** /**
* List all users that are available from the storage container * List all users that are available from the storage container
*/ */
function listUsers() function listUsers()
{ {
return AUTH_METHOD_NOT_SUPPORTED; return AUTH_METHOD_NOT_SUPPORTED;
} }
// }}} // }}}
// {{{ addUser() // {{{ addUser()
/** /**
* Add a new user to the storage container * Add a new user to the storage container
* *
* @param string Username * @param string Username
* @param string Password * @param string Password
* @param array Additional information * @param array Additional information
* *
* @return boolean * @return boolean
*/ */
function addUser($username, $password, $additional=null) function addUser($username, $password, $additional=null)
{ {
return AUTH_METHOD_NOT_SUPPORTED; return AUTH_METHOD_NOT_SUPPORTED;
} }
// }}} // }}}
// {{{ removeUser() // {{{ removeUser()
/** /**
* Remove user from the storage container * Remove user from the storage container
* *
* @param string Username * @param string Username
*/ */
function removeUser($username) function removeUser($username)
{ {
return AUTH_METHOD_NOT_SUPPORTED; return AUTH_METHOD_NOT_SUPPORTED;
} }
// }}} // }}}
} }
?> ?>