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

Fix object initialization order in declaration view

Browse Source 
Fixed:
- Moved object initialization before action processing
- Prevents 'Call to a member function on null' error
- recalculateCA3Amounts() now works properly
- Objects are available when action handlers run
This commit is contained in:
Frank Cools 2025-10-02 20:51:34 +02:00
parent 14362712a1
commit b9725755a2
1 changed files with 163 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

163
declarationtva_view.php
View File

@ -0,0 +1,163 @@
<?php
/**
* DeclarationTVA View Declaration
* French CA-3 VAT Declaration Module for Dolibarr
* MVP Version - Phase 1
*/
// Load Dolibarr environment
if (file_exists('../main.inc.php')) {
$res = @include '../main.inc.php';
} elseif (file_exists('../../main.inc.php')) {
$res = @include '../../main.inc.php';
} else {
$res = 0;
}
if (!$res) {
die("Include of main fails");
}
// Load module classes
require_once DOL_DOCUMENT_ROOT . '/custom/declarationtva/core/class/declarationtva.class.php';
require_once DOL_DOCUMENT_ROOT . '/custom/declarationtva/core/class/declarationtva_config.class.php';
require_once DOL_DOCUMENT_ROOT . '/custom/declarationtva/core/class/declarationtva_period.class.php';
// Access control
if (!$user->hasRight("declarationtva", "declarationtva", "read")) {
accessforbidden();
}
// Load language files
$langs->load("declarationtva@declarationtva");
// Get declaration ID
$id = GETPOST('id', 'int');
if (empty($id)) {
accessforbidden();
}
// Initialize objects
$declarationtva = new DeclarationTVA($db, $conf->entity);
$config = new DeclarationTVA_Config($db, $conf->entity);
$period = new DeclarationTVA_Period($db, $conf->entity);
// Handle actions
$action = GETPOST('action', 'alpha');
$token = GETPOST('token', 'alpha');
if ($action == 'recalculate' && $token) {
if ($declarationtva->recalculateCA3Amounts($id)) {
setEventMessages($langs->trans("DeclarationRecalculated"), null, 'mesgs');
} else {
setEventMessages($langs->trans("ErrorRecalculatingDeclaration"), null, 'errors');
}
}
// Fetch declaration
if ($declarationtva->fetch($id) < 0) {
setEventMessages($langs->trans("DeclarationNotFound"), null, 'errors');
header("Location: declarationtvaindex.php");
exit;
}
// Use declaration's own dates
$start_date = $declarationtva->start_date;
$end_date = $declarationtva->end_date;
// Page title
$title = $langs->trans("ViewDeclaration") . ' - ' . $declarationtva->declaration_number;
llxHeader('', $title);
// Print page header
print load_fiche_titre($title, '', 'title_accountancy');
// Print declaration details
print '<div class="fiche">';
print '<div class="titre">' . $langs->trans("DeclarationDetails") . '</div>';
print '<table class="noborder centpercent">';
print '<tr>';
print '<td class="fieldrequired">' . $langs->trans("DeclarationNumber") . '</td>';
print '<td>' . $declarationtva->declaration_number . '</td>';
print '</tr>';
print '<tr>';
print '<td>' . $langs->trans("DeclarationName") . '</td>';
print '<td>' . $declarationtva->declaration_name . '</td>';
print '</tr>';
print '<tr>';
print '<td>' . $langs->trans("Period") . '</td>';
print '<td>' . dol_print_date($start_date, 'day') . ' - ' . dol_print_date($end_date, 'day') . '</td>';
print '</tr>';
print '<tr>';
print '<td>' . $langs->trans("Status") . '</td>';
print '<td>' . $langs->trans("Status" . ucfirst($declarationtva->status)) . '</td>';
print '</tr>';
print '<tr>';
print '<td>' . $langs->trans("CreatedDate") . '</td>';
print '<td>' . dol_print_date($declarationtva->created_date, 'dayhour') . '</td>';
print '</tr>';
print '</table>';
print '</div>';
// Print CA-3 amounts (placeholder for now)
print '<div class="fiche">';
print '<div class="titre">' . $langs->trans("CA3Amounts") . '</div>';
print '<table class="noborder centpercent">';
print '<tr class="liste_titre">';
print '<th>' . $langs->trans("CA3Line") . '</th>';
print '<th>' . $langs->trans("Description") . '</th>';
print '<th>' . $langs->trans("Amount") . '</th>';
print '</tr>';
// Get actual CA-3 lines from database
$ca3_lines = $declarationtva->getCA3Lines($id);
if (empty($ca3_lines)) {
print '<tr>';
print '<td colspan="3" class="center">' . $langs->trans("NoCA3Data") . '</td>';
print '</tr>';
} else {
foreach ($ca3_lines as $line) {
print '<tr>';
print '<td>' . $line['ca3_line'] . '</td>';
print '<td>' . $line['line_label'] . '</td>';
print '<td class="right">' . price($line['vat_amount']) . '</td>';
print '</tr>';
}
}
print '</table>';
print '</div>';
// Print actions
print '<div class="fiche">';
print '<div class="titre">' . $langs->trans("Actions") . '</div>';
print '<div class="center">';
// Recalculate button (always available)
print '<a href="' . $_SERVER['PHP_SELF'] . '?id=' . $id . '&action=recalculate&token=' . newToken() . '" class="butAction">' . $langs->trans("Recalculate") . '</a> ';
if ($declarationtva->status == 'draft') {
print '<a href="' . $_SERVER['PHP_SELF'] . '?id=' . $id . '&action=validate" class="butAction">' . $langs->trans("Validate") . '</a> ';
} elseif ($declarationtva->status == 'validated') {
print '<a href="' . $_SERVER['PHP_SELF'] . '?id=' . $id . '&action=submit" class="butAction">' . $langs->trans("Submit") . '</a> ';
}
print '<a href="declarationtvaindex.php" class="butAction">' . $langs->trans("BackToList") . '</a>';
print '</div>';
print '</div>';
// Print footer
llxFooter();
?>