diff --git a/htdocs/societe/class/societe.class.php b/htdocs/societe/class/societe.class.php
index 4cb6fe8e973..2b519a686cd 100644
--- a/htdocs/societe/class/societe.class.php
+++ b/htdocs/societe/class/societe.class.php
@@ -598,24 +598,6 @@ class Societe extends CommonObject
return $result;
}
- /**
- * Update localtax value of third party
- * @param int $id id societe
- * @param int $local Localtax to update
- * @param double $value value of localtax
- */
- function update_localtax($id, $local, $value)
- {
- global $db;
- $sql = "UPDATE ".MAIN_DB_PREFIX."societe SET ";
- if($local==1) $sql .= "localtax1_value = '" .$value."'";
- else $sql.="localtax2_value='".$value."'";
- $sql.="WHERE rowid=".$id;
-
- $resql=$this->db->query($sql);
-
- }
-
/**
* Update parameters of third party
*
@@ -673,7 +655,7 @@ class Societe extends CommonObject
// Local taxes
$this->localtax1_assuj=trim($this->localtax1_assuj);
$this->localtax2_assuj=trim($this->localtax2_assuj);
-
+
$this->localtax1_value=trim($this->localtax1_value);
$this->localtax2_value=trim($this->localtax2_value);
@@ -782,10 +764,10 @@ class Societe extends CommonObject
$sql .=",localtax1_value =".$this->localtax1_value;
}
else $sql .=",localtax1_value =0.000";
-
+
}
else $sql .=",localtax1_value =0.000";
-
+
if($this->localtax2_assuj==1)
{
if($this->localtax2_value!='')
@@ -793,7 +775,7 @@ class Societe extends CommonObject
$sql .=",localtax2_value =".$this->localtax2_value;
}
else $sql .=",localtax2_value =0.000";
-
+
}
else $sql .=",localtax2_value =0.000";
@@ -1074,7 +1056,7 @@ class Societe extends CommonObject
// Local Taxes
$this->localtax1_assuj = $obj->localtax1_assuj;
$this->localtax2_assuj = $obj->localtax2_assuj;
-
+
$this->localtax1_value = $obj->localtax1_value;
$this->localtax2_value = $obj->localtax2_value;
diff --git a/htdocs/societe/soc.php b/htdocs/societe/soc.php
index 7b92da19fd9..a0eec6ffbc8 100644
--- a/htdocs/societe/soc.php
+++ b/htdocs/societe/soc.php
@@ -101,22 +101,22 @@ if (empty($reshook))
// We defined value code_fournisseur
$_POST["code_fournisseur"]="Acompleter";
}
-
+
if($action=='set_localtax1')
{
//obtidre selected del combobox
$value=GETPOST('lt1');
$object = new Societe($db);
- $res=$object->update_localtax($socid, 1, $value);
-
+ $object->fetch($socid);
+ $res=$object->setValueFrom('localtax1_value', $value);
}
if($action=='set_localtax2')
{
//obtidre selected del combobox
$value=GETPOST('lt2');
$object = new Societe($db);
- $res=$object->update_localtax($socid, 2, $value);
-
+ $object->fetch($socid);
+ $res=$object->setValueFrom('localtax2_value', $value);
}
// Add new third party
@@ -175,7 +175,7 @@ if (empty($reshook))
// Local Taxes
$object->localtax1_assuj = GETPOST('localtax1assuj_value');
$object->localtax2_assuj = GETPOST('localtax2assuj_value');
-
+
$object->localtax1_value = GETPOST('lt1');
$object->localtax2_value = GETPOST('lt2');
@@ -679,7 +679,7 @@ else
//Local Taxes
$object->localtax1_assuj = GETPOST('localtax1assuj_value');
$object->localtax2_assuj = GETPOST('localtax2assuj_value');
-
+
$object->localtax1_value =GETPOST('lt1');
$object->localtax2_value =GETPOST('lt2');
@@ -1174,7 +1174,7 @@ else
//Local Taxes
$object->localtax1_assuj = GETPOST('localtax1assuj_value');
$object->localtax2_assuj = GETPOST('localtax2assuj_value');
-
+
$object->localtax1_value =GETPOST('lt1');
$object->localtax2_value =GETPOST('lt2');
@@ -1195,8 +1195,8 @@ else
if($object->localtax2_assuj==0){
$sub2=0;
}else{$sub2=1;}
-
-
+
+
print "\n".''."\n";
-
-
+
+
if ($conf->use_javascript_ajax)
{
print "\n".'