diff --git a/htdocs/install/upgrade.php b/htdocs/install/upgrade.php index 9629e7bd3eede75dd8cc96e7bc11ac0f96ebb046..3c554a4329cf39e1801f42bef7baf2d01a809fbc 100644 --- a/htdocs/install/upgrade.php +++ b/htdocs/install/upgrade.php @@ -1,6 +1,6 @@ <?php /* Copyright (C) 2004 Rodolphe Quiedeville <rodolphe@quiedeville.org> - * Copyright (C) 2004-2007 Laurent Destailleur <eldy@users.sourceforge.net> + * Copyright (C) 2004-2008 Laurent Destailleur <eldy@users.sourceforge.net> * * 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 @@ -15,14 +15,12 @@ * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - * - * $Id$ */ /** \file htdocs/install/upgrade.php - \brief Execute le script de migration - \version $Revision$ + \brief Run migration script + \version $Id$ */ include_once("./inc.php"); diff --git a/htdocs/install/upgrade2.php b/htdocs/install/upgrade2.php index ccd0fe7b7ee57be3f26d7b0c8309451ef240e604..b520a4eda71e03c85cf668d956139a2db1919d48 100644 --- a/htdocs/install/upgrade2.php +++ b/htdocs/install/upgrade2.php @@ -1464,7 +1464,7 @@ function migrate_price_commande_fournisseur($db,$langs,$conf) $db->free($resql); $sql = "DELETE FROM ".MAIN_DB_PREFIX."commande_fournisseurdet"; - $sql.= " WHERE price = 0 and total_ttc = 0 and total_tva = 0 and total_ht = 0"; + $sql.= " WHERE subprice = 0 and total_ttc = 0 and total_tva = 0 and total_ht = 0"; $resql=$db->query($sql); if (! $resql) {