';
- if (!empty($conf->propal->enabled))
+ if (!empty($conf->propal->enabled) && $user->rights->propal->lire)
{
// Box proposals
$tmp = $object->getOutstandingProposals();
@@ -600,7 +600,7 @@ if ($object->id > 0)
if ($link) $boxstat .= '';
}
- if (!empty($conf->commande->enabled))
+ if (!empty($conf->commande->enabled) && $user->rights->commande->lire)
{
// Box commandes
$tmp = $object->getOutstandingOrders();
@@ -618,7 +618,7 @@ if ($object->id > 0)
if ($link) $boxstat .= '';
}
- if (!empty($conf->facture->enabled))
+ if (!empty($conf->facture->enabled) && $user->rights->facture->lire)
{
// Box factures
$tmp = $object->getOutstandingBills();
diff --git a/htdocs/comm/mailing/index.php b/htdocs/comm/mailing/index.php
index 61187f2e647..6b765d9451f 100644
--- a/htdocs/comm/mailing/index.php
+++ b/htdocs/comm/mailing/index.php
@@ -157,6 +157,7 @@ print '';
$limit = 10;
$sql = "SELECT m.rowid, m.titre, m.nbemail, m.statut, m.date_creat";
$sql .= " FROM ".MAIN_DB_PREFIX."mailing as m";
+$sql .= " WHERE m.entity = ".$conf->entity;
$sql .= " ORDER BY m.date_creat DESC";
$sql .= " LIMIT ".$limit;
$result = $db->query($sql);
diff --git a/htdocs/comm/propal/list.php b/htdocs/comm/propal/list.php
index 9801ab8d52a..76914e2c13a 100644
--- a/htdocs/comm/propal/list.php
+++ b/htdocs/comm/propal/list.php
@@ -499,7 +499,7 @@ if ($resql)
print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, 'propal', 0, $newcardbutton, '', $limit, 0, 0, 1);
$topicmail = "SendPropalRef";
- $modelmail = "proposal_send";
+ $modelmail = "propal_send";
$objecttmp = new Propal($db);
$trackid = 'pro'.$object->id;
include DOL_DOCUMENT_ROOT.'/core/tpl/massactions_pre.tpl.php';
diff --git a/htdocs/compta/accounting-files.php b/htdocs/compta/accounting-files.php
index 471637461f6..f9bc453d999 100644
--- a/htdocs/compta/accounting-files.php
+++ b/htdocs/compta/accounting-files.php
@@ -2,6 +2,7 @@
/* Copyright (C) 2001-2006 Rodolphe Quiedeville
* Copyright (C) 2004-2019 Laurent Destailleur
* Copyright (C) 2017 Pierre-Henry Favre
+ * Copyright (C) 2020 Maxime DEMAREST
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -37,8 +38,16 @@ require_once DOL_DOCUMENT_ROOT.'/compta/sociales/class/chargesociales.class.php'
require_once DOL_DOCUMENT_ROOT.'/don/class/don.class.php';
require_once DOL_DOCUMENT_ROOT.'/expensereport/class/expensereport.class.php';
require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.facture.class.php';
+require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.facture.class.php';
+require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/paymentvarious.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php';
+require_once DOL_DOCUMENT_ROOT.'/loan/class/paymentloan.class.php';
-$langs->loadLangs(array("accountancy", "bills", "companies", "salaries", "compta", "trips"));
+// Constant to define payment sens
+const PAY_DEBIT = 0;
+const PAY_CREDIT = 1;
+
+$langs->loadLangs(array("accountancy", "bills", "companies", "salaries", "compta", "trips", "banks", "loan"));
$date_start = GETPOST('date_start', 'alpha');
$date_startDay = GETPOST('date_startday', 'int');
@@ -140,7 +149,7 @@ if (($action == 'searchfiles' || $action == 'dl')) {
// Customer invoices
if (GETPOST('selectinvoices')) {
if (!empty($sql)) $sql .= " UNION ALL";
- $sql .= "SELECT t.rowid as id, t.entity, t.ref, t.paye as paid, t.total as total_ht, t.total_ttc, t.tva as total_vat, t.fk_soc, t.datef as date, t.date_lim_reglement as date_due, 'Invoice' as item, s.nom as thirdparty_name, s.code_client as thirdparty_code, c.code as country_code, s.tva_intra as vatnum";
+ $sql .= "SELECT t.rowid as id, t.entity, t.ref, t.paye as paid, t.total as total_ht, t.total_ttc, t.tva as total_vat, t.fk_soc, t.datef as date, t.date_lim_reglement as date_due, 'Invoice' as item, s.nom as thirdparty_name, s.code_client as thirdparty_code, c.code as country_code, s.tva_intra as vatnum, ".PAY_CREDIT." as sens";
$sql .= " FROM ".MAIN_DB_PREFIX."facture as t LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON s.rowid = t.fk_soc LEFT JOIN ".MAIN_DB_PREFIX."c_country as c ON c.rowid = s.fk_pays";
$sql .= " WHERE datef between ".$wheretail;
$sql .= " AND t.entity IN (".($entity == 1 ? '0,1' : $entity).')';
@@ -149,7 +158,7 @@ if (($action == 'searchfiles' || $action == 'dl')) {
// Vendor invoices
if (GETPOST('selectsupplierinvoices')) {
if (!empty($sql)) $sql .= " UNION ALL";
- $sql .= " SELECT t.rowid as id, t.entity, t.ref, t.paye as paid, t.total_ht, t.total_ttc, t.total_tva as total_vat, t.fk_soc, t.datef as date, t.date_lim_reglement as date_due, 'SupplierInvoice' as item, s.nom as thirdparty_name, s.code_fournisseur as thirdparty_code, c.code as country_code, s.tva_intra as vatnum";
+ $sql .= " SELECT t.rowid as id, t.entity, t.ref, t.paye as paid, t.total_ht, t.total_ttc, t.total_tva as total_vat, t.fk_soc, t.datef as date, t.date_lim_reglement as date_due, 'SupplierInvoice' as item, s.nom as thirdparty_name, s.code_fournisseur as thirdparty_code, c.code as country_code, s.tva_intra as vatnum, ".PAY_DEBIT." as sens";
$sql .= " FROM ".MAIN_DB_PREFIX."facture_fourn as t LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON s.rowid = t.fk_soc LEFT JOIN ".MAIN_DB_PREFIX."c_country as c ON c.rowid = s.fk_pays";
$sql .= " WHERE datef between ".$wheretail;
$sql .= " AND t.entity IN (".($entity == 1 ? '0,1' : $entity).')';
@@ -158,7 +167,7 @@ if (($action == 'searchfiles' || $action == 'dl')) {
// Expense reports
if (GETPOST('selectexpensereports')) {
if (!empty($sql)) $sql .= " UNION ALL";
- $sql .= " SELECT t.rowid as id, t.entity, t.ref, t.paid, t.total_ht, t.total_ttc, t.total_tva as total_vat, t.fk_user_author as fk_soc, t.date_fin as date, t.date_fin as date_due, 'ExpenseReport' as item, CONCAT(CONCAT(u.lastname, ' '), u.firstname) as thirdparty_name, '' as thirdparty_code, c.code as country_code, '' as vatnum";
+ $sql .= " SELECT t.rowid as id, t.entity, t.ref, t.paid, t.total_ht, t.total_ttc, t.total_tva as total_vat, t.fk_user_author as fk_soc, t.date_fin as date, t.date_fin as date_due, 'ExpenseReport' as item, CONCAT(CONCAT(u.lastname, ' '), u.firstname) as thirdparty_name, '' as thirdparty_code, c.code as country_code, '' as vatnum, ".PAY_DEBIT." as sens";
$sql .= " FROM ".MAIN_DB_PREFIX."expensereport as t LEFT JOIN ".MAIN_DB_PREFIX."user as u ON u.rowid = t.fk_user_author LEFT JOIN ".MAIN_DB_PREFIX."c_country as c ON c.rowid = u.fk_country";
$sql .= " WHERE date_fin between ".$wheretail;
$sql .= " AND t.entity IN (".($entity == 1 ? '0,1' : $entity).')';
@@ -167,7 +176,7 @@ if (($action == 'searchfiles' || $action == 'dl')) {
// Donations
if (GETPOST('selectdonations')) {
if (!empty($sql)) $sql .= " UNION ALL";
- $sql .= " SELECT t.rowid as id, t.entity, t.ref, paid, amount as total_ht, amount as total_ttc, 0 as total_vat, 0 as fk_soc, t.datedon as date, t.datedon as date_due, 'Donation' as item, t.societe as thirdparty_name, '' as thirdparty_code, c.code as country_code, '' as vatnum";
+ $sql .= " SELECT t.rowid as id, t.entity, t.ref, paid, amount as total_ht, amount as total_ttc, 0 as total_vat, 0 as fk_soc, t.datedon as date, t.datedon as date_due, 'Donation' as item, t.societe as thirdparty_name, '' as thirdparty_code, c.code as country_code, '' as vatnum, ".PAY_CREDIT." as sens";
$sql .= " FROM ".MAIN_DB_PREFIX."don as t LEFT JOIN ".MAIN_DB_PREFIX."c_country as c ON c.rowid = t.fk_country";
$sql .= " WHERE datedon between ".$wheretail;
$sql .= " AND t.entity IN (".($entity == 1 ? '0,1' : $entity).')';
@@ -176,7 +185,7 @@ if (($action == 'searchfiles' || $action == 'dl')) {
// Paiements of salaries
if (GETPOST('selectpaymentsofsalaries')) {
if (!empty($sql)) $sql .= " UNION ALL";
- $sql .= " SELECT t.rowid as id, t.entity, t.ref as ref, 1 as paid, amount as total_ht, amount as total_ttc, 0 as total_vat, t.fk_user as fk_soc, t.datep as date, t.dateep as date_due, 'SalaryPayment' as item, CONCAT(CONCAT(u.lastname, ' '), u.firstname) as thirdparty_name, '' as thirdparty_code, c.code as country_code, '' as vatnum";
+ $sql .= " SELECT t.rowid as id, t.entity, t.label as ref, 1 as paid, amount as total_ht, amount as total_ttc, 0 as total_vat, t.fk_user as fk_soc, t.datep as date, t.dateep as date_due, 'SalaryPayment' as item, CONCAT(CONCAT(u.lastname, ' '), u.firstname) as thirdparty_name, '' as thirdparty_code, c.code as country_code, '' as vatnum, ".PAY_DEBIT." as sens";
$sql .= " FROM ".MAIN_DB_PREFIX."payment_salary as t LEFT JOIN ".MAIN_DB_PREFIX."user as u ON u.rowid = t.fk_user LEFT JOIN ".MAIN_DB_PREFIX."c_country as c ON c.rowid = u.fk_country";
$sql .= " WHERE datep between ".$wheretail;
$sql .= " AND t.entity IN (".($entity == 1 ? '0,1' : $entity).')';
@@ -185,12 +194,28 @@ if (($action == 'searchfiles' || $action == 'dl')) {
// Social contributions
if (GETPOST('selectsocialcontributions')) {
if (!empty($sql)) $sql .= " UNION ALL";
- $sql .= " SELECT t.rowid as id, t.entity, t.libelle as ref, t.paye as paid, t.amount as total_ht, t.amount as total_ttc, 0 as total_tva, 0 as fk_soc, t.date_creation as date, t.date_ech as date_due, 'SocialContributions' as item, '' as thirdparty_name, '' as thirdparty_code, '' as country_code, '' as vatnum";
+ $sql .= " SELECT t.rowid as id, t.entity, t.libelle as ref, t.paye as paid, t.amount as total_ht, t.amount as total_ttc, 0 as total_tva, 0 as fk_soc, t.date_ech as date, t.periode as date_due, 'SocialContributions' as item, '' as thirdparty_name, '' as thirdparty_code, '' as country_code, '' as vatnum, ".PAY_DEBIT." as sens";
$sql .= " FROM ".MAIN_DB_PREFIX."chargesociales as t";
- $sql .= " WHERE date_creation between ".$wheretail;
+ $sql .= " WHERE t.date_ech between ".$wheretail;
$sql .= " AND t.entity IN (".($entity == 1 ? '0,1' : $entity).')';
//$sql.=" AND fk_statut <> ".ChargeSociales::STATUS_DRAFT;
}
+ // Various payments
+ if (GETPOST('selectvariouspayment')) {
+ if (!empty($sql)) $sql .= " UNION ALL";
+ $sql .= " SELECT t.rowid as id, t.entity, t.label as ref, 1 as paid, t.amount as total_ht, t.amount as total_ttc, 0 as total_tva, 0 as fk_soc, t.datep as date, t.datep as date_due, 'VariousPayment' as item, '' as thirdparty_name, '' as thirdparty_code, '' as country_code, '' as vatnum, sens";
+ $sql .= " FROM ".MAIN_DB_PREFIX."payment_various as t";
+ $sql .= " WHERE datep between ".$wheretail;
+ $sql .= " AND t.entity IN (".($entity == 1 ? '0,1' : $entity).')';
+ }
+ // Loan payments
+ if (GETPOST('selectloanspayment')) {
+ if (!empty($sql)) $sql .= " UNION ALL";
+ $sql .= " SELECT t.rowid as id, l.entity, l.label as ref, 1 as paid, (t.amount_capital+t.amount_insurance+t.amount_interest) as total_ht, (t.amount_capital+t.amount_insurance+t.amount_interest) as total_ttc, 0 as total_tva, 0 as fk_soc, t.datep as date, t.datep as date_due, 'LoanPayment' as item, '' as thirdparty_name, '' as thirdparty_code, '' as country_code, '' as vatnum, ".PAY_DEBIT." as sens";
+ $sql .= " FROM ".MAIN_DB_PREFIX."payment_loan as t LEFT JOIN ".MAIN_DB_PREFIX."loan as l ON l.rowid = t.fk_loan";
+ $sql .= " WHERE datep between ".$wheretail;
+ $sql .= " AND l.entity IN (".($entity == 1 ? '0,1' : $entity).')';
+ }
if ($sql) {
$sql .= $db->order($sortfield, $sortorder);
@@ -221,6 +246,7 @@ if (($action == 'searchfiles' || $action == 'dl')) {
$subdir .= ($subdir ? '/' : '').dol_sanitizeFileName($objd->ref);
$upload_dir = $conf->facture->dir_output.'/'.$subdir;
$link = "document.php?modulepart=facture&file=".str_replace('/', '%2F', $subdir).'%2F';
+ $modulepart = "facture";
break;
case "SupplierInvoice":
$tmpinvoicesupplier->fetch($objd->id);
@@ -228,18 +254,21 @@ if (($action == 'searchfiles' || $action == 'dl')) {
$subdir .= ($subdir ? '/' : '').dol_sanitizeFileName($objd->ref);
$upload_dir = $conf->fournisseur->facture->dir_output.'/'.$subdir;
$link = "document.php?modulepart=facture_fournisseur&file=".str_replace('/', '%2F', $subdir).'%2F';
+ $modulepart = "facture_fournisseur";
break;
case "ExpenseReport":
$subdir = '';
$subdir .= ($subdir ? '/' : '').dol_sanitizeFileName($objd->ref);
$upload_dir = $conf->expensereport->dir_output.'/'.$subdir;
$link = "document.php?modulepart=expensereport&file=".str_replace('/', '%2F', $subdir).'%2F';
+ $modulepart = "expensereport";
break;
case "SalaryPayment":
$subdir = '';
$subdir .= ($subdir ? '/' : '').dol_sanitizeFileName($objd->id);
$upload_dir = $conf->salaries->dir_output.'/'.$subdir;
$link = "document.php?modulepart=salaries&file=".str_replace('/', '%2F', $subdir).'%2F';
+ $modulepart = "salaries";
break;
case "Donation":
$tmpdonation->fetch($objp->id);
@@ -247,12 +276,28 @@ if (($action == 'searchfiles' || $action == 'dl')) {
$subdir .= ($subdir ? '/' : '').dol_sanitizeFileName($objd->id);
$upload_dir = $conf->don->dir_output.'/'.$subdir;
$link = "document.php?modulepart=don&file=".str_replace('/', '%2F', $subdir).'%2F';
+ $modulepart = "don";
break;
case "SocialContributions":
$subdir = '';
$subdir .= ($subdir ? '/' : '').dol_sanitizeFileName($objd->id);
$upload_dir = $conf->tax->dir_output.'/'.$subdir;
$link = "document.php?modulepart=tax&file=".str_replace('/', '%2F', $subdir).'%2F';
+ $modulepart = "tax";
+ break;
+ case "VariousPayment":
+ $subdir = '';
+ $subdir .= ($subdir ? '/' : '').dol_sanitizeFileName($objd->id);
+ $upload_dir = $conf->bank->dir_output.'/'.$subdir;
+ $link = "document.php?modulepart=banque&file=".str_replace('/', '%2F', $subdir).'%2F';
+ $modulepart = "banque";
+ break;
+ case "LoanPayment":
+ // Loan payment has no linked file
+ $subdir = '';
+ $upload_dir = $conf->loan->dir_output.'/'.$subdir;
+ $link = "";
+ $modulepart = "";
break;
default:
$subdir = '';
@@ -286,6 +331,7 @@ if (($action == 'searchfiles' || $action == 'dl')) {
$nofile['thirdparty_code'] = $objd->thirdparty_code;
$nofile['country_code'] = $objd->country_code;
$nofile['vatnum'] = $objd->vatnum;
+ $nofile['sens'] = $objd->sens;
$filesarray[$nofile['item'].'_'.$nofile['id']] = $nofile;
}
@@ -304,11 +350,11 @@ if (($action == 'searchfiles' || $action == 'dl')) {
$file['ref'] = ($objd->ref ? $objd->ref : $objd->id);
$file['fk'] = $objd->fk_soc;
$file['item'] = $objd->item;
-
$file['thirdparty_name'] = $objd->thirdparty_name;
$file['thirdparty_code'] = $objd->thirdparty_code;
$file['country_code'] = $objd->country_code;
$file['vatnum'] = $objd->vatnum;
+ $file['sens'] = $objd->sens;
// Save record into array (only the first time it is found)
if (empty($filesarray[$file['item'].'_'.$file['id']])) {
@@ -319,7 +365,16 @@ if (($action == 'searchfiles' || $action == 'dl')) {
if (empty($filesarray[$file['item'].'_'.$file['id']]['files'])) {
$filesarray[$file['item'].'_'.$file['id']]['files'] = array();
}
- $filesarray[$file['item'].'_'.$file['id']]['files'][] = array('link' => $link.$file['name'], 'name'=>$file['name'], 'ref'=>$file['ref'], 'fullname' => $file['fullname'], 'relpathnamelang' => $langs->trans($file['item']).'/'.$file['name']);
+ $filesarray[$file['item'].'_'.$file['id']]['files'][] = array(
+ 'link' => $link.urlencode($file['name']),
+ 'name'=>$file['name'],
+ 'ref'=>$file['ref'],
+ 'fullname' => $file['fullname'],
+ 'relpath' => '/'.$file['name'],
+ 'relpathnamelang' => $langs->trans($file['item']).'/'.$file['name'],
+ 'modulepart' => $modulepart,
+ 'subdir' => $subdir,
+ );
//var_dump($file['item'].'_'.$file['id']);
//var_dump($filesarray[$file['item'].'_'.$file['id']]['files']);
}
@@ -383,7 +438,8 @@ if ($result && $action == "dl" && !$error)
$log .= ','.$langs->transnoentitiesnoconv("ThirdParty");
$log .= ','.$langs->transnoentitiesnoconv("Code");
$log .= ','.$langs->transnoentitiesnoconv("Country");
- $log .= ','.$langs->transnoentitiesnoconv("VATIntra")."\n";
+ $log .= ','.$langs->transnoentitiesnoconv("VATIntra");
+ $log .= ','.$langs->transnoentitiesnoconv("Sens")."\n";
$zipname = $dirfortmpfile.'/'.dol_print_date($date_start, 'dayrfc')."-".dol_print_date($date_stop, 'dayrfc').'_export.zip';
dol_delete_file($zipname);
@@ -394,11 +450,13 @@ if ($result && $action == "dl" && !$error)
{
foreach ($filesarray as $key => $file)
{
- foreach ($file['files'] as $filecursor) {
- if (file_exists($filecursor["fullname"])) {
- $zip->addFile($filecursor["fullname"], $filecursor["relpathnamelang"]);
- }
- }
+ if (!empty($file['files'])) {
+ foreach ($file['files'] as $filecursor) {
+ if (file_exists($filecursor["fullname"])) {
+ $zip->addFile($filecursor["fullname"], $filecursor["relpathnamelang"]);
+ }
+ }
+ }
$log .= '"'.$langs->trans($file['item']).'"';
if (!empty($conf->multicompany->enabled) && is_object($mc))
@@ -418,6 +476,7 @@ if ($result && $action == "dl" && !$error)
$log .= ',"'.$file['thirdparty_code'].'"';
$log .= ',"'.$file['country_code'].'"';
$log .= ',"'.$file['vatnum'].'"';
+ $log .= ',"'.$file['sens'].'"';
$log .= "\n";
}
$zip->addFromString('transactions.csv', $log);
@@ -444,10 +503,17 @@ if ($result && $action == "dl" && !$error)
* View
*/
-$form = new Form($db);
+$form = new form($db);
+$formfile = new FormFile($db);
$userstatic = new User($db);
$invoice = new Facture($db);
$supplier_invoice = new FactureFournisseur($db);
+$expensereport = new ExpenseReport($db);
+$don = new Don($db);
+$salary_payment = new PaymentSalary($db);
+$charge_sociales = new ChargeSociales($db);
+$various_payment = new PaymentVarious($db);
+$payment_loan = new PaymentLoan($db);
$title = $langs->trans("ComptaFiles").' - '.$langs->trans("List");
$help_url = '';
@@ -492,7 +558,9 @@ $listofchoices = array(
'selectexpensereports'=>array('label'=>'ExpenseReports', 'lang'=>'trips'),
'selectdonations'=>array('label'=>'Donations', 'lang'=>'donation'),
'selectpaymentsofsalaries'=>array('label'=>'SalariesPayments', 'lang'=>'salaries'),
- 'selectsocialcontributions'=>array('label'=>'SocialContributions')
+ 'selectsocialcontributions'=>array('label'=>'SocialContributions'),
+ 'selectvariouspayment'=>array('label'=>'VariousPayment'),
+ 'selectloanspayment'=>array('label'=>'PaymentLoan'),
);
foreach ($listofchoices as $choice => $val) {
$checked = (((!GETPOSTISSET('search') && $action != 'searchfiles') || GETPOST($choice)) ? ' checked="checked"' : '');
@@ -562,11 +630,12 @@ if (!empty($date_start) && !empty($date_stop))
{
// Sort array by date ASC to calculate balance
- $totalET = 0;
- $totalIT = 0;
- $totalVAT = 0;
- $totalDebit = 0;
- $totalCredit = 0;
+ $totalET_debit = 0;
+ $totalIT_debit = 0;
+ $totalVAT_debit = 0;
+ $totalET_credit = 0;
+ $totalIT_credit = 0;
+ $totalVAT_credit = 0;
// Display array
foreach ($TData as $data)
@@ -592,25 +661,49 @@ if (!empty($date_start) && !empty($date_stop))
// Ref
print '';
- if ($data['item'] == 'Invoice') {
- $invoice->id = $data['id'];
+ if ($data['item'] == 'Invoice') {
+ $invoice->id = $data['id'];
$invoice->ref = $data['ref'];
print $invoice->getNomUrl(1, '', 0, 0, '', 0, 0, 0);
- } elseif ($data['item'] == 'SupplierInvoice') {
+ } elseif ($data['item'] == 'SupplierInvoice') {
$supplier_invoice->id = $data['id'];
$supplier_invoice->ref = $data['ref'];
print $supplier_invoice->getNomUrl(1, '', 0, 0, '', 0, 0, 0);
- } else {
+ } elseif ($data['item'] == 'ExpenseReport') {
+ $expensereport->id = $data['id'];
+ $expensereport->ref = $data['ref'];
+ print $expensereport->getNomUrl(1, '', 0, 0, '', 0, 0, 0);
+ } elseif ($data['item'] == 'SalaryPayment') {
+ $salary_payment->id = $data['id'];
+ $salary_payment->ref = $data['ref'];
+ print $salary_payment->getNomUrl(1, '', 0, 0, '', 0, 0, 0);
+ } elseif ($data['item'] == 'Donation') {
+ $don->id = $data['id'];
+ $don->ref = $data['ref'];
+ print $don->getNomUrl(1, '', 0, 0, '', 0, 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, 0);
+ } elseif ($data['item'] == 'VariousPayment') {
+ $various_payment->id = $data['id'];
+ $various_payment->ref = $data['ref'];
+ print $various_payment->getNomUrl(1, '', 0, 0, '', 0, 0, 0);
+ } elseif ($data['item'] == 'LoanPayment') {
+ $payment_loan->id = $data['id'];
+ $payment_loan->ref = $data['ref'];
+ print $payment_loan->getNomUrl(1, '', 0, 0, '', 0, 0, 0);
+ } else {
print $data['ref'];
- }
+ }
print ' | ';
// File link
print '';
if (!empty($data['files']))
{
- foreach ($data['files'] as $filecursor) {
- print ''.($filecursor['name'] ? $filecursor['name'] : $filecursor['ref']).'
';
+ foreach ($data['files'] as $id=>$filecursor) {
+ print ''.($filecursor['name'] ? $filecursor['name'] : $filecursor['ref']).' '.$formfile->showPreview($filecursor, $filecursor['modulepart'], $filecursor['subdir'].'/'.$filecursor['name']).'
';
}
}
print " | \n";
@@ -619,11 +712,11 @@ if (!empty($date_start) && !empty($date_stop))
print ''.$data['paid'].' | ';
// Total ET
- print ''.price($data['amount_ht'])." | \n";
+ print ''.price($data['sens']?$data['amount_ht']:-$data['amount_ht'])." | \n";
// Total IT
- print ''.price($data['amount_ttc'])." | \n";
+ print ''.price($data['sens']?$data['amount_ttc']:-$data['amount_ttc'])." | \n";
// Total VAT
- print ''.price($data['amount_vat'])." | \n";
+ print ''.price($data['sens']?$data['amount_vat']:-$data['amount_vat'])." | \n";
print ''.$data['thirdparty_name']." | \n";
@@ -633,42 +726,42 @@ if (!empty($date_start) && !empty($date_stop))
print ''.$data['vatnum']." | \n";
- // Debit
- //print ''.(($data['amount_ttc'] > 0) ? price(abs($data['amount_ttc'])) : '')." | \n";
- // Credit
- //print ''.(($data['amount_ttc'] > 0) ? '' : price(abs($data['amount_ttc'])))." | \n";
-
- $totalET += $data['amount_ht'];
- $totalIT += $data['amount_ttc'];
- $totalVAT += $data['amount_vat'];
-
- $totalDebit += ($data['amount_ttc'] > 0) ? abs($data['amount_ttc']) : 0;
- $totalCredit += ($data['amount_ttc'] > 0) ? 0 : abs($data['amount_ttc']);
-
- // Balance
- //print ''.price($data['balance'])." | \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'];
+ }
print " |
\n";
}
+ // Total credits
print '
';
@@ -306,16 +303,16 @@ class Dolistore
//.'