From 05d9be2469298f13912e17ace72567f5bf2dd1a7 Mon Sep 17 00:00:00 2001 From: Regis Houssin Date: Fri, 5 Jan 2007 12:35:29 +0000 Subject: [PATCH] =?UTF-8?q?La=20facture=20n'=E9tait=20pas=20mise=20=E0=20j?= =?UTF-8?q?our=20lors=20de=20l'ajout=20d'un=20produit=20en=20mode=20multi-?= =?UTF-8?q?prix?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- htdocs/commande/commande.class.php | 2 +- htdocs/commande/fiche.php | 2 +- htdocs/compta/facture.php | 2 +- htdocs/facture.class.php | 1 + htdocs/html.form.class.php | 2 +- htdocs/product.class.php | 6 +++++- htdocs/product/fiche.php | 2 +- htdocs/product/price.php | 2 +- 8 files changed, 12 insertions(+), 7 deletions(-) diff --git a/htdocs/commande/commande.class.php b/htdocs/commande/commande.class.php index b500cbe8344..99ce1baad8f 100644 --- a/htdocs/commande/commande.class.php +++ b/htdocs/commande/commande.class.php @@ -1,7 +1,7 @@ * Copyright (C) 2004-2006 Laurent Destailleur - * Copyright (C) 2005-2006 Regis Houssin + * Copyright (C) 2005-2007 Regis Houssin * Copyright (C) 2006 Andre Cianfarani * * This program is free software; you can redistribute it and/or modify diff --git a/htdocs/commande/fiche.php b/htdocs/commande/fiche.php index b90c6ed2311..5cc7535776b 100644 --- a/htdocs/commande/fiche.php +++ b/htdocs/commande/fiche.php @@ -2,7 +2,7 @@ /* Copyright (C) 2003-2006 Rodolphe Quiedeville * Copyright (C) 2004-2006 Laurent Destailleur * Copyright (C) 2005 Marc Barilley / Ocebo - * Copyright (C) 2005-2006 Regis Houssin + * Copyright (C) 2005-2007 Regis Houssin * Copyright (C) 2006 Andre Cianfarani * * This program is free software; you can redistribute it and/or modify diff --git a/htdocs/compta/facture.php b/htdocs/compta/facture.php index f0482aba831..ebf3929a6a2 100644 --- a/htdocs/compta/facture.php +++ b/htdocs/compta/facture.php @@ -3,7 +3,7 @@ * Copyright (C) 2004 Éric Seigne * Copyright (C) 2004-2006 Laurent Destailleur * Copyright (C) 2005 Marc Barilley / Ocebo - * Copyright (C) 2005-2006 Regis Houssin + * Copyright (C) 2005-2007 Regis Houssin * Copyright (C) 2006 Andre Cianfarani * * This program is free software; you can redistribute it and/or modify diff --git a/htdocs/facture.class.php b/htdocs/facture.class.php index e875aca2b8f..206d8b0122b 100644 --- a/htdocs/facture.class.php +++ b/htdocs/facture.class.php @@ -4,6 +4,7 @@ * Copyright (C) 2004 Sebastien Di Cintio * Copyright (C) 2004 Benoit Mortier * Copyright (C) 2005 Marc Barilley / Ocebo + * Copyright (C) 2005-2007 Regis Houssin * Copyright (C) 2006 Andre Cianfarani * Copyright (C) 2007 Franky Van Liedekerke * diff --git a/htdocs/html.form.class.php b/htdocs/html.form.class.php index bd8fc971249..e17692f2ceb 100644 --- a/htdocs/html.form.class.php +++ b/htdocs/html.form.class.php @@ -4,7 +4,7 @@ * Copyright (C) 2004 Benoit Mortier * Copyright (C) 2004 Sebastien Di Cintio * Copyright (C) 2004 Eric Seigne - * Copyright (C) 2005-2006 Regis Houssin + * Copyright (C) 2005-2007 Regis Houssin * Copyright (C) 2006 Andre Cianfarani * Copyright (C) 2006 Marc Barilley/Océbo * diff --git a/htdocs/product.class.php b/htdocs/product.class.php index 2c9de12048f..be578ea1c44 100644 --- a/htdocs/product.class.php +++ b/htdocs/product.class.php @@ -988,7 +988,11 @@ class Product return -1; } } - $this -> multiprices[1] = $this->price; + + $this->multiprices[1] = $this->price; + $this->multiprices_ttc[1] = $this->price_ttc; + $this->multiprices_base_type[1] = $this->price_base_type; + for($i=2;$i<=$conf->global->PRODUIT_MULTIPRICES_LIMIT;$i++) { $sql= "SELECT price, price_ttc, price_base_type, tva_tx, envente "; diff --git a/htdocs/product/fiche.php b/htdocs/product/fiche.php index 09bdf7d1312..22a5430e641 100644 --- a/htdocs/product/fiche.php +++ b/htdocs/product/fiche.php @@ -2,7 +2,7 @@ /* Copyright (C) 2001-2007 Rodolphe Quiedeville * Copyright (C) 2004-2006 Laurent Destailleur * Copyright (C) 2005 Eric Seigne - * Copyright (C) 2005-2006 Régis Houssin + * Copyright (C) 2005-2007 Régis Houssin * Copyright (C) 2006 Andre Cianfarani * Copyright (C) 2006 Auguria SARL * diff --git a/htdocs/product/price.php b/htdocs/product/price.php index 2abfb9f6cfa..a8baad23ac3 100644 --- a/htdocs/product/price.php +++ b/htdocs/product/price.php @@ -2,7 +2,7 @@ /* Copyright (C) 2001-2007 Rodolphe Quiedeville * Copyright (C) 2004-2005 Laurent Destailleur * Copyright (C) 2005 Eric Seigne - * Copyright (C) 2005-2006 Regis Houssin + * Copyright (C) 2005-2007 Regis Houssin * Copyright (C) 2006 Andre Cianfarani * * This program is free software; you can redistribute it and/or modify