From 8dc8297afe1203931fa9e694b599b74ac0829946 Mon Sep 17 00:00:00 2001
From: Regis Houssin <regis@dolibarr.fr>
Date: Thu, 15 Mar 2012 09:19:38 +0100
Subject: [PATCH] Fix: missing tva rates of supplier

---
 htdocs/fourn/commande/fiche.php | 7 ++++---
 htdocs/fourn/facture/fiche.php  | 6 ++++--
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/htdocs/fourn/commande/fiche.php b/htdocs/fourn/commande/fiche.php
index ac741e683f3..677c477bb02 100644
--- a/htdocs/fourn/commande/fiche.php
+++ b/htdocs/fourn/commande/fiche.php
@@ -2,7 +2,7 @@
 /* Copyright (C) 2004-2006 Rodolphe Quiedeville <rodolphe@quiedeville.org>
  * Copyright (C) 2004-2012 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2005      Eric	Seigne          <eric.seigne@ryxeo.com>
- * Copyright (C) 2005-2011 Regis Houssin        <regis@dolibarr.fr>
+ * Copyright (C) 2005-2012 Regis Houssin        <regis@dolibarr.fr>
  * Copyright (C) 2010-2011 Juanjo Menent        <jmenent@2byte.es>
  * Copyright (C) 2011      Philippe Grand       <philippe.grand@atoo-net.com>
  *
@@ -1231,7 +1231,7 @@ if ($id > 0 || ! empty($ref))
 
                 print '</td>';
                 print '<td>';
-                print $form->load_tva('tva_tx',$line->tva_tx);
+                print $form->load_tva('tva_tx',$line->tva_tx,$soc,$mysoc);
                 print '</td>';
                 print '<td align="right"><input	size="5" type="text" name="pu"	value="'.price($line->subprice).'"></td>';
                 print '<td align="right"><input size="2" type="text" name="qty" value="'.$line->qty.'"></td>';
@@ -1605,7 +1605,8 @@ if ($id > 0 || ! empty($ref))
     }
 }
 
-$db->close();
 
+// End of page
 llxFooter();
+$db->close();
 ?>
diff --git a/htdocs/fourn/facture/fiche.php b/htdocs/fourn/facture/fiche.php
index 9debd0a0827..d0acf26d822 100644
--- a/htdocs/fourn/facture/fiche.php
+++ b/htdocs/fourn/facture/fiche.php
@@ -1060,7 +1060,8 @@ if ($action == 'create')
     }
     else
     {
-        if ($conf->global->PRODUCT_SHOW_WHEN_CREATE)
+    	// TODO more bugs
+        if (1==2 && $conf->global->PRODUCT_SHOW_WHEN_CREATE)
         {
             print '<tr class="liste_titre">';
             print '<td>&nbsp;</td><td>'.$langs->trans('Label').'</td>';
@@ -1838,7 +1839,8 @@ else
     }
 }
 
-llxFooter();
 
+// End of page
+llxFooter();
 $db->close();
 ?>