From a2dcad788b8a663ea32486749d69c3c669b99eda Mon Sep 17 00:00:00 2001 From: Nathan <130627685+nathanpixodeo@users.noreply.github.com> Date: Sun, 28 Jun 2026 10:22:48 +0700 Subject: [PATCH] Autofill French VAT number from SIREN or SIRET (#38956) Co-authored-by: Laurent Destailleur --- htdocs/societe/card.php | 3 +++ htdocs/societe/class/societe.class.php | 17 ++++++++++++----- 2 files changed, 15 insertions(+), 5 deletions(-) diff --git a/htdocs/societe/card.php b/htdocs/societe/card.php index cd4f62f5abc..32c12ad3715 100644 --- a/htdocs/societe/card.php +++ b/htdocs/societe/card.php @@ -524,6 +524,9 @@ if (empty($reshook)) { $object->country_code = $tmparray['code']; $object->country = $tmparray['label']; } + if (empty($object->tva_intra)) { + $object->tva_intra = $object->calculateVATNumberFromProperties($object); + } } } diff --git a/htdocs/societe/class/societe.class.php b/htdocs/societe/class/societe.class.php index 6e5a3caa6df..fbd33d6a524 100644 --- a/htdocs/societe/class/societe.class.php +++ b/htdocs/societe/class/societe.class.php @@ -5391,15 +5391,22 @@ class Societe extends CommonObject public function calculateVATNumberFromProperties($thirdparty) { if ($thirdparty->country_code == 'FR' && empty($thirdparty->tva_intra) && !empty($thirdparty->tva_assuj)) { - $siren = trim($thirdparty->idprof1); - if (empty($siren)) { - $siren = (int) substr(str_replace(' ', '', $thirdparty->idprof2), 0, 9); + require_once DOL_DOCUMENT_ROOT.'/core/lib/profid.lib.php'; + + $siren = preg_replace('/\s+/', '', (string) $thirdparty->idprof1); + $siret = preg_replace('/\s+/', '', (string) $thirdparty->idprof2); + if (!isValidSiren($siren)) { + if (!isValidSiret($siret)) { + return ''; + } + + $siren = substr($siret, 0, 9); } if (!empty($siren)) { // [FR + key code + SIREN number ] // Key VAT = [12 + 3 * (SIREN modulo 97)] modulo 97 - $cle = (12 + 3 * $siren % 97) % 97; - $tva_intra = 'FR' . $cle . $siren; + $cle = (12 + 3 * (((int) $siren) % 97)) % 97; + $tva_intra = 'FR' . str_pad((string) $cle, 2, '0', STR_PAD_LEFT) . $siren; } }