From 0fe4408ce53114c040b13405b1cebaf13a79bf77 Mon Sep 17 00:00:00 2001 From: Regis Houssin Date: Tue, 4 Dec 2007 21:30:35 +0000 Subject: [PATCH] =?UTF-8?q?Fix:=20la=20deuxi=E8me=20requete=20=E9crasait?= =?UTF-8?q?=20la=20premiere=20au=20lieu=20de=20s'unire?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- htdocs/compta/propal.php | 2 +- htdocs/propal.class.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/htdocs/compta/propal.php b/htdocs/compta/propal.php index 74f449c0031..74b6faab445 100644 --- a/htdocs/compta/propal.php +++ b/htdocs/compta/propal.php @@ -2,7 +2,7 @@ /* Copyright (C) 2001-2007 Rodolphe Quiedeville * Copyright (C) 2004-2007 Destailleur Laurent * Copyright (C) 2004 Eric Seigne - * Copyright (C) 2005-2006 Regis Houssin + * Copyright (C) 2005-2007 Regis Houssin * * 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 diff --git a/htdocs/propal.class.php b/htdocs/propal.class.php index 3d4f05a9cec..2dd9ed86f0d 100644 --- a/htdocs/propal.class.php +++ b/htdocs/propal.class.php @@ -1523,7 +1523,7 @@ class Propal extends CommonObject $sql.= " WHERE fp.fk_facture = f.rowid AND fp.fk_propal = ".$id; $sql.= " UNION "; // Cas des factures lier via la commande - $sql = "SELECT f.rowid, f.facnumber"; + $sql.= "SELECT f.rowid, f.facnumber"; $sql.= " FROM ".MAIN_DB_PREFIX."facture as f"; $sql.= ", ".MAIN_DB_PREFIX."co_pr as cp, ".MAIN_DB_PREFIX."co_fa as cf"; $sql.= " WHERE cp.fk_propale = ".$id." AND cf.fk_commande = cp.fk_commande AND cf.fk_facture = f.rowid";