frank/DeclarationTVA
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix PDF search to use declaration ID instead of declaration number

Browse Source
This commit is contained in:
Frank Cools 2025-10-08 14:56:38 +02:00
parent 3da20373ce
commit 9aeb09cc5c
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
core/class/declarationtva.class.php
View File

@ -1263,8 +1263,8 @@ class DeclarationTVA
// Debug: Log the search // Debug: Log the search
error_log("hasValidatedDocument: Searching in " . $vat_declarations_dir . " for declaration " . $obj->declaration_number); error_log("hasValidatedDocument: Searching in " . $vat_declarations_dir . " for declaration " . $obj->declaration_number);
// Look for PDF files with the declaration number // Look for PDF files with the declaration ID (not declaration number)
$pattern = $vat_declarations_dir . 'CA3_' . $obj->declaration_number . '_*.pdf'; $pattern = $vat_declarations_dir . 'CA3_' . $declaration_id . '_*.pdf';
$files = glob($pattern); $files = glob($pattern);
// Debug: Log the pattern and results // Debug: Log the pattern and results
@ -1273,7 +1273,7 @@ class DeclarationTVA
// If no files found with the exact pattern, try a more flexible search // If no files found with the exact pattern, try a more flexible search
if (empty($files)) { if (empty($files)) {
$pattern = $vat_declarations_dir . 'CA3_*' . $obj->declaration_number . '*.pdf'; $pattern = $vat_declarations_dir . 'CA3_*' . $declaration_id . '*.pdf';
$files = glob($pattern); $files = glob($pattern);
error_log("hasValidatedDocument: Flexible pattern: " . $pattern); error_log("hasValidatedDocument: Flexible pattern: " . $pattern);
error_log("hasValidatedDocument: Flexible files found: " . print_r($files, true)); error_log("hasValidatedDocument: Flexible files found: " . print_r($files, true));
@ -1311,13 +1311,13 @@ class DeclarationTVA
// Check if PDF file exists in the VAT declarations validated directory // Check if PDF file exists in the VAT declarations validated directory
$vat_declarations_dir = DOL_DATA_ROOT . '/declarationtva/validated/'; $vat_declarations_dir = DOL_DATA_ROOT . '/declarationtva/validated/';
// Look for PDF files with the declaration number // Look for PDF files with the declaration ID (not declaration number)
$pattern = $vat_declarations_dir . 'CA3_' . $obj->declaration_number . '_*.pdf'; $pattern = $vat_declarations_dir . 'CA3_' . $declaration_id . '_*.pdf';
$files = glob($pattern); $files = glob($pattern);
// If no files found with the exact pattern, try a more flexible search // If no files found with the exact pattern, try a more flexible search
if (empty($files)) { if (empty($files)) {
$pattern = $vat_declarations_dir . 'CA3_*' . $obj->declaration_number . '*.pdf'; $pattern = $vat_declarations_dir . 'CA3_*' . $declaration_id . '*.pdf';
$files = glob($pattern); $files = glob($pattern);
} }