FIX merge problem

This commit is contained in:
Regis Houssin 2025-01-06 13:56:32 +01:00
parent d443446838
commit a3193a08bc
2 changed files with 0 additions and 8 deletions

View file

@ -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.')';
}

View file

@ -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.')';
}