Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 8.0

Dolibarr · Sep 16, 2018 · 2729449 · 2729449
2 parents 34b7582 + ecfbe0a
commit 2729449
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
@@ -4711,6 +4711,10 @@ function load_tva($htmlname='tauxtva', $selectedrate='', $societe_vendeuse='', $
 				$tmpthirdparty=new Societe($this->db);
 				$defaulttx=get_default_tva($societe_vendeuse, (is_object($societe_acheteuse)?$societe_acheteuse:$tmpthirdparty), $idprod);
 				$defaultnpr=get_default_npr($societe_vendeuse, (is_object($societe_acheteuse)?$societe_acheteuse:$tmpthirdparty), $idprod);
+		        if (preg_match('/\((.*)\)/', $defaulttx, $reg)) {
+			        $defaultcode=$reg[1];
+			        $defaulttx=preg_replace('/\s*\(.*\)/','',$defaulttx);
+		        }
 				if (empty($defaulttx)) $defaultnpr=0;
 			}