From 781e2edcb032e695a3976639f601a7cf4f50bf79 Mon Sep 17 00:00:00 2001
From: Andre Cianfarani <acianfa@free.fr>
Date: Mon, 20 Feb 2006 16:43:05 +0000
Subject: [PATCH] modif assuj tva

---
 htdocs/comm/fiche.php      | 12 ++++++++++--
 htdocs/html.form.class.php |  4 ++--
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/htdocs/comm/fiche.php b/htdocs/comm/fiche.php
index bcb262159aa..9e5b4b7636b 100644
--- a/htdocs/comm/fiche.php
+++ b/htdocs/comm/fiche.php
@@ -75,6 +75,14 @@ if ($_POST["action"] == 'setmode')
 	$sql = "UPDATE ".MAIN_DB_PREFIX."societe SET mode_reglement='".$_POST['mode_reglement_id']."' WHERE idp='".$socid."'";
     $result = $db->query($sql);
 }
+// assujétissement à la TVA
+if ($_POST["action"] == 'setassujtva')
+{
+	$societe = new Societe($db, $_GET["socid"]);
+    $societe->tva_assuj=$_POST['assujtva_value'];
+	$sql = "UPDATE ".MAIN_DB_PREFIX."societe SET tva_assuj='".$_POST['assujtva_value']."' WHERE idp='".$socid."'";
+    $result = $db->query($sql);
+}
 
 if ($action == 'recontact')
 {
@@ -390,11 +398,11 @@ if ($_socid > 0)
 			print '</td><td colspan="3">';
 		if ($_GET['action'] == 'editassujtva')
 			{
-				$html->form_assujetti_tva($_SERVER['PHP_SELF'].'?socid='.$objsoc->id,$objsoc->assujetti_tva,'assujtva_value');
+				$html->form_assujetti_tva($_SERVER['PHP_SELF'].'?socid='.$objsoc->id,$objsoc->tva_assuj,'assujtva_value');
 			}
 			else
 			{
-				$html->form_assujetti_tva($_SERVER['PHP_SELF'].'?socid='.$objsoc->id,$objsoc->assujetti_tva,'none');
+				$html->form_assujetti_tva($_SERVER['PHP_SELF'].'?socid='.$objsoc->id,$objsoc->tva_assuj,'none');
 			}
 		print "</td>";
 		print '</tr>';
diff --git a/htdocs/html.form.class.php b/htdocs/html.form.class.php
index 2004f90091d..4d328b435ac 100644
--- a/htdocs/html.form.class.php
+++ b/htdocs/html.form.class.php
@@ -805,7 +805,7 @@ class Form
      *      \param      selected        Id du type de paiement présélectionné
      *      \param      htmlname        Nom de la zone select
      */
-    function select_assujetti_tva($selected='',$htmlname='condid')
+    function select_assujetti_tva($selected='',$htmlname='')
     {
         global $langs;
         print '<select class="flat" name="'.$htmlname.'">';
@@ -1280,7 +1280,7 @@ class Form
         }
         else
         {
-            if ($selected)
+            if ($selected != "")
             {
                 print $options[$selected];
             } else {