lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #24169 from frederic34/reportexportinlist

Browse Source 
fix reports to be exportable by module
This commit is contained in:
Laurent Destailleur 2023-03-10 14:47:31 +01:00 committed by GitHub
commit b92f3a0dcd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 15 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
htdocs/compta/journal/purchasesjournal.php
View File

@ -55,7 +55,7 @@ if (isModEnabled('comptabilite')) {
if (isModEnabled('accounting')) { if (isModEnabled('accounting')) {
$result = restrictedArea($user, 'accounting', '', '', 'comptarapport'); $result = restrictedArea($user, 'accounting', '', '', 'comptarapport');
} }
$hookmanager->initHooks(['purchasejournallist']);
/* /*
* Actions * Actions
@ -192,7 +192,7 @@ if ($result) {
/* /*
* Show result array * Show result array
*/ */
print "<table class=\"noborder\" width=\"100%\">"; print '<table class="liste noborder centpercent">';
print "<tr class=\"liste_titre\">"; print "<tr class=\"liste_titre\">";
///print "<td>".$langs->trans("JournalNum")."</td>"; ///print "<td>".$langs->trans("JournalNum")."</td>";
print "<td>".$langs->trans("Date")."</td>"; print "<td>".$langs->trans("Date")."</td>";

3
htdocs/compta/journal/sellsjournal.php
View File

@ -57,6 +57,7 @@ if (isModEnabled('comptabilite')) {
if (isModEnabled('accounting')) { if (isModEnabled('accounting')) {
$result = restrictedArea($user, 'accounting', '', '', 'comptarapport'); $result = restrictedArea($user, 'accounting', '', '', 'comptarapport');
} }
$hookmanager->initHooks(['selljournallist']);
/* /*
* Actions * Actions
@ -237,7 +238,7 @@ if ($result) {
*/ */
print '<table class="noborder centpercent">'; print '<table class="liste noborder centpercent">';
print '<tr class="liste_titre">'; print '<tr class="liste_titre">';
//print "<td>".$langs->trans("JournalNum")."</td>"; //print "<td>".$langs->trans("JournalNum")."</td>";
print '<td>'.$langs->trans('Date').'</td><td>'.$langs->trans('Piece').' ('.$langs->trans('InvoiceRef').')</td>'; print '<td>'.$langs->trans('Date').'</td><td>'.$langs->trans('Piece').' ('.$langs->trans('InvoiceRef').')</td>';

4
htdocs/compta/localtax/clients.php
View File

@ -110,7 +110,7 @@ if (empty($local)) {
accessforbidden('Parameter localTaxType is missing'); accessforbidden('Parameter localTaxType is missing');
exit; exit;
} }
$hookmanager->initHooks(['customerlocaltaxlist']);
$calc = 0; $calc = 0;
/* /*
@ -185,7 +185,7 @@ $vatcust = $langs->transcountry($local == 1 ? "LT1" : "LT2", $mysoc->country_cod
$vatsup = $langs->transcountry($local == 1 ? "LT1" : "LT2", $mysoc->country_code); $vatsup = $langs->transcountry($local == 1 ? "LT1" : "LT2", $mysoc->country_code);
print '<div class="div-table-responsive">'; print '<div class="div-table-responsive">';
print '<table class="noborder centpercent">'; print '<table class="liste noborder centpercent">';
// IRPF that the customer has retained me // IRPF that the customer has retained me
if ($calc == 0 || $calc == 2) { if ($calc == 0 || $calc == 2) {

4
htdocs/compta/resultat/clientfourn.php
View File

@ -155,7 +155,7 @@ if (isModEnabled('comptabilite')) {
if (isModEnabled('accounting')) { if (isModEnabled('accounting')) {
$result = restrictedArea($user, 'accounting', '', '', 'comptarapport'); $result = restrictedArea($user, 'accounting', '', '', 'comptarapport');
} }
$hookmanager->initHooks(['customersupplierreportlist']);
/* /*
* View * View
@ -254,7 +254,7 @@ if ($date_endyear) {
$param .= '&date_endyear='.$date_endyear; $param .= '&date_endyear='.$date_endyear;
} }
print '<table class="noborder centpercent">'; print '<table class="liste noborder centpercent">';
print '<tr class="liste_titre">'; print '<tr class="liste_titre">';
if ($modecompta == 'BOOKKEEPING') { if ($modecompta == 'BOOKKEEPING') {

2
htdocs/compta/resultat/result.php
View File

@ -158,7 +158,7 @@ if (isModEnabled('comptabilite')) {
if (isModEnabled('accounting')) { if (isModEnabled('accounting')) {
$result = restrictedArea($user, 'accounting', '', '', 'comptarapport'); $result = restrictedArea($user, 'accounting', '', '', 'comptarapport');
} }
$hookmanager->initHooks(['resultreportlist']);
/* /*
* View * View

2
htdocs/compta/stats/cabyuser.php
View File

@ -46,7 +46,7 @@ if (isModEnabled('comptabilite')) {
if (isModEnabled('accounting')) { if (isModEnabled('accounting')) {
$result = restrictedArea($user, 'accounting', '', '', 'comptarapport'); $result = restrictedArea($user, 'accounting', '', '', 'comptarapport');
} }
$hookmanager->initHooks(['cabyuserreportlist']);
// Define modecompta ('CREANCES-DETTES' or 'RECETTES-DEPENSES') // Define modecompta ('CREANCES-DETTES' or 'RECETTES-DEPENSES')
$modecompta = $conf->global->ACCOUNTING_MODE; $modecompta = $conf->global->ACCOUNTING_MODE;
if (GETPOST("modecompta")) { if (GETPOST("modecompta")) {

2
htdocs/compta/tva/quadri_detail.php
View File

@ -203,7 +203,7 @@ $vatexpensereport = $langs->trans("VATPaid");
// VAT Received and paid // VAT Received and paid
print '<div class="div-table-responsive">'; print '<div class="div-table-responsive">';
print '<table class="noborder centpercent">'; print '<table class="liste noborder centpercent">';
$y = $year_current; $y = $year_current;
$i = 0; $i = 0;

12
htdocs/core/lib/report.lib.php
View File

@ -48,17 +48,13 @@ function report_header($reportname, $notused, $period, $periodlink, $description
$varlink = '?'.$varlink; $varlink = '?'.$varlink;
} }
$head = array(); $title = $langs->trans("Report");
$h = 0; print_barre_liste($title, '', '');
$head[$h][0] = $_SERVER["PHP_SELF"].$varlink; print '<form method="POST" id="searchFormList" action="'.$_SERVER["PHP_SELF"].$varlink.'">'."\n";
$head[$h][1] = $langs->trans("Report");
$head[$h][2] = 'report';
print '<form method="POST" action="'.$_SERVER["PHP_SELF"].$varlink.'">'."\n";
print '<input type="hidden" name="token" value="'.newToken().'">'."\n"; print '<input type="hidden" name="token" value="'.newToken().'">'."\n";
print dol_get_fiche_head($head, 'report'); print dol_get_fiche_head();
foreach ($moreparam as $key => $value) { foreach ($moreparam as $key => $value) {
print '<input type="hidden" name="'.$key.'" value="'.$value.'">'."\n"; print '<input type="hidden" name="'.$key.'" value="'.$value.'">'."\n";