Skip to content

Commit

Permalink
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into d…
Browse files Browse the repository at this point in the history 
…evelop
  • Loading branch information
@eldy
eldy committed Apr 6, 2017
2 parents a99a4be + 07bbf1a commit 915a74a
Show file tree
Hide file tree
Showing 2 changed files with 150 additions and 2 deletions.
140 changes: 138 additions & 2 deletions htdocs/compta/bank/releve.php
View file
Expand Up @@ -3,6 +3,7 @@
* Copyright (C) 2004-2015 Laurent Destailleur <eldy@users.sourceforge.net>
* Copyright (C) 2005-2013 Regis Houssin <regis.houssin@capnetworks.com>
* Copyright (C) 2015 Jean-François Ferry <jfefe@aternatik.fr>
* Copyright (C) 2017 Patrick Delcroix <pmpdelcroix@gmail.com>
*
* 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
Expand Down Expand Up @@ -34,6 +35,9 @@
require_once DOL_DOCUMENT_ROOT.'/fourn/class/paiementfourn.class.php';
require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
require_once DOL_DOCUMENT_ROOT.'/compta/paiement/cheque/class/remisecheque.class.php';
//show files
require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
require_once DOL_DOCUMENT_ROOT.'/core/lib/functions.lib.php';

$langs->load("banks");
$langs->load("categories");
Expand Down Expand Up @@ -88,7 +92,36 @@

// Initialize technical object to manage context to save list fields
$contextpage='banktransactionlist'.(empty($object->ref)?'':'-'.$object->id);

/*
*ZIP creation
*/
if($action=="dl" && $num>0 && isset($_SESSION["releve"][$num])){
unset($zip);
$log='';
$filearray=$_SESSION["releve"][$num];
$zipname = $num.'.zip';
$zip = new ZipArchive;
$zip->open($zipname, ZipArchive::OVERWRITE);
foreach ($filearray as $key=> $files) {
if(is_array($files)){
foreach ($files as $file) {
$zip->addFile($file["fullname"],$file["name"]);//
$log.=$key.','.$file["name"]."\n";
}
}else{
$log.=$key.','.$langs->trans("Nofile")."\n";
}
}
$zip->addFromString('log.csv', $log);
$zip->close();

///Then download the zipped file.
header('Content-Type: application/zip');
header('Content-disposition: attachment; filename='.$zipname);
header('Content-Length: ' . filesize($zipname));
readfile($zipname);
}
unset($_SESSION["releve"][$num]);

/*
* View
Expand Down Expand Up @@ -522,7 +555,7 @@
dol_print_error($db);
}
}

print Get_attach_files($db,$objp->rowid,$num,$objp->label);
print "</td>";

if ($objp->amount < 0)
Expand Down Expand Up @@ -565,9 +598,112 @@
print "</div>";

print "</form>\n";
// download button
echo '<a href="releve.php?num='.$num.'&account='.$id.'&action=dl" class="butAction" name="Send" >'.$langs->trans('DownloadFile')." </a>\n";

}


llxFooter();

$db->close();

/*Function to generate the HTML code used to show the file name & download link attached to the Item covered by the bank line
* @param $db Object database object
* @param $bankId int bank line id
* @param $num int bank statement
* @param $label string label used to optimise the sql querry
*
*/
function Get_attach_files($db, $bankId,$num,$label=''){
$out='';
global$conf;
$sql='SELECT u.url_id, u.type,ff.rowid as id , ff.`ref` AS reff, f.facnumber AS `ref`,';
$sql.=' e.`ref` AS refe, sp.rowid AS ids, d.rowid AS idd';
$sql.=' FROM '.MAIN_DB_PREFIX.'bank_url AS u';
if ( !empty($label) || $label=='(CustomerInvoicePayment)'){
$sql.=' LEFT JOIN '.MAIN_DB_PREFIX.'paiement AS p ON p.fk_bank = u.fk_bank';
$sql.=' LEFT JOIN '.MAIN_DB_PREFIX.'paiement_facture AS pf ON pf.fk_paiement = p.rowid';
$sql.=' LEFT JOIN '.MAIN_DB_PREFIX.'facture AS f ON f.rowid = pf.fk_facture';
}
if( !empty($label) || $label=='(SupplierInvoicePayment)'){
//invoice suplier (SupplierInvoicePayment)
$sql.=' LEFT JOIN '.MAIN_DB_PREFIX.'paiementfourn AS fp ON fp.fk_bank = u.fk_bank';
$sql.=' LEFT JOIN '.MAIN_DB_PREFIX.'paiementfourn_facturefourn AS fpf ON fpf.fk_paiementfourn = fp.rowid';
$sql.=' LEFT JOIN '.MAIN_DB_PREFIX.'facture_fourn AS ff ON ff.rowid = fpf.fk_facturefourn';
}
if( !empty($label) || $label=='(ExpenseReportPayment)'){
//EXPENSEs (ExpenseReportPayment)
$sql.=' LEFT JOIN '.MAIN_DB_PREFIX.'payment_expensereport AS ep ON ep.fk_bank = u.fk_bank';
$sql.=' LEFT JOIN '.MAIN_DB_PREFIX.'expensereport AS e ON e.rowid = ep.fk_expensereport';
}
if( !empty($label) || $label=='(DonationPayment)'){
//donation
$sql.=' LEFT JOIN '.MAIN_DB_PREFIX.'payment_donation AS dp ON dp.fk_bank = u.fk_bank';
$sql.=' LEFT JOIN '.MAIN_DB_PREFIX.'don AS d ON d.rowid = dp.fk_donation';
}
if( !empty($label) || $label=='(SalaryPayment)'){
//loan
// $sql.=' LEFT JOIN '.MAIN_DB_PREFIX.'payment_loan AS lp ON lp.fk_bank = u.fk_bank';
//salary
$sql.=' LEFT JOIN '.MAIN_DB_PREFIX.'payment_salary AS sp ON sp.fk_bank = u.fk_bank';
}
//END SQL
$sql.=" WHERE u.fk_bank in('".$bankId."')AND u.type in ('payment','payment_supplier','payment_expensereport','payment_salary','payment_donation' )";
$resd = $db->query($sql);
$files=array();
$link='';
if ($resd)
{
$numd = $db->num_rows($resd);
$upload_dir ='';
$i=0;
if($numd>0)
{


$objd = $db->fetch_object($resd);

switch($objd->type){
case "payment":
$subdir=dol_sanitizeFileName($objd->ref);
$upload_dir = $conf->facture->dir_output.'/'.$subdir;
$link="../../document.php?modulepart=facture&file=".str_replace('/','%2F',$subdir).'%2F';
break;

case "payment_supplier":
$subdir=get_exdir($objd->id,2,0,0,$objd,'invoice_supplier').$objd->reff;
$upload_dir = $conf->fournisseur->facture->dir_output.'/'.$subdir;
$link="../../document.php?modulepart=facture_fournisseur&file=".str_replace('/','%2F',$subdir).'%2F';
break;
case "payment_expensereport":
$subdir=dol_sanitizeFileName($objd->refe);
$upload_dir = $conf->expensereport->dir_output.'/'.$subdir;
$link="../../document.php?modulepart=expensereport&file=".str_replace('/','%2F',$subdir).'%2F';
break;
case "payment_salary":
$subdir=dol_sanitizeFileName($objd->ids);
$upload_dir = $conf->salaries->dir_output.'/'.$subdir;
$link="../../document.php?modulepart=salaries&file=".str_replace('/','%2F',$subdir).'%2F';
break;
case "payment_donation":
$subdir=get_exdir(null,2,0,1,$objd,'donation'). '/'. dol_sanitizeFileName($objd->idd);
$upload_dir = $conf->don->dir_output . '/' . $subdir;
$link="../../document.php?modulepart=don&file=".str_replace('/','%2F',$subdir).'%2F';
break;
default:
break;
}

if(!empty($upload_dir)){
$files=dol_dir_list($upload_dir,"files",0,'','(\.meta|_preview\.png)$','',SORT_ASC,1);
foreach ($files as $key => $file){
$out.= '<br><a href="'.$link.$file['name'].'">'.$file['name'].'</a>';
}
$_SESSION["releve"][$num][]=$files;
}
}
}
$db->free($resd);
return $out;
}
12 changes: 12 additions & 0 deletions htdocs/expensereport/payment/payment.php
View file
Expand Up @@ -134,6 +134,18 @@
}
}

if (!$error) {
$payment->fetch($paymentid);
if ($expensereport->total_ttc - $payment->amount == 0) {
$result = $expensereport->set_paid($expensereport->id, $user);
if (!$result > 0) {
$errmsg = $payment->error;
$error++;
}
}

}

if (! $error)
{
$db->commit();
Expand Down

0 comments on commit 915a74a

Please sign in to comment.