diff --git a/htdocs/compta/accounting-files.php b/htdocs/compta/accounting-files.php
index a06dd8dacaf..3942e7cb6dd 100644
--- a/htdocs/compta/accounting-files.php
+++ b/htdocs/compta/accounting-files.php
@@ -19,11 +19,11 @@
* along with this program. If not, see .
*/
- /**
- * \file htdocs/compta/accounting-files.php
- * \ingroup compta
- * \brief Page to show portoflio and files of a thirdparty and download it
- */
+/**
+ * \file htdocs/compta/accounting-files.php
+ * \ingroup compta
+ * \brief Page to show portoflio and files of a thirdparty and download it
+ */
if ((array_key_exists('action', $_GET) && $_GET['action'] == 'dl') || (array_key_exists('action', $_POST) && $_POST['action'] == 'dl')) { // To not replace token when downloading file
if (!defined('NOTOKENRENEWAL')) {
@@ -499,7 +499,7 @@ if ($result && $action == "dl" && !$error) {
$zip->addFromString('transactions.csv', $log);
$zip->close();
- ///Then download the zipped file.
+ // Then download the zipped file.
header('Content-Type: application/zip');
header('Content-disposition: attachment; filename='.basename($zipname));
header('Content-Length: '.filesize($zipname));
@@ -578,7 +578,7 @@ print '
';
foreach ($listofchoices as $choice => $val) {
if (empty($val['enabled'])) {
- continue; // list not qualified
+ continue; // list not qualified
}
$disabled = '';
if (empty($val['perms'])) {
@@ -588,14 +588,13 @@ foreach ($listofchoices as $choice => $val) {
print '
';
}
-print '';
+print '';
print ''."\n";
print dol_get_fiche_end();
if (!empty($date_start) && !empty($date_stop)) {
- $param = 'action=searchfiles';
$param .= '&date_startday='.GETPOST('date_startday', 'int');
$param .= '&date_startmonth='.GETPOST('date_startmonth', 'int');
$param .= '&date_startyear='.GETPOST('date_startyear', 'int');
@@ -603,25 +602,47 @@ if (!empty($date_start) && !empty($date_stop)) {
$param .= '&date_stopmonth='.GETPOST('date_stopmonth', 'int');
$param .= '&date_stopyear='.GETPOST('date_stopyear', 'int');
foreach ($listofchoices as $choice => $val) {
- $param .= '&'.$choice.'='.(GETPOST($choice, 'int') ? 1 : 0);
+ if (GETPOST($choice, 'int')) {
+ $param .= '&'.$choice.'=1';
+ }
}
- print ''."\n";
+ $param .= '&action=searchfiles';
+
+ /*
+ print '';
+ print '';
+ print '';
+ print '';
+ print '';
+ print '';
+ print '';
+ foreach ($listofchoices as $choice => $val) {
+ print '';
+ }
+
+ print '';
+ print ''."\n";
+ */
print '
';
@@ -645,172 +666,181 @@ if (!empty($date_start) && !empty($date_stop)) {
print ''.$langs->trans("Currency").' | ';
}
print '';
- if ($result) {
- $TData = dol_sort_array($filesarray, $sortfield, $sortorder);
- if (empty($TData)) {
- print '| '.$langs->trans("NoItem").' | ';
- if (!empty($conf->multicurrency->enabled)) {
- print ' | ';
+ if (empty($TData)) {
+ print '
| '.$langs->trans("NoRecordFound").' | ';
+ if (!empty($conf->multicurrency->enabled)) {
+ print ' | ';
+ }
+ print '
';
+ } else {
+ // Sort array by date ASC to calculate balance
+
+ $totalET_debit = 0;
+ $totalIT_debit = 0;
+ $totalVAT_debit = 0;
+ $totalET_credit = 0;
+ $totalIT_credit = 0;
+ $totalVAT_credit = 0;
+
+ // Display array
+ foreach ($TData as $data) {
+ $html_class = '';
+ //if (!empty($data['fk_facture'])) $html_class = 'facid-'.$data['fk_facture'];
+ //elseif (!empty($data['fk_paiement'])) $html_class = 'payid-'.$data['fk_paiement'];
+ print '';
+
+ // Type
+ print '| '.$langs->trans($data['item']).' | ';
+
+ // Date
+ print '';
+ print dol_print_date($data['date'], 'day');
+ print " | \n";
+
+ // Date due
+ print '';
+ print dol_print_date($data['date_due'], 'day');
+ print " | \n";
+
+ // Ref
+ print '';
+
+ if ($data['item'] == 'Invoice') {
+ $invoice->id = $data['id'];
+ $invoice->ref = $data['ref'];
+ $invoice->total_ht = $data['amount_ht'];
+ $invoice->total_ttc = $data['amount_ttc'];
+ $invoice->total_tva = $data['amount_vat'];
+ $invoice->multicurrency_code = $data['currency'];
+ print $invoice->getNomUrl(1, '', 0, 0, '', 0, 0, 0);
+ } elseif ($data['item'] == 'SupplierInvoice') {
+ $supplier_invoice->id = $data['id'];
+ $supplier_invoice->ref = $data['ref'];
+ $supplier_invoice->total_ht = $data['amount_ht'];
+ $supplier_invoice->total_ttc = $data['amount_ttc'];
+ $supplier_invoice->total_tva = $data['amount_vat'];
+ $supplier_invoice->multicurrency_code = $data['currency'];
+ print $supplier_invoice->getNomUrl(1, '', 0, 0, '', 0, 0, 0);
+ } elseif ($data['item'] == 'ExpenseReport') {
+ $expensereport->id = $data['id'];
+ $expensereport->ref = $data['ref'];
+ print $expensereport->getNomUrl(1, 0, 0, '', 0, 0);
+ } elseif ($data['item'] == 'SalaryPayment') {
+ $salary_payment->id = $data['id'];
+ $salary_payment->ref = $data['ref'];
+ print $salary_payment->getNomUrl(1);
+ } elseif ($data['item'] == 'Donation') {
+ $don->id = $data['id'];
+ $don->ref = $data['ref'];
+ print $don->getNomUrl(1, 0, '', 0);
+ } elseif ($data['item'] == 'SocialContributions') {
+ $charge_sociales->id = $data['id'];
+ $charge_sociales->ref = $data['ref'];
+ print $charge_sociales->getNomUrl(1, 0, 0, 0, 0);
+ } elseif ($data['item'] == 'VariousPayment') {
+ $various_payment->id = $data['id'];
+ $various_payment->ref = $data['ref'];
+ print $various_payment->getNomUrl(1, '', 0, 0);
+ } elseif ($data['item'] == 'LoanPayment') {
+ $payment_loan->id = $data['id'];
+ $payment_loan->ref = $data['ref'];
+ print $payment_loan->getNomUrl(1, 0, 0, '', 0);
+ } else {
+ print $data['ref'];
}
- print ' |
';
- } else {
- // Sort array by date ASC to calculate balance
+ print '';
- $totalET_debit = 0;
- $totalIT_debit = 0;
- $totalVAT_debit = 0;
- $totalET_credit = 0;
- $totalIT_credit = 0;
- $totalVAT_credit = 0;
-
- // Display array
- foreach ($TData as $data) {
- $html_class = '';
- //if (!empty($data['fk_facture'])) $html_class = 'facid-'.$data['fk_facture'];
- //elseif (!empty($data['fk_paiement'])) $html_class = 'payid-'.$data['fk_paiement'];
- print '';
-
- // Type
- print '| '.$langs->trans($data['item']).' | ';
-
- // Date
- print '';
- print dol_print_date($data['date'], 'day');
- print " | \n";
-
- // Date due
- print '';
- print dol_print_date($data['date_due'], 'day');
- print " | \n";
-
- // Ref
- print '';
-
- if ($data['item'] == 'Invoice') {
- $invoice->id = $data['id'];
- $invoice->ref = $data['ref'];
- $invoice->total_ht = $data['amount_ht'];
- $invoice->total_ttc = $data['amount_ttc'];
- $invoice->total_tva = $data['amount_vat'];
- $invoice->multicurrency_code = $data['currency'];
- print $invoice->getNomUrl(1, '', 0, 0, '', 0, 0, 0);
- } elseif ($data['item'] == 'SupplierInvoice') {
- $supplier_invoice->id = $data['id'];
- $supplier_invoice->ref = $data['ref'];
- $supplier_invoice->total_ht = $data['amount_ht'];
- $supplier_invoice->total_ttc = $data['amount_ttc'];
- $supplier_invoice->total_tva = $data['amount_vat'];
- $supplier_invoice->multicurrency_code = $data['currency'];
- print $supplier_invoice->getNomUrl(1, '', 0, 0, '', 0, 0, 0);
- } elseif ($data['item'] == 'ExpenseReport') {
- $expensereport->id = $data['id'];
- $expensereport->ref = $data['ref'];
- print $expensereport->getNomUrl(1, 0, 0, '', 0, 0);
- } elseif ($data['item'] == 'SalaryPayment') {
- $salary_payment->id = $data['id'];
- $salary_payment->ref = $data['ref'];
- print $salary_payment->getNomUrl(1);
- } elseif ($data['item'] == 'Donation') {
- $don->id = $data['id'];
- $don->ref = $data['ref'];
- print $don->getNomUrl(1, 0, '', 0);
- } elseif ($data['item'] == 'SocialContributions') {
- $charge_sociales->id = $data['id'];
- $charge_sociales->ref = $data['ref'];
- print $charge_sociales->getNomUrl(1, 0, 0, 0, 0);
- } elseif ($data['item'] == 'VariousPayment') {
- $various_payment->id = $data['id'];
- $various_payment->ref = $data['ref'];
- print $various_payment->getNomUrl(1, '', 0, 0);
- } elseif ($data['item'] == 'LoanPayment') {
- $payment_loan->id = $data['id'];
- $payment_loan->ref = $data['ref'];
- print $payment_loan->getNomUrl(1, 0, 0, '', 0);
- } else {
- print $data['ref'];
- }
- print ' | ';
-
- // File link
- print '';
- if (!empty($data['files'])) {
- foreach ($data['files'] as $id => $filecursor) {
- print ''.($filecursor['name'] ? $filecursor['name'] : $filecursor['ref']).' '.$formfile->showPreview($filecursor, $filecursor['modulepart'], $filecursor['subdir'].'/'.$filecursor['name']).'
';
+ // File link
+ print ' | ';
+ if (!empty($data['files'])) {
+ foreach ($data['files'] as $id => $filecursor) {
+ $tmppreview = $formfile->showPreview($filecursor, $filecursor['modulepart'], $filecursor['subdir'].'/'.$filecursor['name'], 0);
+ if ($tmppreview) {
+ print $tmppreview;
}
+ $filename = ($filecursor['name'] ? $filecursor['name'] : $filecursor['ref']);
+ print '';
+ if (empty($tmppreview)) {
+ print img_picto('', 'generic', '', false, 0, 0, '', 'pictonopreview pictofixedwidth paddingright');
+ }
+ print $filename;
+ print '
';
}
- print " | \n";
+ }
+ print "\n";
- // Paid
- print ''.$data['paid'].' | ';
+ // Paid
+ print ''.($data['paid'] ? yn($data['paid']) : '').' | ';
- // Total ET
- print ''.price(price2num($data['sens'] ? $data['amount_ht'] : -$data['amount_ht'], 'MT'))." | \n";
- // Total IT
- print ''.price(price2num($data['sens'] ? $data['amount_ttc'] : -$data['amount_ttc'], 'MT'))." | \n";
- // Total VAT
- print ''.price(price2num($data['sens'] ? $data['amount_vat'] : -$data['amount_vat'], 'MT'))." | \n";
+ // Total ET
+ print ''.price(price2num($data['sens'] ? $data['amount_ht'] : -$data['amount_ht'], 'MT'))." | \n";
+ // Total IT
+ print ''.price(price2num($data['sens'] ? $data['amount_ttc'] : -$data['amount_ttc'], 'MT'))." | \n";
+ // Total VAT
+ print ''.price(price2num($data['sens'] ? $data['amount_vat'] : -$data['amount_vat'], 'MT'))." | \n";
- print ''.dol_escape_htmltag($data['thirdparty_name'])." | \n";
+ print ''.dol_escape_htmltag($data['thirdparty_name'])." | \n";
- print ''.$data['thirdparty_code']." | \n";
+ print ''.$data['thirdparty_code']." | \n";
- print ''.$data['country_code']." | \n";
+ print ''.$data['country_code']." | \n";
- print ''.dol_escape_htmltag($data['vatnum'])." | \n";
+ // VAT number
+ print ''.dol_escape_htmltag($data['vatnum'])." | \n";
- if ($data['sens']) {
- $totalET_credit += $data['amount_ht'];
- $totalIT_credit += $data['amount_ttc'];
- $totalVAT_credit += $data['amount_vat'];
- } else {
- $totalET_debit -= $data['amount_ht'];
- $totalIT_debit -= $data['amount_ttc'];
- $totalVAT_debit -= $data['amount_vat'];
- }
-
- if (!empty($conf->multicurrency->enabled)) {
- print ''.$data['currency']." | \n";
- }
-
- print "
\n";
+ if ($data['sens']) {
+ $totalET_credit += $data['amount_ht'];
+ $totalIT_credit += $data['amount_ttc'];
+ $totalVAT_credit += $data['amount_vat'];
+ } else {
+ $totalET_debit -= $data['amount_ht'];
+ $totalIT_debit -= $data['amount_ttc'];
+ $totalVAT_debit -= $data['amount_vat'];
}
- // Total credits
- print '';
- print '| '.$langs->trans('Total').' '.$langs->trans('Income').' | ';
- print ''.price(price2num($totalET_credit, 'MT')).' | ';
- print ''.price(price2num($totalIT_credit, 'MT')).' | ';
- print ''.price(price2num($totalVAT_credit, 'MT')).' | ';
- print ' | ';
if (!empty($conf->multicurrency->enabled)) {
- print ' | ';
- }
- print "
\n";
- // Total debits
- print '';
- print '| '.$langs->trans('Total').' '.$langs->trans('Outcome').' | ';
- print ''.price(price2num($totalET_debit, 'MT')).' | ';
- print ''.price(price2num($totalIT_debit, 'MT')).' | ';
- print ''.price(price2num($totalVAT_debit, 'MT')).' | ';
- print ' | ';
- if (!empty($conf->multicurrency->enabled)) {
- print ' | ';
- }
- print "
\n";
- // Balance
- print '';
- print '| '.$langs->trans('Total').' | ';
- print ''.price(price2num($totalET_credit + $totalET_debit, 'MT')).' | ';
- print ''.price(price2num($totalIT_credit + $totalIT_debit, 'MT')).' | ';
- print ''.price(price2num($totalVAT_credit + $totalVAT_debit, 'MT')).' | ';
- print ' | ';
- if (!empty($conf->multicurrency->enabled)) {
- print ' | ';
+ print ''.$data['currency']." | \n";
}
+
print "
\n";
}
+
+ // Total credits
+ print '';
+ print '| '.$langs->trans('Total').' '.$langs->trans('Income').' | ';
+ print ''.price(price2num($totalET_credit, 'MT')).' | ';
+ print ''.price(price2num($totalIT_credit, 'MT')).' | ';
+ print ''.price(price2num($totalVAT_credit, 'MT')).' | ';
+ print ' | ';
+ if (!empty($conf->multicurrency->enabled)) {
+ print ' | ';
+ }
+ print "
\n";
+ // Total debits
+ print '';
+ print '| '.$langs->trans('Total').' '.$langs->trans('Outcome').' | ';
+ print ''.price(price2num($totalET_debit, 'MT')).' | ';
+ print ''.price(price2num($totalIT_debit, 'MT')).' | ';
+ print ''.price(price2num($totalVAT_debit, 'MT')).' | ';
+ print ' | ';
+ if (!empty($conf->multicurrency->enabled)) {
+ print ' | ';
+ }
+ print "
\n";
+ // Balance
+ print '';
+ print '| '.$langs->trans('Total').' | ';
+ print ''.price(price2num($totalET_credit + $totalET_debit, 'MT')).' | ';
+ print ''.price(price2num($totalIT_credit + $totalIT_debit, 'MT')).' | ';
+ print ''.price(price2num($totalVAT_credit + $totalVAT_debit, 'MT')).' | ';
+ print ' | ';
+ if (!empty($conf->multicurrency->enabled)) {
+ print ' | ';
+ }
+ print "
\n";
}
+
print "";
print '';
}