diff --git a/htdocs/commande/commande.class.php b/htdocs/commande/commande.class.php index 951f0f13a59..348c8e81f2e 100644 --- a/htdocs/commande/commande.class.php +++ b/htdocs/commande/commande.class.php @@ -1,7 +1,8 @@ * Copyright (C) 2004-2005 Laurent Destailleur - * Copyright (C) 2006 Andre Cianfarani + * Copyright (C) 2005-2006 Regis Houssin + * Copyright (C) 2006 Andre Cianfarani * * 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 @@ -386,15 +387,20 @@ class Commande if($conf->global->PRODUIT_MULTIPRICES == 1) { $client = new Societe($this->db); - $client->fetch($this->soc_id); + $client->fetch($this->soc_id); $pu = $prod->multiprices[$client->price_level]; } else $pu = $prod->price; - $txtva = $prod->tva_tx; + $txtva = $prod->tva_tx; } } + + if ($fk_product = 0) + { + $product_desc = $desc + } $remise = 0; $price = round(ereg_replace(',','.',$pu), 2); diff --git a/htdocs/commande/fiche.php b/htdocs/commande/fiche.php index c01417cfeec..7a0aedec59e 100644 --- a/htdocs/commande/fiche.php +++ b/htdocs/commande/fiche.php @@ -1,8 +1,9 @@ * Copyright (C) 2004-2005 Laurent Destailleur - * Copyright (C) 2005 Marc Barilley / Ocebo - * Copyright (C) 2006 Andre Cianfarani + * Copyright (C) 2005 Marc Barilley / Ocebo + * Copyright (C) 2005-2006 Regis Houssin + * Copyright (C) 2006 Andre Cianfarani * * 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