From 094df60244be7ac0c2c385244762aab472af217d Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@users.sourceforge.net>
Date: Sun, 8 Feb 2004 17:25:13 +0000
Subject: [PATCH] =?UTF-8?q?Si=20l'option=20fiscale=20de=20TVA=20est=20choi?=
 =?UTF-8?q?sie=20=E0=20"TVA=20en=20franchise"=20dans=20les=20options=20du?=
 =?UTF-8?q?=20module=20facture,=20alors=20le=20taux=20de=20TVA=20propos=E9?=
 =?UTF-8?q?=20par=20d=E9faut=20sur=20les=20factures=20clients=20est=20de?=
 =?UTF-8?q?=200.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 htdocs/compta/facture.php | 2 +-
 htdocs/main.inc.php       | 7 +++++++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/htdocs/compta/facture.php b/htdocs/compta/facture.php
index 2fc580b31fb..4af9d4de2af 100644
--- a/htdocs/compta/facture.php
+++ b/htdocs/compta/facture.php
@@ -966,7 +966,7 @@ else
 	    print '<input type="hidden" name="action" value="addligne">';
 	    print '<tr><td><textarea name="desc" cols="60" rows="2"></textarea></td>';
 	    print '<td align="center">';
-	    print $html->select_tva("tva_tx");
+	    print $html->select_tva("tva_tx",$conf->defaulttx);
 	    print '</td>';
 	    print '<td align="center"><input type="text" name="qty" value="1" size="2"></td>';
 	    print '<td align="right"><input type="text" name="remise_percent" size="4" value="0">&nbsp;%</td>';
diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php
index abe475be531..43f7c389eb9 100644
--- a/htdocs/main.inc.php
+++ b/htdocs/main.inc.php
@@ -241,6 +241,13 @@ if ($user->limite_liste > 0)
   $conf->liste_limit = $user->limite_liste;
 }
 
+if (defined("FACTURE_TVAOPTION") && FACTURE_TVAOPTION == 'franchise') {
+	$conf->defaulttx='0';		# Taux par défaut des factures clients
+}
+else {
+	$conf->defaulttx='';		# Pas de taux par défaut des factures clients, le premier sera pris
+}
+
 if (defined("MAIN_THEME"))
 {
   $conf->theme=MAIN_THEME;