From 84f80795c363033e740011b656c157028206b940 Mon Sep 17 00:00:00 2001 From: florian HENRY Date: Tue, 10 Apr 2018 14:38:41 +0200 Subject: [PATCH] fix #8474 --- htdocs/expensereport/class/expensereport.class.php | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/htdocs/expensereport/class/expensereport.class.php b/htdocs/expensereport/class/expensereport.class.php index c2eacf4aa76..c50b4ce2cb3 100644 --- a/htdocs/expensereport/class/expensereport.class.php +++ b/htdocs/expensereport/class/expensereport.class.php @@ -1695,6 +1695,13 @@ class ExpenseReport extends CommonObject $this->line = new ExpenseReportLine($this->db); + if (preg_match('/\((.*)\)/', $vatrate, $reg)) + { + $vat_src_code = $reg[1]; + $vatrate = preg_replace('/\s*\(.*\)/', '', $vatrate); // Remove code into vatrate. + } + $vatrate = preg_replace('/\*/','',$vatrate); + $seller = ''; // seller is unknown $tmp = calcul_price_total($qty, $up, 0, $vatrate, 0, 0, 0, 'TTC', 0, $type, $seller); @@ -1929,7 +1936,6 @@ class ExpenseReport extends CommonObject // Clean vat code $vat_src_code=''; - if (preg_match('/\((.*)\)/', $vatrate, $reg)) { $vat_src_code = $reg[1];