Merge pull request #9499 from tarrsalah/fix-show-default-vat-rate

FIX #9497
This commit is contained in:
Laurent Destailleur 2018-09-15 17:14:05 +02:00 committed by GitHub
commit ecfbe0a568
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -4711,6 +4711,10 @@ class Form
$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;
}