From 2fab35c28715a96d2a41efda693fc428bc54a81a Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 17 Jun 2019 17:20:22 +0200
Subject: [PATCH 1/4] Debug page to export file

---
 htdocs/compta/compta-files.php          | 87 ++++++++++---------------
 htdocs/core/menus/init_menu_auguria.sql |  2 +
 2 files changed, 37 insertions(+), 52 deletions(-)

diff --git a/htdocs/compta/compta-files.php b/htdocs/compta/compta-files.php
index 87efafd3405..656824298fe 100644
--- a/htdocs/compta/compta-files.php
+++ b/htdocs/compta/compta-files.php
@@ -106,7 +106,7 @@ if(($action=="searchfiles" || $action=="dl" ) && $date_start && $date_stop) {
     $sql.=" AND entity IN (".($entity==1?'0,1':$entity).')';
     $sql.=" AND fk_statut <> ".ExpenseReport::STATUS_DRAFT;
     $sql.=" UNION ALL";
-    $sql.=" SELECT rowid as id, ref,paid,amount as total_ttc, '0' as fk_soc, datedon as date, 'Donation' as item FROM ".MAIN_DB_PREFIX."don";
+    $sql.=" SELECT rowid as id, ref, paid, amount as total_ttc, '0' as fk_soc, datedon as date, 'Donation' as item FROM ".MAIN_DB_PREFIX."don";
     $sql.=" WHERE datedon between ".$wheretail;
     $sql.=" AND entity IN (".($entity==1?'0,1':$entity).')';
     $sql.=" AND fk_statut <> ".Don::STATUS_DRAFT;
@@ -143,56 +143,63 @@ if(($action=="searchfiles" || $action=="dl" ) && $date_start && $date_stop) {
             switch($objd->item)
             {
                 case "Invoice":
-                    $subdir=dol_sanitizeFileName($objd->ref);
+                	$subdir = '';
+                	$subdir.=($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 "SupplierInvoice":
-                    $tmpinvoicesupplier->fetch($objd->id);
-                    $subdir=get_exdir($tmpinvoicesupplier->id, 2, 0, 0, $tmpinvoicesupplier, 'invoice_supplier').'/'.dol_sanitizeFileName($objd->ref);
+                	$tmpinvoicesupplier->fetch($objd->id);
+                	$subdir = get_exdir($tmpinvoicesupplier->id, 2, 0, 1, $tmpinvoicesupplier, 'invoice_supplier');		// TODO Use first file
+                    $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';
                     break;
                 case "ExpenseReport":
-                    $subdir=dol_sanitizeFileName($objd->ref);
+                	$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';
                     break;
                 case "SalaryPayment":
-                    $subdir=dol_sanitizeFileName($objd->id);
+                	$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';
                     break;
                 case "Donation":
                     $tmpdonation->fetch($objp->id);
-                    $subdir=get_exdir(0, 0, 0, 1, $tmpdonation, 'donation'). '/'. dol_sanitizeFileName($objd->id);
+                    $subdir=get_exdir(0, 0, 0, 0, $tmpdonation, 'donation');
+                    $subdir.=($subdir ? '/' : '').dol_sanitizeFileName($objd->id);
                     $upload_dir = $conf->don->dir_output . '/' . $subdir;
                     $link="document.php?modulepart=don&file=".str_replace('/', '%2F', $subdir).'%2F';
                     break;
                 case "SocialContributions":
-                    $subdir=dol_sanitizeFileName($objd->id);
+                	$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';
                     break;
                 default:
-                    $subdir='';
-                    $upload_dir='';
-                    $link='';
+                	$subdir = '';
+                    $upload_dir = '';
+                    $link = '';
                     break;
             }
 
             if (!empty($upload_dir))
             {
                 $result=true;
+
                 $files=dol_dir_list($upload_dir, "files", 0, '', '(\.meta|_preview\.png)$', '', SORT_ASC, 1);
-                //var_dump($upload_dir);
+
                 if (count($files) < 1)
                 {
                     $nofile['id']=$objd->id;
                     $nofile['date']=$db->idate($objd->date);
                     $nofile['paid']=$objd->paid;
                     $nofile['amount']=$objd->total_ttc;
-                    $nofile['ref']=$objd->ref;
+                    $nofile['ref']=($objd->ref ? $objd->ref : $objd->id);
                     $nofile['fk']=$objd->fk_soc;
                     $nofile['item']=$objd->item;
 
@@ -206,7 +213,7 @@ if(($action=="searchfiles" || $action=="dl" ) && $date_start && $date_stop) {
                         $file['date']=$db->idate($objd->date);
                         $file['paid']=$objd->paid;
                         $file['amount']=$objd->total_ttc;
-                        $file['ref']=$objd->ref;
+                        $file['ref']=($objd->ref ? $objd->ref : $objd->id);
                         $file['fk']=$objd->fk_soc;
                         $file['item']=$objd->item;
                         $file['link']=$link.$file['name'];
@@ -300,42 +307,15 @@ print '<form name="searchfiles" action="?action=searchfiles'.$tail.'" method="PO
 print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
 print $langs->trans("ReportPeriod").': '.$form->selectDate($date_start, 'date_start', 0, 0, 0, "", 1, 1, 0);
 print ' - '.$form->selectDate($date_stop, 'date_stop', 0, 0, 0, "", 1, 1, 0)."\n</a>";
-// Multicompany
-/*if (! empty($conf->multicompany->enabled) && is_object($mc))
- {
- print '<br>';
- // This is now done with hook formObjectOptions. Keep this code for backward compatibility with old multicompany module
- if (method_exists($mc, 'formObjectOptions'))
- {
- if (empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE) && $conf->entity == 1 && $user->admin && ! $user->entity)	// condition must be same for create and edit mode
- {
- print "<tr>".'<td>'.$langs->trans("Entity").'</td>';
- print "<td>".$mc->select_entities($entity);
- print "</td></tr>\n";
- }
- else
- {
- print '<input type="hidden" name="entity" value="'.$conf->entity.'" />';
- }
- }
 
- $object = new stdClass();
- // Other attributes
- $parameters=array('objectsrc' => null, 'colspan' => ' colspan="3"');
- $reshook=$hookmanager->executeHooks('formObjectOptions', $parameters, $object, $action);    // Note that $action and $object may have been modified by hook
- print $hookmanager->resPrint;
- if (empty($reshook))
- {
- print $object->showOptionals($extrafields, 'edit');
- }
- }*/
+// Export is for current company only !
 if (! empty($conf->multicompany->enabled) && is_object($mc))
 {
-    print ' &nbsp; - &nbsp; '.$langs->trans("Entity").' : ';
+    print '<span class="marginleftonly marginrightonly">('.$langs->trans("Entity").' : ';
     $mc->dao->getEntities();
     $mc->dao->fetch($conf->entity);
     print $mc->dao->label;
-    print "<br>\n";
+    print ")</span>\n";
 }
 
 print '<input class="button" type="submit" value="'.$langs->trans("Refresh").'" /></form>'."\n";
@@ -376,10 +356,10 @@ if (!empty($date_start) && !empty($date_stop))
     print '<div class="div-table-responsive">';		// You can use div-table-responsive-no-min if you dont need reserved height for your table
     print '<table class="noborder" width="100%">';
     print '<tr class="liste_titre">';
-    print_liste_field_titre($arrayfields['date']['label'], $_SERVER["PHP_SELF"], "date", "", $param, 'align="center" class="nowrap"', $sortfield, $sortorder);
+    print_liste_field_titre($arrayfields['date']['label'], $_SERVER["PHP_SELF"], "date", "", $param, 'class="nowrap"', $sortfield, $sortorder);
     print '<td>'.$langs->trans("Type").'</td>';
     print '<td>'.$langs->trans("Ref").'</td>';
-    print '<td>'.$langs->trans("Link").'</td>';
+    print '<td>'.$langs->trans("Document").'</td>';
     print '<td>'.$langs->trans("Paid").'</td>';
     print '<td class="right">'.$langs->trans("Debit").'</td>';
     print '<td class="right">'.$langs->trans("Credit").'</td>';
@@ -402,12 +382,10 @@ if (!empty($date_start) && !empty($date_stop))
             // Balance calculation
             $balance = 0;
             foreach($TData as &$data1) {
-                if ($data1['item']!='Invoice'&& $data1['item']!='Donation' ){
+                if ($data1['item']!='Invoice' && $data1['item']!='Donation')
+                {
                     $data1['amount']=-$data1['amount'];
                 }
-                if ($data1['amount']>0){
-                }else{
-                }
                 $balance += $data1['amount'];
                 $data1['balance'] = $balance;
             }
@@ -419,14 +397,19 @@ if (!empty($date_start) && !empty($date_stop))
                 //if (!empty($data['fk_facture'])) $html_class = 'facid-'.$data['fk_facture'];
                 //elseif (!empty($data['fk_paiement'])) $html_class = 'payid-'.$data['fk_paiement'];
                 print '<tr class="oddeven '.$html_class.'">';
-                print "<td class=\"center\">";
+                print "<td>";
                 print dol_print_date($data['date'], 'day');
                 print "</td>\n";
                 print '<td class="left">'.$langs->trans($data['item']).'</td>';
                 print '<td class="left">'.$data['ref'].'</td>';
 
                 // File link
-                print '<td><a href='.DOL_URL_ROOT.'/'.$data['link'].">".$data['name']."</a></td>\n";
+                print '<td>';
+                if ($data['link'])
+                {
+                	print '<a href='.DOL_URL_ROOT.'/'.$data['link'].' target="_blank">'.($data['name'] ? $data['name'] : $data['ref']).'</a>';
+                }
+				print "</td>\n";
 
                 print '<td class="left">'.$data['paid'].'</td>';
                 print '<td class="right">'.(($data['amount'] > 0) ? price(abs($data['amount'])) : '')."</td>\n";
diff --git a/htdocs/core/menus/init_menu_auguria.sql b/htdocs/core/menus/init_menu_auguria.sql
index 3a4ec85ec58..c7b2c8a69a7 100644
--- a/htdocs/core/menus/init_menu_auguria.sql
+++ b/htdocs/core/menus/init_menu_auguria.sql
@@ -281,6 +281,8 @@ insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, left
 	insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->accounting->enabled', __HANDLER__, 'left', 2430__+MAX_llx_menu__, 'accountancy', 'bookkeeping', 2400__+MAX_llx_menu__, '/accountancy/bookkeeping/list.php?mainmenu=accountancy&leftmenu=accountancy_bookeeping', 'Bookkeeping', 1, 'accountancy', '$user->rights->accounting->mouvements->lire', '', 0, 15, __ENTITY__);
 	-- Balance
 	insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->accounting->enabled', __HANDLER__, 'left', 2435__+MAX_llx_menu__, 'accountancy', 'balance', 2400__+MAX_llx_menu__, '/accountancy/bookkeeping/balance.php?mainmenu=accountancy&leftmenu=accountancy_balance', 'AccountBalance', 1, 'accountancy', '$user->rights->accounting->mouvements->lire', '', 0, 16, __ENTITY__);
+	-- Export accounting documents
+	insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->accounting->enabled', __HANDLER__, 'left', 2436__+MAX_llx_menu__, 'accountancy', 'accountancy_files', 2400__+MAX_llx_menu__, '/compta/compta-files.php?mainmenu=accountancy&leftmenu=accountancy_files', 'AccountantFiles', 1, 'accountancy', '$user->rights->accounting->mouvements->lire', '', 0, 17, __ENTITY__);
 	-- Reports
 	insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->accounting->enabled', __HANDLER__, 'left', 2440__+MAX_llx_menu__, 'accountancy', 'accountancy_report', 2400__+MAX_llx_menu__, '/compta/resultat/index.php?mainmenu=accountancy&leftmenu=accountancy_report', 'Reportings', 1, 'main', '$user->rights->compta->resultat->lire || $user->rights->accounting->comptarapport->lire', '', 0, 17, __ENTITY__);
 	insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->accounting->enabled && $leftmenu=="accountancy_report"', __HANDLER__, 'left', 2441__+MAX_llx_menu__, 'accountancy', 'accountancy_report', 2440__+MAX_llx_menu__, '/compta/resultat/index.php?mainmenu=accountancy&leftmenu=accountancy_report', 'MenuReportInOut', 2, 'main', '$user->rights->compta->resultat->lire || $user->rights->accounting->comptarapport->lire', '', 0, 18, __ENTITY__);

From 08d5ca4ddbc47fcbcddf94a471657dda1e81cb9e Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 17 Jun 2019 17:53:43 +0200
Subject: [PATCH 2/4] Debug page to export accounting documents

---
 htdocs/admin/delais.php                       |   1 -
 htdocs/admin/mails_emailing.php               |   3 +-
 htdocs/admin/menus/edit.php                   |   1 -
 htdocs/admin/sms.php                          |   2 +-
 htdocs/cashdesk/css/style.css                 |   2 +-
 ...{compta-files.php => accounting-files.php} | 292 ++++++++++--------
 htdocs/core/menus/standard/eldy.lib.php       |   8 +-
 htdocs/expensereport/list.php                 |   2 +-
 htdocs/fourn/facture/card.php                 |   2 +-
 htdocs/holiday/card.php                       |   5 +-
 htdocs/holiday/list.php                       |   3 +-
 .../modulebuilder/template/myobject_card.php  |   1 +
 htdocs/opensurvey/results.php                 |   2 +-
 htdocs/opensurvey/wizard/choix_date.php       |  10 +-
 htdocs/opensurvey/wizard/create_survey.php    |   2 +-
 htdocs/product/admin/product_tools.php        |   3 +-
 htdocs/theme/eldy/btn.inc.php                 |   2 +-
 htdocs/theme/eldy/global.inc.php              |   2 +-
 htdocs/theme/md/style.css.php                 |   4 +-
 19 files changed, 188 insertions(+), 159 deletions(-)
 rename htdocs/compta/{compta-files.php => accounting-files.php} (60%)

diff --git a/htdocs/admin/delais.php b/htdocs/admin/delais.php
index 1d05d5e0afe..6b46468b916 100644
--- a/htdocs/admin/delais.php
+++ b/htdocs/admin/delais.php
@@ -418,7 +418,6 @@ if($action == 'edit') {
 	print '<br></form>';
 } else {
 
-	// Boutons d'action
 	print '<br><div class="tabsAction">';
 	print '<a class="butAction" href="delais.php?action=edit">'.$langs->trans("Modify").'</a></div>';
 }
diff --git a/htdocs/admin/mails_emailing.php b/htdocs/admin/mails_emailing.php
index 1e54fdea3dd..12076a00579 100644
--- a/htdocs/admin/mails_emailing.php
+++ b/htdocs/admin/mails_emailing.php
@@ -493,7 +493,8 @@ else
     }
 
 
-	// Boutons actions
+    // Buttons for actions
+
 	print '<div class="tabsAction">';
 
 	print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?action=edit">'.$langs->trans("Modify").'</a>';
diff --git a/htdocs/admin/menus/edit.php b/htdocs/admin/menus/edit.php
index b4f5fbd3355..cf42f294d03 100644
--- a/htdocs/admin/menus/edit.php
+++ b/htdocs/admin/menus/edit.php
@@ -415,7 +415,6 @@ if ($action == 'create')
 
     dol_fiche_end();
 
-    // Boutons
     print '<div class="center">';
 	print '<input type="submit" class="button" name="save" value="'.$langs->trans("Save").'">';
     print '&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;';
diff --git a/htdocs/admin/sms.php b/htdocs/admin/sms.php
index 2fb1e5a8a29..d6f2ee170d8 100644
--- a/htdocs/admin/sms.php
+++ b/htdocs/admin/sms.php
@@ -243,7 +243,7 @@ else
 	print '</table>';
 
 
-	// Boutons actions
+	// Buttons for actions
 
 	print '<div class="tabsAction">';
 
diff --git a/htdocs/cashdesk/css/style.css b/htdocs/cashdesk/css/style.css
index dc579711aa3..9d9be27f3ce 100644
--- a/htdocs/cashdesk/css/style.css
+++ b/htdocs/cashdesk/css/style.css
@@ -320,7 +320,7 @@ p.titre {
 	padding: 2px 2px;
 }
 
-/* -------------- Boutons --------------------- */
+/* -------------- Buttons for SimplePOS --------------------- */
 .bouton_ajout_article {
 	margin-top: 10px;
 	width: 60%;
diff --git a/htdocs/compta/compta-files.php b/htdocs/compta/accounting-files.php
similarity index 60%
rename from htdocs/compta/compta-files.php
rename to htdocs/compta/accounting-files.php
index 656824298fe..5a3097f6aa8 100644
--- a/htdocs/compta/compta-files.php
+++ b/htdocs/compta/accounting-files.php
@@ -1,6 +1,6 @@
 <?php
 /* Copyright (C) 2001-2006 Rodolphe Quiedeville <rodolphe@quiedeville.org>
- * Copyright (C) 2004-2018 Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) 2004-2019 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2017      Pierre-Henry Favre   <support@atm-consulting.fr>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -16,11 +16,13 @@
  * You should have received a copy of the GNU General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
-/**
- *  \file       htdocs/compta/compta-files.php
+
+ /**
+ *  \file       htdocs/compta/accounting-files.php
  *  \ingroup    compta
  *  \brief      Page to show portoflio and files of a thirdparty and download it
  */
+
 require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
@@ -89,149 +91,165 @@ $entity = GETPOST('entity', 'int')?GETPOST('entity', 'int'):$conf->entity;
 
 $filesarray=array();
 $result=false;
-if(($action=="searchfiles" || $action=="dl" ) && $date_start && $date_stop) {
-    $wheretail=" '".$db->idate($date_start)."' AND '".$db->idate($date_stop)."'";
-    $sql="SELECT rowid as id, ref as ref, paye as paid, total_ttc, fk_soc, datef as date, 'Invoice' as item FROM ".MAIN_DB_PREFIX."facture";
-    $sql.=" WHERE datef between ".$wheretail;
-    $sql.=" AND entity IN (".($entity==1?'0,1':$entity).')';
-    $sql.=" AND fk_statut <> ".Facture::STATUS_DRAFT;
-    $sql.=" UNION ALL";
-    $sql.=" SELECT rowid as id, ref, paye as paid, total_ttc, fk_soc, datef as date, 'SupplierInvoice' as item FROM ".MAIN_DB_PREFIX."facture_fourn";
-    $sql.=" WHERE datef between ".$wheretail;
-    $sql.=" AND entity IN (".($entity==1?'0,1':$entity).')';
-    $sql.=" AND fk_statut <> ".FactureFournisseur::STATUS_DRAFT;
-    $sql.=" UNION ALL";
-    $sql.=" SELECT rowid as id, ref, paid, total_ttc, fk_user_author as fk_soc, date_fin as date, 'ExpenseReport' as item FROM ".MAIN_DB_PREFIX."expensereport";
-    $sql.=" WHERE date_fin between  ".$wheretail;
-    $sql.=" AND entity IN (".($entity==1?'0,1':$entity).')';
-    $sql.=" AND fk_statut <> ".ExpenseReport::STATUS_DRAFT;
-    $sql.=" UNION ALL";
-    $sql.=" SELECT rowid as id, ref, paid, amount as total_ttc, '0' as fk_soc, datedon as date, 'Donation' as item FROM ".MAIN_DB_PREFIX."don";
-    $sql.=" WHERE datedon between ".$wheretail;
-    $sql.=" AND entity IN (".($entity==1?'0,1':$entity).')';
-    $sql.=" AND fk_statut <> ".Don::STATUS_DRAFT;
-    $sql.=" UNION ALL";
-    $sql.=" SELECT rowid as id, label as ref, 1 as paid, amount as total_ttc, fk_user as fk_soc,datep as date, 'SalaryPayment' as item FROM ".MAIN_DB_PREFIX."payment_salary";
-    $sql.=" WHERE datep between ".$wheretail;
-    $sql.=" AND entity IN (".($entity==1?'0,1':$entity).')';
-    //$sql.=" AND fk_statut <> ".PaymentSalary::STATUS_DRAFT;
-    $sql.=" UNION ALL";
-    $sql.=" SELECT rowid as id, libelle as ref, paye as paid, amount as total_ttc, 0 as fk_soc, date_creation as date, 'SocialContributions' as item FROM ".MAIN_DB_PREFIX."chargesociales";
-    $sql.=" WHERE date_creation between ".$wheretail;
-    $sql.=" AND entity IN (".($entity==1?'0,1':$entity).')';
-    //$sql.=" AND fk_statut <> ".ChargeSociales::STATUS_DRAFT;
-    $sql.= $db->order($sortfield, $sortorder);
+if (($action=="searchfiles" || $action=="dl" )) {
 
-    $resd = $db->query($sql);
-    $files=array();
-    $link='';
+	if (empty($date_start))
+	{
+		setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("DateStart")), null, 'errors');
+		$error++;
+	}
+	if (empty($date_stop))
+	{
+		setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("DateEnd")), null, 'errors');
+		$error++;
+	}
 
-    if ($resd)
-    {
-        $numd = $db->num_rows($resd);
+	if (! $error)
+	{
+	    $wheretail=" '".$db->idate($date_start)."' AND '".$db->idate($date_stop)."'";
 
-        $tmpinvoice=new Facture($db);
-        $tmpinvoicesupplier=new FactureFournisseur($db);
-        $tmpdonation=new Don($db);
+	    $sql="SELECT rowid as id, ref as ref, paye as paid, total_ttc, fk_soc, datef as date, 'Invoice' as item FROM ".MAIN_DB_PREFIX."facture";
+	    $sql.=" WHERE datef between ".$wheretail;
+	    $sql.=" AND entity IN (".($entity==1?'0,1':$entity).')';
+	    $sql.=" AND fk_statut <> ".Facture::STATUS_DRAFT;
+	    $sql.=" UNION ALL";
+	    $sql.=" SELECT rowid as id, ref, paye as paid, total_ttc, fk_soc, datef as date, 'SupplierInvoice' as item FROM ".MAIN_DB_PREFIX."facture_fourn";
+	    $sql.=" WHERE datef between ".$wheretail;
+	    $sql.=" AND entity IN (".($entity==1?'0,1':$entity).')';
+	    $sql.=" AND fk_statut <> ".FactureFournisseur::STATUS_DRAFT;
+	    $sql.=" UNION ALL";
+	    $sql.=" SELECT rowid as id, ref, paid, total_ttc, fk_user_author as fk_soc, date_fin as date, 'ExpenseReport' as item FROM ".MAIN_DB_PREFIX."expensereport";
+	    $sql.=" WHERE date_fin between  ".$wheretail;
+	    $sql.=" AND entity IN (".($entity==1?'0,1':$entity).')';
+	    $sql.=" AND fk_statut <> ".ExpenseReport::STATUS_DRAFT;
+	    $sql.=" UNION ALL";
+	    $sql.=" SELECT rowid as id, ref, paid, amount as total_ttc, '0' as fk_soc, datedon as date, 'Donation' as item FROM ".MAIN_DB_PREFIX."don";
+	    $sql.=" WHERE datedon between ".$wheretail;
+	    $sql.=" AND entity IN (".($entity==1?'0,1':$entity).')';
+	    $sql.=" AND fk_statut <> ".Don::STATUS_DRAFT;
+	    $sql.=" UNION ALL";
+	    $sql.=" SELECT rowid as id, label as ref, 1 as paid, amount as total_ttc, fk_user as fk_soc,datep as date, 'SalaryPayment' as item FROM ".MAIN_DB_PREFIX."payment_salary";
+	    $sql.=" WHERE datep between ".$wheretail;
+	    $sql.=" AND entity IN (".($entity==1?'0,1':$entity).')';
+	    //$sql.=" AND fk_statut <> ".PaymentSalary::STATUS_DRAFT;
+	    $sql.=" UNION ALL";
+	    $sql.=" SELECT rowid as id, libelle as ref, paye as paid, amount as total_ttc, 0 as fk_soc, date_creation as date, 'SocialContributions' as item FROM ".MAIN_DB_PREFIX."chargesociales";
+	    $sql.=" WHERE date_creation between ".$wheretail;
+	    $sql.=" AND entity IN (".($entity==1?'0,1':$entity).')';
+	    //$sql.=" AND fk_statut <> ".ChargeSociales::STATUS_DRAFT;
+	    $sql.= $db->order($sortfield, $sortorder);
 
-        $upload_dir ='';
-        $i=0;
-        while ($i < $numd)
-        {
-            $objd = $db->fetch_object($resd);
+	    $resd = $db->query($sql);
+	    $files=array();
+	    $link='';
 
-            switch($objd->item)
-            {
-                case "Invoice":
-                	$subdir = '';
-                	$subdir.=($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 "SupplierInvoice":
-                	$tmpinvoicesupplier->fetch($objd->id);
-                	$subdir = get_exdir($tmpinvoicesupplier->id, 2, 0, 1, $tmpinvoicesupplier, 'invoice_supplier');		// TODO Use first file
-                    $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';
-                    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';
-                    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';
-                    break;
-                case "Donation":
-                    $tmpdonation->fetch($objp->id);
-                    $subdir=get_exdir(0, 0, 0, 0, $tmpdonation, 'donation');
-                    $subdir.=($subdir ? '/' : '').dol_sanitizeFileName($objd->id);
-                    $upload_dir = $conf->don->dir_output . '/' . $subdir;
-                    $link="document.php?modulepart=don&file=".str_replace('/', '%2F', $subdir).'%2F';
-                    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';
-                    break;
-                default:
-                	$subdir = '';
-                    $upload_dir = '';
-                    $link = '';
-                    break;
-            }
+	    if ($resd)
+	    {
+	        $numd = $db->num_rows($resd);
 
-            if (!empty($upload_dir))
-            {
-                $result=true;
+	        $tmpinvoice=new Facture($db);
+	        $tmpinvoicesupplier=new FactureFournisseur($db);
+	        $tmpdonation=new Don($db);
 
-                $files=dol_dir_list($upload_dir, "files", 0, '', '(\.meta|_preview\.png)$', '', SORT_ASC, 1);
+	        $upload_dir ='';
+	        $i=0;
+	        while ($i < $numd)
+	        {
+	            $objd = $db->fetch_object($resd);
 
-                if (count($files) < 1)
-                {
-                    $nofile['id']=$objd->id;
-                    $nofile['date']=$db->idate($objd->date);
-                    $nofile['paid']=$objd->paid;
-                    $nofile['amount']=$objd->total_ttc;
-                    $nofile['ref']=($objd->ref ? $objd->ref : $objd->id);
-                    $nofile['fk']=$objd->fk_soc;
-                    $nofile['item']=$objd->item;
+	            switch($objd->item)
+	            {
+	                case "Invoice":
+	                	$subdir = '';
+	                	$subdir.=($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 "SupplierInvoice":
+	                	$tmpinvoicesupplier->fetch($objd->id);
+	                	$subdir = get_exdir($tmpinvoicesupplier->id, 2, 0, 1, $tmpinvoicesupplier, 'invoice_supplier');		// TODO Use first file
+	                    $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';
+	                    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';
+	                    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';
+	                    break;
+	                case "Donation":
+	                    $tmpdonation->fetch($objp->id);
+	                    $subdir=get_exdir(0, 0, 0, 0, $tmpdonation, 'donation');
+	                    $subdir.=($subdir ? '/' : '').dol_sanitizeFileName($objd->id);
+	                    $upload_dir = $conf->don->dir_output . '/' . $subdir;
+	                    $link="document.php?modulepart=don&file=".str_replace('/', '%2F', $subdir).'%2F';
+	                    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';
+	                    break;
+	                default:
+	                	$subdir = '';
+	                    $upload_dir = '';
+	                    $link = '';
+	                    break;
+	            }
 
-                    $filesarray[]=$nofile;
-                }
-                else
-                {
-                    foreach ($files as $key => $file)
-                    {
-                        $file['id']=$objd->id;
-                        $file['date']=$db->idate($objd->date);
-                        $file['paid']=$objd->paid;
-                        $file['amount']=$objd->total_ttc;
-                        $file['ref']=($objd->ref ? $objd->ref : $objd->id);
-                        $file['fk']=$objd->fk_soc;
-                        $file['item']=$objd->item;
-                        $file['link']=$link.$file['name'];
-                        $file['relpathnamelang'] = $langs->trans($file['item']).'/'.$file['name'];
+	            if (!empty($upload_dir))
+	            {
+	                $result=true;
 
-                        $filesarray[]=$file;
-                    }
-                }
-            }
-            $i++;
-        }
-    }
-    else
-    {
-        dol_print_error($db);
-    }
+	                $files=dol_dir_list($upload_dir, "files", 0, '', '(\.meta|_preview\.png)$', '', SORT_ASC, 1);
 
-    $db->free($resd);
+	                if (count($files) < 1)
+	                {
+	                    $nofile['id']=$objd->id;
+	                    $nofile['date']=$db->idate($objd->date);
+	                    $nofile['paid']=$objd->paid;
+	                    $nofile['amount']=$objd->total_ttc;
+	                    $nofile['ref']=($objd->ref ? $objd->ref : $objd->id);
+	                    $nofile['fk']=$objd->fk_soc;
+	                    $nofile['item']=$objd->item;
+
+	                    $filesarray[]=$nofile;
+	                }
+	                else
+	                {
+	                    foreach ($files as $key => $file)
+	                    {
+	                        $file['id']=$objd->id;
+	                        $file['date']=$db->idate($objd->date);
+	                        $file['paid']=$objd->paid;
+	                        $file['amount']=$objd->total_ttc;
+	                        $file['ref']=($objd->ref ? $objd->ref : $objd->id);
+	                        $file['fk']=$objd->fk_soc;
+	                        $file['item']=$objd->item;
+	                        $file['link']=$link.$file['name'];
+	                        $file['relpathnamelang'] = $langs->trans($file['item']).'/'.$file['name'];
+
+	                        $filesarray[]=$file;
+	                    }
+	                }
+	            }
+	            $i++;
+	        }
+	    }
+	    else
+	    {
+	        dol_print_error($db);
+	    }
+
+	    $db->free($resd);
+	}
 }
 
 /*
@@ -318,7 +336,9 @@ if (! empty($conf->multicompany->enabled) && is_object($mc))
     print ")</span>\n";
 }
 
-print '<input class="button" type="submit" value="'.$langs->trans("Refresh").'" /></form>'."\n";
+print '<input class="button" type="submit" name="search" value="'.$langs->trans("Search").'">';
+
+print '</form>'."\n";
 
 dol_fiche_end();
 
diff --git a/htdocs/core/menus/standard/eldy.lib.php b/htdocs/core/menus/standard/eldy.lib.php
index 3576f35642e..7518093bf77 100644
--- a/htdocs/core/menus/standard/eldy.lib.php
+++ b/htdocs/core/menus/standard/eldy.lib.php
@@ -1287,7 +1287,7 @@ function print_left_eldy_menu($db, $menu_array_before, $menu_array_after, &$tabM
 				// Files
 				if (! empty($conf->global->MAIN_FEATURES_LEVEL) && $conf->global->MAIN_FEATURES_LEVEL >= 1)
 				{
-					$newmenu->add("/compta/compta-files.php?mainmenu=accountancy&amp;leftmenu=accountancy_files", $langs->trans("AccountantFiles"), 1, $user->rights->accounting->mouvements->lire);
+					$newmenu->add("/compta/accounting-files.php?mainmenu=accountancy&amp;leftmenu=accountancy_files", $langs->trans("AccountantFiles"), 1, $user->rights->accounting->mouvements->lire);
 				}
 
 				// Reports
@@ -1329,6 +1329,12 @@ function print_left_eldy_menu($db, $menu_array_before, $menu_array_after, &$tabM
 			// Accountancy (simple)
             if (! empty($conf->comptabilite->enabled))
             {
+            	// Files
+            	if (! empty($conf->global->MAIN_FEATURES_LEVEL) && $conf->global->MAIN_FEATURES_LEVEL >= 1)
+            	{
+            		$newmenu->add("/compta/accounting-files.php?mainmenu=accountancy&amp;leftmenu=accountancy_files", $langs->trans("AccountantFiles"), 0, $user->rights->compta->resultat->lire, '', $mainmenu, 'files');
+            	}
+
                 // Bilan, resultats
                 $newmenu->add("/compta/resultat/index.php?leftmenu=report&amp;mainmenu=accountancy", $langs->trans("Reportings"), 0, $user->rights->compta->resultat->lire, '', $mainmenu, 'ca');
 
diff --git a/htdocs/expensereport/list.php b/htdocs/expensereport/list.php
index 94033912a69..34cbdfe89bd 100644
--- a/htdocs/expensereport/list.php
+++ b/htdocs/expensereport/list.php
@@ -434,7 +434,7 @@ if ($resql)
 			$canedit=((in_array($user_id, $childids) && $user->rights->expensereport->creer)
 				|| ($conf->global->MAIN_USE_ADVANCED_PERMS && $user->rights->expensereport->writeall_advance));
 
-			// Boutons d'actions
+			// Buttons for actions
 			if ($canedit)
 			{
 				print '<a href="'.DOL_URL_ROOT.'/expensereport/card.php?action=create&fk_user_author='.$fuser->id.'" class="butAction">'.$langs->trans("AddTrip").'</a>';
diff --git a/htdocs/fourn/facture/card.php b/htdocs/fourn/facture/card.php
index 2cd27d6d688..1eb38cec66c 100644
--- a/htdocs/fourn/facture/card.php
+++ b/htdocs/fourn/facture/card.php
@@ -3021,7 +3021,7 @@ else
 		if ($action != 'presend')
 		{
 			/*
-             * Boutons actions
+             * Buttons actions
              */
 
 			print '<div class="tabsAction">';
diff --git a/htdocs/holiday/card.php b/htdocs/holiday/card.php
index 6c4cb05a17e..c67daf8f92b 100644
--- a/htdocs/holiday/card.php
+++ b/htdocs/holiday/card.php
@@ -1391,9 +1391,10 @@ else
 
                 if (! $edit)
                 {
-		            print '<div class="tabsAction">';
+                	// Buttons for actions
+
+                	print '<div class="tabsAction">';
 
-                    // Boutons d'actions
 		            if ($cancreate && $object->statut == Holiday::STATUS_DRAFT)
                     {
                         print '<a href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=edit" class="butAction">'.$langs->trans("EditCP").'</a>';
diff --git a/htdocs/holiday/list.php b/htdocs/holiday/list.php
index 84e7b36c239..ce038709fcf 100644
--- a/htdocs/holiday/list.php
+++ b/htdocs/holiday/list.php
@@ -319,11 +319,12 @@ if ($id > 0)		// For user tab
 
 	dol_fiche_end();
 
+	// Buttons for actions
+
 	print '<div class="tabsAction">';
 
 	$canedit=(($user->id == $user_id && $user->rights->holiday->write) || ($user->id != $user_id && $user->rights->holiday->write_all));
 
-	// Boutons d'actions
 	if ($canedit)
 	{
 		print '<a href="'.DOL_URL_ROOT.'/holiday/card.php?action=request&fuserid='.$user_id.'" class="butAction">'.$langs->trans("AddCP").'</a>';
diff --git a/htdocs/modulebuilder/template/myobject_card.php b/htdocs/modulebuilder/template/myobject_card.php
index da6f3c5a466..cc2eb5062cb 100644
--- a/htdocs/modulebuilder/template/myobject_card.php
+++ b/htdocs/modulebuilder/template/myobject_card.php
@@ -421,6 +421,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 
 
 	// Buttons for actions
+
 	if ($action != 'presend' && $action != 'editline') {
     	print '<div class="tabsAction">'."\n";
     	$parameters=array();
diff --git a/htdocs/opensurvey/results.php b/htdocs/opensurvey/results.php
index 076461043b8..c648b15664e 100644
--- a/htdocs/opensurvey/results.php
+++ b/htdocs/opensurvey/results.php
@@ -619,7 +619,7 @@ print '<tr>'."\n";
 print '<td></td>'."\n";
 print '<td></td>'."\n";
 
-//boucle pour l'affichage des boutons de suppression de colonne
+// loop to show the delete link
 if ($user->rights->opensurvey->write) {
 	for ($i = 0; isset($toutsujet[$i]); $i++) {
 
diff --git a/htdocs/opensurvey/wizard/choix_date.php b/htdocs/opensurvey/wizard/choix_date.php
index 8840da3f3e7..76f390c470b 100644
--- a/htdocs/opensurvey/wizard/choix_date.php
+++ b/htdocs/opensurvey/wizard/choix_date.php
@@ -471,7 +471,7 @@ for ($i = 0; $i < $nbrejourmois + $premierjourmois; $i++) {
 		{
 			$nbofchoice=count($_SESSION["totalchoixjour"]);
 			for ($j = 0; $j < $nbofchoice; $j++) {
-				//affichage des boutons ROUGES
+				// show red buttons
 				if (date("j", $_SESSION["totalchoixjour"][$j]) == $numerojour && date("n", $_SESSION["totalchoixjour"][$j]) == $_SESSION["mois"] && date("Y", $_SESSION["totalchoixjour"][$j]) == $_SESSION["annee"]) {
 					print '<td align="center" class="choisi"><input type="submit" class="bouton OFF" name="choixjourretrait[]" value="'.$numerojour.'"></td>'."\n";
 					$dejafait = $numerojour;
@@ -479,13 +479,13 @@ for ($i = 0; $i < $nbrejourmois + $premierjourmois; $i++) {
 			}
 		}
 
-		//Si pas de bouton ROUGE alors on affiche un bouton VERT ou GRIS avec le numéro du jour dessus
+		// If no red button, we show green or grey button with number of day
 		if (isset($dejafait) === false || $dejafait != $numerojour){
-			//bouton vert
+			// green button
 			if (($numerojour >= $jourAJ && $_SESSION["mois"] == $moisAJ && $_SESSION["annee"] == $anneeAJ) || ($_SESSION["mois"] > $moisAJ && $_SESSION["annee"] == $anneeAJ) || $_SESSION["annee"] > $anneeAJ) {
 				print '<td align="center" class="libre"><input type="submit" class="bouton ON" name="choixjourajout[]" value="'.$numerojour.'"></td>'."\n";
 			} else {
-                //bouton gris
+                // grey button
 				print '<td align="center" class="avant">'.$numerojour.'</td>'."\n";
 			}
 		}
@@ -547,7 +547,7 @@ if (issetAndNoEmpty('totalchoixjour', $_SESSION) || $erreur)
 
 	print '</table>'."\n";
 
-	//affichage des boutons de formulaire pour annuler, effacer les jours ou créer le sondage
+	// show buttons to cancel, delete days or create survey
 	print '<table>'."\n";
 	print '<tr>'."\n";
 	print '<td><input type="submit" class="button" name="reset" value="'. dol_escape_htmltag($langs->trans("RemoveAllDays")) .'"></td><td><input type="submit" class="button" name="reporterhoraires" value="'. dol_escape_htmltag($langs->trans("CopyHoursOfFirstDay")) .'"></td><td><input type="submit" class="button" name="resethoraires" value="'. dol_escape_htmltag($langs->trans("RemoveAllHours")) .'"></td></tr>'."\n";
diff --git a/htdocs/opensurvey/wizard/create_survey.php b/htdocs/opensurvey/wizard/create_survey.php
index 0c746fcf8b2..c2e6db1a709 100644
--- a/htdocs/opensurvey/wizard/create_survey.php
+++ b/htdocs/opensurvey/wizard/create_survey.php
@@ -194,7 +194,7 @@ if (GETPOST('choix_sondage'))
 }
 else
 {
-	// affichage des boutons pour choisir sondage date ou autre
+	// Show image to selecte between date survey or other survey
 	print '<br><table>'."\n";
 	print '<tr><td>'. $langs->trans("CreateSurveyDate") .'</td><td></td> '."\n";
 	print '<td><input type="image" name="creation_sondage_date" value="'.$langs->trans('CreateSurveyDate').'" src="../img/calendar-32.png"></td></tr>'."\n";
diff --git a/htdocs/product/admin/product_tools.php b/htdocs/product/admin/product_tools.php
index e76c6884b7f..cfbedbcb7f1 100644
--- a/htdocs/product/admin/product_tools.php
+++ b/htdocs/product/admin/product_tools.php
@@ -333,7 +333,8 @@ else
 
 	print '<br>';
 
-	// Boutons actions
+	// Buttons for actions
+
 	print '<div class="center">';
 	print '<input type="submit" id="convert_vatrate" name="convert_vatrate" value="'.$langs->trans("MassConvert").'" class="button" />';
 	print '</div>';
diff --git a/htdocs/theme/eldy/btn.inc.php b/htdocs/theme/eldy/btn.inc.php
index c0cd029126d..1d00718401b 100644
--- a/htdocs/theme/eldy/btn.inc.php
+++ b/htdocs/theme/eldy/btn.inc.php
@@ -5,7 +5,7 @@ if (! defined('ISLOADEDBYSTEELSHEET')) die('Must be call by steelsheet'); ?>
 
 
 /* ============================================================================== */
-/* Boutons actions                                                                */
+/* Buttons for actions                                                            */
 /* ============================================================================== */
 
 div.divButAction {
diff --git a/htdocs/theme/eldy/global.inc.php b/htdocs/theme/eldy/global.inc.php
index e5e68e59c48..9061595dd1d 100644
--- a/htdocs/theme/eldy/global.inc.php
+++ b/htdocs/theme/eldy/global.inc.php
@@ -2362,7 +2362,7 @@ span.tabspan {
 }
 
 /* ============================================================================== */
-/* Boutons actions                                                                */
+/* Buttons for actions                                                            */
 /* ============================================================================== */
 <?php include dol_buildpath($path.'/theme/'.$theme.'/btn.inc.php', 0); ?>
 
diff --git a/htdocs/theme/md/style.css.php b/htdocs/theme/md/style.css.php
index 752f60541d1..8020a490181 100644
--- a/htdocs/theme/md/style.css.php
+++ b/htdocs/theme/md/style.css.php
@@ -2400,7 +2400,7 @@ div.tabBar table.tableforservicepart2:last-child {
 }
 
 /* ============================================================================== */
-/* Boutons actions                                                                */
+/* Buttons for actions                                                            */
 /* ============================================================================== */
 
 div.divButAction {
@@ -2503,7 +2503,7 @@ span.tabspan {
 }
 
 /* ============================================================================== */
-/* Boutons actions                                                                */
+/* Buttons for actions                                                            */
 /* ============================================================================== */
 
 div.divButAction {

From f6f66f2a77ed56e5dc2798fc92792d29d59c11b8 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 17 Jun 2019 18:11:38 +0200
Subject: [PATCH 3/4] Fix syntax error

---
 htdocs/projet/tasks/time.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/projet/tasks/time.php b/htdocs/projet/tasks/time.php
index e69f4fcd899..f98c9c4ace5 100644
--- a/htdocs/projet/tasks/time.php
+++ b/htdocs/projet/tasks/time.php
@@ -428,7 +428,7 @@ if (($id > 0 || ! empty($ref)) || $projectidforalltimes > 0)
 			print '<br>';
 
 			// Link to create time
-		    if ($user->rights->projet->all->lire || $user->rights->projet->lire))	// To enter time, read permission is enough
+		    if ($user->rights->projet->all->lire || $user->rights->projet->lire)	// To enter time, read permission is enough
 			{
 			    if ($projectstatic->public || $userRead > 0)
 			    {

From f6f86927113f99e52343b10db1438a4f666cd3db Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 17 Jun 2019 18:12:28 +0200
Subject: [PATCH 4/4] Fix phpcs

---
 htdocs/bom/bom_card.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/htdocs/bom/bom_card.php b/htdocs/bom/bom_card.php
index c2ed2ca6705..d788be5354a 100644
--- a/htdocs/bom/bom_card.php
+++ b/htdocs/bom/bom_card.php
@@ -173,7 +173,6 @@ if (empty($reshook))
 			$action = '';
 		}
 	}
-
 }