diff --git a/htdocs/fourn/facture/impayees.php b/htdocs/fourn/facture/impayees.php
index 709f2079bcf606345c1f5e472419402630578938..6a51edc9c2edcef896584b06693fbf6149164e78 100644
--- a/htdocs/fourn/facture/impayees.php
+++ b/htdocs/fourn/facture/impayees.php
@@ -98,7 +98,8 @@ if ($user->rights->fournisseur->facture->lire)
if (! $user->rights->societe->client->voir && ! $socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
$sql.= ",".MAIN_DB_PREFIX."facture_fourn as f";
$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."paiementfourn_facturefourn as pf ON f.rowid=pf.fk_facturefourn ";
- $sql.= " WHERE f.fk_soc = s.rowid";
+ $sql.= " WHERE f.entity = ".$conf->entity;
+ $sql.= " AND f.fk_soc = s.rowid";
$sql.= " AND f.paye = 0 AND f.fk_statut = 1";
if ($option == 'late') $sql.=" AND f.date_lim_reglement < '".$db->idate(dol_now() - $conf->facture->fournisseur->warning_delay)."'";
if (! $user->rights->societe->client->voir && ! $socid) $sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
diff --git a/htdocs/fourn/facture/index.php b/htdocs/fourn/facture/index.php
index a6e7631fe6e13ffb3cd36b1b1439aba273dfad60..074fff441eccdd6316d03c2ad645066b8b51b928 100644
--- a/htdocs/fourn/facture/index.php
+++ b/htdocs/fourn/facture/index.php
@@ -72,7 +72,8 @@ if ($mode == 'search')
if ($modesearch == 'soc')
{
$sql = "SELECT s.rowid FROM ".MAIN_DB_PREFIX."societe as s ";
- $sql.= " WHERE s.nom like '%".$db->escape(strtolower($socname))."%'";
+ $sql.= " WHERE s.nom LIKE '%".$db->escape(strtolower($socname))."%'";
+ $sql.= " AND s.entity IN (".getEntity('societe', 1).")";
}
$resql=$db->query($sql);
@@ -106,7 +107,8 @@ $sql.= " fac.total_ht, fac.total_ttc, fac.paye as paye, fac.fk_statut as fk_stat
if (!$user->rights->societe->client->voir && !$socid) $sql .= ", sc.fk_soc, sc.fk_user ";
$sql.= " FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."facture_fourn as fac";
if (!$user->rights->societe->client->voir && !$socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
-$sql.= " WHERE fac.fk_soc = s.rowid";
+$sql.= " WHERE fac.entity = ".$conf->entity;
+$sql.= " AND fac.fk_soc = s.rowid";
if (!$user->rights->societe->client->voir && !$socid) $sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
if ($socid)
{
diff --git a/htdocs/fourn/facture/paiement.php b/htdocs/fourn/facture/paiement.php
index 1024a16c8f9b6468ea8792e9d26acd09ce7e5669..3852c19620d0c45d12d3ded1f9bd203bff94090f 100644
--- a/htdocs/fourn/facture/paiement.php
+++ b/htdocs/fourn/facture/paiement.php
@@ -1,9 +1,10 @@
<?php
-/* Copyright (C) 2003-2005 Rodolphe Quiedeville <rodolphe@quiedeville.org>
- * Copyright (C) 2004 Eric Seigne <eric.seigne@ryxeo.com>
- * Copyright (C) 2004-2012 Laurent Destailleur <eldy@users.sourceforge.net>
- * Copyright (C) 2004 Christophe Combelles <ccomb@free.fr>
- * Copyright (C) 2005 Marc Barilley / Ocebo <marc@ocebo.com>
+/* Copyright (C) 2003-2005 Rodolphe Quiedeville <rodolphe@quiedeville.org>
+ * Copyright (C) 2004 Eric Seigne <eric.seigne@ryxeo.com>
+ * Copyright (C) 2004-2012 Laurent Destailleur <eldy@users.sourceforge.net>
+ * Copyright (C) 2004 Christophe Combelles <ccomb@free.fr>
+ * Copyright (C) 2005 Marc Barilley / Ocebo <marc@ocebo.com>
+ * Copyright (C) 2005-2012 Regis Houssin <regis@dolibarr.fr>
*
* 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
@@ -193,10 +194,10 @@ if ($action == 'create' || $action == 'add_paiement')
$sql = 'SELECT s.nom, s.rowid as socid,';
$sql.= ' f.rowid as ref, f.facnumber, f.amount, f.total_ttc as total';
if (!$user->rights->societe->client->voir && !$socid) $sql .= ", sc.fk_soc, sc.fk_user ";
- $sql .= ' FROM '.MAIN_DB_PREFIX.'societe as s, '.MAIN_DB_PREFIX.'facture_fourn as f';
+ $sql.= ' FROM '.MAIN_DB_PREFIX.'societe as s, '.MAIN_DB_PREFIX.'facture_fourn as f';
if (!$user->rights->societe->client->voir && !$socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
- $sql .= ' WHERE f.fk_soc = s.rowid';
- $sql .= ' AND f.rowid = '.$facid;
+ $sql.= ' WHERE f.fk_soc = s.rowid';
+ $sql.= ' AND f.rowid = '.$facid;
if (!$user->rights->societe->client->voir && !$socid) $sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
$resql = $db->query($sql);
if ($resql)
@@ -254,13 +255,14 @@ if ($action == 'create' || $action == 'add_paiement')
* Autres factures impayees
*/
$sql = 'SELECT f.rowid as facid,f.rowid as ref,f.facnumber,f.total_ttc, f.datef as df';
- $sql .= ', sum(pf.amount) as am';
- $sql .= ' FROM '.MAIN_DB_PREFIX.'facture_fourn as f';
- $sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'paiementfourn_facturefourn as pf ON pf.fk_facturefourn = f.rowid';
- $sql .= ' WHERE f.fk_soc = '.$facture->socid;
- $sql .= ' AND f.paye = 0';
- $sql .= ' AND f.fk_statut = 1'; // Statut=0 => non validee, Statut=2 => annulee
- $sql .= ' GROUP BY f.rowid,f.facnumber,f.total_ttc,f.datef';
+ $sql.= ', sum(pf.amount) as am';
+ $sql.= ' FROM '.MAIN_DB_PREFIX.'facture_fourn as f';
+ $sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'paiementfourn_facturefourn as pf ON pf.fk_facturefourn = f.rowid';
+ $sql.= " WHERE f.entity = ".$conf->entity;
+ $sql.= ' AND f.fk_soc = '.$facture->socid;
+ $sql.= ' AND f.paye = 0';
+ $sql.= ' AND f.fk_statut = 1'; // Statut=0 => non validee, Statut=2 => annulee
+ $sql.= ' GROUP BY f.rowid,f.facnumber,f.total_ttc,f.datef';
$resql = $db->query($sql);
if ($resql)
{
@@ -370,7 +372,7 @@ if (! $_GET['action'] && ! $_POST['action'])
$sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'societe AS s ON s.rowid = f.fk_soc';
$sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'bank as b ON p.fk_bank = b.rowid';
$sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'bank_account as ba ON b.fk_account = ba.rowid';
- $sql.= ' WHERE 1=1';
+ $sql.= " WHERE f.entity = ".$conf->entity;
if (!$user->rights->societe->client->voir) $sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
if ($socid)
{