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

Fix: utf-8

Browse Source
This commit is contained in:
Regis Houssin 2009-10-27 11:07:31 +00:00
parent ab432c5a89
commit fae35c6009
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/commande/commande.class.php
View File

@ -1921,7 +1921,7 @@ class Commande extends CommonObject
$clause = " AND"; $clause = " AND";
} }
$sql.= $clause." c.entity = ".$conf->entity; $sql.= $clause." c.entity = ".$conf->entity;
$sql.= " AND (c.fk_statut BETWEEN 1 AND 2 or (c.fk_statut = 3 AND c.facture = 0))"; $sql.= " AND ((c.fk_statut BETWEEN 1 AND 2) OR (c.fk_statut = 3 AND c.facture = 0))";
if ($user->societe_id) $sql.=" AND c.fk_soc = ".$user->societe_id; if ($user->societe_id) $sql.=" AND c.fk_soc = ".$user->societe_id;
$resql=$this->db->query($sql); $resql=$this->db->query($sql);

14
htdocs/index.php
View File

@ -96,7 +96,7 @@ print "</table>\n";
/* /*
* Tableau de bord d'<EFBFBD>tats Dolibarr (statistiques) * Tableau de bord d'etats Dolibarr (statistiques)
* Hidden for external users * Hidden for external users
*/ */
$langs->load("commercial"); $langs->load("commercial");
@ -112,7 +112,7 @@ if ($user->societe_id == 0)
$var=true; $var=true;
// Condition <EFBFBD> v<>rifier pour affichage de chaque ligne du tableau de bord // Condition a verifier pour affichage de chaque ligne du tableau de bord
$conditions=array( $conditions=array(
! empty($conf->societe->enabled) && $user->rights->societe->lire, ! empty($conf->societe->enabled) && $user->rights->societe->lire,
! empty($conf->societe->enabled) && $user->rights->societe->lire, ! empty($conf->societe->enabled) && $user->rights->societe->lire,
@ -149,7 +149,7 @@ if ($user->societe_id == 0)
'Facture', 'Facture',
'LigneTel', 'LigneTel',
'Contrat'); 'Contrat');
// Cl<EFBFBD> de tableau retourn<72> par la methode load_state_board pour chaque ligne // Cle de tableau retourne par la methode load_state_board pour chaque ligne
$keys=array('customers', $keys=array('customers',
'prospects', 'prospects',
'suppliers', 'suppliers',
@ -218,7 +218,7 @@ if ($user->societe_id == 0)
if ($conditions[$key]) if ($conditions[$key])
{ {
$classe=$classes[$key]; $classe=$classes[$key];
// Cherche dans cache si le load_state_board deja r<EFBFBD>alis<EFBFBD> // Cherche dans cache si le load_state_board deja realise
if (! isset($boardloaded[$classe]) || ! is_object($boardloaded[$classe])) if (! isset($boardloaded[$classe]) || ! is_object($boardloaded[$classe]))
{ {
include_once($includes[$key]); include_once($includes[$key]);
@ -341,7 +341,7 @@ if ($conf->propal->enabled && $user->rights->propale->lire)
print '</tr>'; print '</tr>';
} }
// Nbre propales fermees signees (<EFBFBD> facturer) // Nbre propales fermees signees (a facturer)
if ($conf->propal->enabled && $user->rights->propale->lire) if ($conf->propal->enabled && $user->rights->propale->lire)
{ {
$langs->load("propal"); $langs->load("propal");
@ -419,7 +419,7 @@ if ($conf->contrat->enabled && $user->rights->contrat->lire)
print "\n"; print "\n";
} }
// Nbre factures fournisseurs (<EFBFBD> payer) // Nbre factures fournisseurs (a payer)
if ($conf->fournisseur->enabled && $conf->facture->enabled && $user->rights->facture->lire) if ($conf->fournisseur->enabled && $conf->facture->enabled && $user->rights->facture->lire)
{ {
$langs->load("bills"); $langs->load("bills");
@ -445,7 +445,7 @@ if ($conf->fournisseur->enabled && $conf->facture->enabled && $user->rights->fac
print "\n"; print "\n";
} }
// Nbre factures clients (<EFBFBD> payer) // Nbre factures clients (a payer)
if ($conf->facture->enabled && $user->rights->facture->lire) if ($conf->facture->enabled && $user->rights->facture->lire)
{ {
$langs->load("bills"); $langs->load("bills");