Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into allowZeroAsAccountNumber

2019-06-17 18:30:11 +02:00 · 2019-06-17 18:30:11 +02:00 · 0b3bc5a172
commit 0b3bc5a172
parent 80d4d8754d 4acc48eec9
30 changed files with 257 additions and 210 deletions
--- 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>';
 }
--- 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>';
--- 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;';
--- 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">';

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


--- 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%;
--- a/htdocs/comm/propal/tpl/linkedobjectblock.tpl.php
+++ b/htdocs/comm/propal/tpl/linkedobjectblock.tpl.php
@ -43,6 +43,8 @@ $linkedObjectBlock = $GLOBALS['linkedObjectBlock'];
 // Load translation files required by the page
 $langs->load("propal");

+$linkedObjectBlock = dol_sort_array($linkedObjectBlock, 'date', 'desc');
+
 $total=0; $ilink=0;
 foreach($linkedObjectBlock as $key => $objectlink)
 {
--- a/htdocs/commande/tpl/linkedobjectblock.tpl.php
+++ b/htdocs/commande/tpl/linkedobjectblock.tpl.php
@ -39,6 +39,8 @@ $linkedObjectBlock = $GLOBALS['linkedObjectBlock'];
 // Load translation files required by the page
 $langs->load("orders");

+$linkedObjectBlock = dol_sort_array($linkedObjectBlock, 'date', 'desc');
+
 $total=0; $ilink=0;
 foreach($linkedObjectBlock as $key => $objectlink)
 {
--- a/htdocs/compta/accounting-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,142 +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=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);
-                    $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);
-                    $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);
-                    $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);
-                    $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);
-                    $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;
-                $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['fk']=$objd->fk_soc;
-                    $nofile['item']=$objd->item;
+	        $tmpinvoice=new Facture($db);
+	        $tmpinvoicesupplier=new FactureFournisseur($db);
+	        $tmpdonation=new Don($db);

-                    $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;
-                        $file['fk']=$objd->fk_soc;
-                        $file['item']=$objd->item;
-                        $file['link']=$link.$file['name'];
-                        $file['relpathnamelang'] = $langs->trans($file['item']).'/'.$file['name'];
+	        $upload_dir ='';
+	        $i=0;
+	        while ($i < $numd)
+	        {
+	            $objd = $db->fetch_object($resd);

-                        $filesarray[]=$file;
-                    }
-                }
-            }
-            $i++;
-        }
-    }
-    else
-    {
-        dol_print_error($db);
-    }
+	            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;
+	            }

-    $db->free($resd);
+	            if (!empty($upload_dir))
+	            {
+	                $result=true;
+
+	                $files=dol_dir_list($upload_dir, "files", 0, '', '(\.meta|_preview\.png)$', '', SORT_ASC, 1);
+
+	                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);
+	}
 }

 /*
@ -300,45 +325,20 @@ 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";
+print '<input class="button" type="submit" name="search" value="'.$langs->trans("Search").'">';
+
+print '</form>'."\n";

 dol_fiche_end();

@ -376,10 +376,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 +402,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 +417,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";
--- a/htdocs/compta/facture/tpl/linkedobjectblock.tpl.php
+++ b/htdocs/compta/facture/tpl/linkedobjectblock.tpl.php
@ -38,6 +38,8 @@ $linkedObjectBlock = $GLOBALS['linkedObjectBlock'];

 $langs->load("bills");

+$linkedObjectBlock = dol_sort_array($linkedObjectBlock, 'date', 'desc');
+
 $total=0; $ilink=0;
 foreach($linkedObjectBlock as $key => $objectlink)
 {
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@ -6480,7 +6480,7 @@ class Form
    public function showLinkedObjectBlock($object, $morehtmlright = '', $compatibleImportElementsList = false)
 	{
 		global $conf,$langs,$hookmanager;
-		global $bc;
+		global $bc, $action;

 		$object->fetchObjectLinked();

@ -6525,6 +6525,7 @@ class Form
 				    $showImportButton=true;
 				}

+				$regs = array();
 				if ($objecttype != 'supplier_proposal' && preg_match('/^([^_]+)_([^_]+)/i', $objecttype, $regs))
 				{
 					$element = $regs[1];
@ -6628,7 +6629,7 @@ class Form
    public function showLinkToObjectBlock($object, $restrictlinksto = array(), $excludelinksto = array())
 	{
 		global $conf, $langs, $hookmanager;
-		global $bc;
+		global $bc, $action;

 		$linktoelem='';
 		$linktoelemlist='';
@ -6663,8 +6664,6 @@ class Form
 			);
 		}

-		global $action;
-
 		// Can complete the possiblelink array
 		$hookmanager->initHooks(array('commonobject'));
 		$parameters=array('listofidcompanytoscan' => $listofidcompanytoscan);
--- a/htdocs/core/class/html.formcompany.class.php
+++ b/htdocs/core/class/html.formcompany.class.php
@ -908,7 +908,7 @@ class FormCompany

    	$out = '<select class="flat '.$morecss.'" name="'.$htmlname.'" id="'.$htmlidname.'">';
    	if ($typeinput=='form') {
-	    	if ($selected == '') $out .= '<option value="-1">&nbsp;</option>';
+    		if ($selected == '' || $selected == '-1') $out .= '<option value="-1">&nbsp;</option>';
 	    	if (empty($conf->global->SOCIETE_DISABLE_PROSPECTS)) {
 	    		$out .= '<option value="2"'.($selected==2?' selected':'').'>'.$langs->trans('Prospect').'</option>';
 	    	}
@ -920,7 +920,7 @@ class FormCompany
 	    	}
 	    	$out .= '<option value="0"'.((string) $selected == '0'?' selected':'').'>'.$langs->trans('NorProspectNorCustomer').'</option>';
    	} elseif ($typeinput=='list') {
-    		$out .=  '<option value="-1"'.($selected==''?' selected':'').'>&nbsp;</option>';
+    		$out .=  '<option value="-1"'.(($selected=='' || $selected == '-1')?' selected':'').'>&nbsp;</option>';
    		if (empty($conf->global->SOCIETE_DISABLE_CUSTOMERS)) {
    			$out .=  '<option value="1,3"'.($selected=='1,3'?' selected':'').'>'.$langs->trans('Customer').'</option>';
    		}
--- 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__);
--- a/htdocs/core/menus/standard/eldy.lib.php
+++ b/htdocs/core/menus/standard/eldy.lib.php
@ -1285,9 +1285,9 @@ function print_left_eldy_menu($db, $menu_array_before, $menu_array_after, &$tabM
 				$newmenu->add("/accountancy/bookkeeping/balance.php?mainmenu=accountancy&amp;leftmenu=accountancy_accountancy", $langs->trans("AccountBalance"), 1, $user->rights->accounting->mouvements->lire);

 				// Files
-				if (! empty($conf->global->MAIN_FEATURES_LEVEL) && $conf->global->MAIN_FEATURES_LEVEL >= 2)
+				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');

--- 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>';
--- a/htdocs/fourn/facture/card.php
+++ b/htdocs/fourn/facture/card.php
@ -4,7 +4,7 @@
 * Copyright (C) 2004		Christophe Combelles	<ccomb@free.fr>
 * Copyright (C) 2005		Marc Barilley			<marc@ocebo.fr>
 * Copyright (C) 2005-2013	Regis Houssin			<regis.houssin@inodbox.com>
- * Copyright (C) 2010-2014	Juanjo Menent			<jmenent@2byte.es>
+ * Copyright (C) 2010-2019	Juanjo Menent			<jmenent@2byte.es>
 * Copyright (C) 2013-2015	Philippe Grand			<philippe.grand@atoo-net.com>
 * Copyright (C) 2013		Florian Henry			<florian.henry@open-concept.pro>
 * Copyright (C) 2014-2016  Marcos García			<marcosgdf@gmail.com>
@ -831,6 +831,8 @@ if (empty($reshook))
 				// Auto calculation of date due if not filled by user
 				if(empty($object->date_echeance)) $object->date_echeance = $object->calculate_date_lim_reglement();

+				$object->fetch_thirdparty();
+
 				// If creation from another object of another module
 				if (! $error && $_POST['origin'] && $_POST['originid'])
 				{
@ -3019,7 +3021,7 @@ else
 		if ($action != 'presend')
 		{
 			/*
-             * Boutons actions
+             * Buttons actions
             */

 			print '<div class="tabsAction">';
--- 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>';
--- 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>';
--- 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();
--- 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++) {

--- 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";
--- 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";
--- 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>';
--- a/htdocs/projet/class/project.class.php
+++ b/htdocs/projet/class/project.class.php
@ -5,6 +5,7 @@
 * Copyright (C) 2013	   Florian Henry        <florian.henry@open-concept.pro>
 * Copyright (C) 2014-2017 Marcos García        <marcosgdf@gmail.com>
 * Copyright (C) 2017      Ferran Marcet        <fmarcet@2byte.es>
+ * Copyright (C) 2019      Juanjo Menent        <jmenent@2byte.es>
 *
 * 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
@ -707,6 +708,27 @@ class Project extends CommonObject
 		$ret = $this->deleteTasks($user);
 		if ($ret < 0) $error++;

+
+		// Delete all child tables
+		if (! $error) {
+			$elements = array('categorie_project');  // elements to delete. TODO Make goodway to delete
+			foreach($elements as $table)
+			{
+				if (! $error) {
+					$sql = "DELETE FROM ".MAIN_DB_PREFIX.$table;
+					$sql.= " WHERE fk_project = ".$this->id;
+
+					$result = $this->db->query($sql);
+					if (! $result) {
+						$error++;
+						$this->errors[] = $this->db->lasterror();
+					}
+				}
+			}
+		}
+
+
+
        // Delete project
        if (! $error)
        {
--- a/htdocs/projet/tasks.php
+++ b/htdocs/projet/tasks.php
@ -667,7 +667,7 @@ elseif ($id > 0 || ! empty($ref))
 	print '<input type="hidden" name="contextpage" value="'.$contextpage.'">';

 	$title=$langs->trans("ListOfTasks");
-    $linktotasks = dolGetButtonTitle($langs->trans('GoToGanttView'), '', 'fa fa-calendar-minus-o', DOL_URL_ROOT.'/projet/ganttview.php?id='.$object->id.'&withproject=1');
+    $linktotasks = dolGetButtonTitle($langs->trans('GoToGanttView'), '', 'fa fa-calendar-minus-o paddingleft', DOL_URL_ROOT.'/projet/ganttview.php?id='.$object->id.'&withproject=1');

 	//print_barre_liste($title, 0, $_SERVER["PHP_SELF"], '', $sortfield, $sortorder, $linktotasks, $num, $totalnboflines, 'title_generic.png', 0, '', '', 0, 1);
 	print load_fiche_titre($title, $linktotasks.' &nbsp; '.$linktocreatetask, 'title_generic.png');
--- a/htdocs/projet/tasks/time.php
+++ b/htdocs/projet/tasks/time.php
@ -467,7 +467,7 @@ if (($id > 0 || ! empty($ref)) || $projectidforalltimes > 0)
 		$object->project = clone $projectstatic;
    }

-    $userWrite = $projectstatic->restrictedProjectArea($user, 'write');
+    $userRead = $projectstatic->restrictedProjectArea($user, 'read');
    $linktocreatetime = '';

 	if ($projectstatic->id > 0)
@ -582,9 +582,9 @@ if (($id > 0 || ! empty($ref)) || $projectidforalltimes > 0)
        $linktocreatetimeBtnStatus = 0;
        $linktocreatetimeUrl = '';
        $linktocreatetimeHelpText = '';
-		if ($user->rights->projet->all->creer || $user->rights->projet->creer)
+        if ($user->rights->projet->all->lire || $user->rights->projet->lire)	// To enter time, read permission is enough
 		{
-			if ($projectstatic->public || $userWrite > 0)
+			if ($projectstatic->public || $userRead > 0)
 		    {
                $linktocreatetimeBtnStatus = 1;

@ -1017,7 +1017,12 @@ if (($id > 0 || ! empty($ref)) || $projectidforalltimes > 0)

 			// Duration - Time spent
 			print '<td>';
-			print $form->select_duration('timespent_duration', ($_POST['timespent_duration']?$_POST['timespent_duration']:''), 0, 'text');
+			$durationtouse = ($_POST['timespent_duration']?$_POST['timespent_duration']:'');
+			if (GETPOSTISSET('timespent_durationhour') || GETPOSTISSET('timespent_durationmin'))
+			{
+				$durationtouse = (GETPOST('timespent_durationhour') * 3600 + GETPOST('timespent_durationmin') * 60);
+			}
+			print $form->select_duration('timespent_duration', $durationtouse, 0, 'text');
 			print '</td>';

 			// Progress declared
--- a/htdocs/societe/card.php
+++ b/htdocs/societe/card.php
@ -952,10 +952,10 @@ else
        $object->name				= GETPOST('name', 'alpha');
        $object->firstname			= GETPOST('firstname', 'alpha');
        $object->particulier		= $private;
-        $object->prefix_comm		= GETPOST('prefix_comm');
-        $object->client				= GETPOST('client')?GETPOST('client'):$object->client;
+        $object->prefix_comm		= GETPOST('prefix_comm', 'alpha');
+        $object->client				= GETPOST('client', 'int')?GETPOST('client', 'int'):$object->client;

-        if(empty($duplicate_code_error)) {
+        if (empty($duplicate_code_error)) {
 	        $object->code_client		= GETPOST('customer_code', 'alpha');
 	        $object->fournisseur		= GETPOST('fournisseur')?GETPOST('fournisseur'):$object->fournisseur;
        }
@ -1187,7 +1187,7 @@ else
        // Prospect/Customer
        print '<tr><td class="titlefieldcreate">'.$form->editfieldkey('ProspectCustomer', 'customerprospect', '', $object, 0, 'string', '', 1).'</td>';
 	    print '<td class="maxwidthonsmartphone">';
-	    $selected=GETPOST('client', 'int')!=''?GETPOST('client', 'int'):$object->client;
+	    $selected=(GETPOSTISSET('client', 'int')?GETPOST('client', 'int'):$object->client);
 	    print $formcompany->selectProspectCustomerType($selected);
 	    print '</td>';

--- 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 {
--- 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); ?>

--- 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 {