diff --git a/htdocs/fourn/commande/list.php b/htdocs/fourn/commande/list.php index e399ce50745..7616d21227f 100644 --- a/htdocs/fourn/commande/list.php +++ b/htdocs/fourn/commande/list.php @@ -512,12 +512,8 @@ if (empty($reshook)) { } $tva_tx = $lines[$i]->tva_tx; -<<<<<<< HEAD // @phan-suppress-next-line PhanTypeMismatchArgumentInternal - if (!empty($lines[$i]->vat_src_code) && !preg_match('/\(/', $tva_tx)) { -======= if (!empty($lines[$i]->vat_src_code) && !preg_match('/\(/', (string) $tva_tx)) { ->>>>>>> branch '20.0' of git@github.com:Dolibarr/dolibarr.git $tva_tx .= ' ('.$lines[$i]->vat_src_code.')'; } diff --git a/htdocs/fourn/facture/card.php b/htdocs/fourn/facture/card.php index b2de69e162e..a7d7df70c25 100644 --- a/htdocs/fourn/facture/card.php +++ b/htdocs/fourn/facture/card.php @@ -1339,12 +1339,8 @@ if (empty($reshook)) { } $tva_tx = $lines[$i]->tva_tx; -<<<<<<< HEAD // @phan-suppress-next-line PhanTypeMismatchArgumentInternal - if (!empty($lines[$i]->vat_src_code) && !preg_match('/\(/', $tva_tx)) { -======= if (!empty($lines[$i]->vat_src_code) && !preg_match('/\(/', (string) $tva_tx)) { ->>>>>>> branch '20.0' of git@github.com:Dolibarr/dolibarr.git $tva_tx .= ' ('.$lines[$i]->vat_src_code.')'; }