From b52dd702292c0cb38e6551c56a5bbeed559e72ec Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 2 Jul 2013 14:21:05 +0200
Subject: [PATCH 01/16] Fix: Missing dependency

---
 build/debian/control | 1 +
 1 file changed, 1 insertion(+)

diff --git a/build/debian/control b/build/debian/control
index 9f0a0fb2ef5..82fdc33fd27 100755
--- a/build/debian/control
+++ b/build/debian/control
@@ -13,6 +13,7 @@ Depends: libapache2-mod-php5 | libapache2-mod-php5filter | php5-cgi | php5-fpm |
 	libphp-adodb,
     libnusoap-php,
     libphp-pclzip,
+    libfpdi-php,
     libjs-jquery, libjs-jquery-ui, libjs-flot, ckeditor,
     ttf-dejavu-core,
     xdg-utils,

From b1b68eafe301791a7a41c6744d423b4879aeae26 Mon Sep 17 00:00:00 2001
From: Florian Henry <florian.henry@open-concept.pro>
Date: Mon, 8 Jul 2013 12:47:07 +0200
Subject: [PATCH 02/16] [ bug #972 ] Auto completion contact field do not take
 account the min caract number before search

---
 ChangeLog                             | 1 +
 htdocs/core/class/html.form.class.php | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index 3aa54336829..b95247b1301 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -56,6 +56,7 @@ For users:
 - New: [ task #823 ] Shipping_validate email notification.
 - New: [ task #900 ] Review code of ficheinter.class.php
 - Fix: [Bug #958] LocalTax2 for Spain fails on Suppliers
+- Fix: [ bug #972 ] Auto completion contact field do not take account the min caract number before search
 
 For translators:
 - Update language files.
diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index 114a2356c6d..ca5b2c833d0 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -892,7 +892,7 @@ class Form
 
             if ($conf->use_javascript_ajax && $conf->global->CONTACT_USE_SEARCH_TO_SELECT && ! $forcecombo && ! $options_only)
             {
-            	$out.= ajax_combobox($htmlname, $event);
+            	$out.= ajax_combobox($htmlname, $event, $conf->global->CONTACT_USE_SEARCH_TO_SELECT);
             }
 
             if ($htmlname != 'none' || $options_only) $out.= '<select class="flat'.($moreclass?' '.$moreclass:'').'" id="'.$htmlname.'" name="'.$htmlname.'">';

From 3db195cb4887243041caf7897c9e1c0ec9d9abd6 Mon Sep 17 00:00:00 2001
From: Florian Henry <florian.henry@open-concept.pro>
Date: Mon, 8 Jul 2013 12:51:17 +0200
Subject: [PATCH 03/16] [ bug #971 ] html.form.class.php select_contact with
 autocomplete do not exclude id from exclude array

---
 ChangeLog                  | 1 +
 htdocs/core/js/lib_head.js | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index b95247b1301..01cdffd5ead 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -57,6 +57,7 @@ For users:
 - New: [ task #900 ] Review code of ficheinter.class.php
 - Fix: [Bug #958] LocalTax2 for Spain fails on Suppliers
 - Fix: [ bug #972 ] Auto completion contact field do not take account the min caract number before search
+-Fix : [ bug #971 ] html.form.class.php select_contact with autocomplete do not exclude id from exclude array
 
 For translators:
 - Update language files.
diff --git a/htdocs/core/js/lib_head.js b/htdocs/core/js/lib_head.js
index 071034b5fcc..4d088081725 100644
--- a/htdocs/core/js/lib_head.js
+++ b/htdocs/core/js/lib_head.js
@@ -810,7 +810,7 @@ function confirmConstantAction(action, url, code, input, box, entity, yesButton,
                     minLength: this.options.minLengthToAutocomplete,
                     source: function( request, response ) {
                         var matcher = new RegExp( $.ui.autocomplete.escapeRegex(request.term), "i" );
-                        response( select.children( "option" ).map(function() {
+                        response( select.children( "option:enabled" ).map(function() {
                             var text = $( this ).text();
                             if ( this.value && ( !request.term || matcher.test(text) ) )
                                 return {

From 95606dde04d5cee8227e689a5252112a54c041f5 Mon Sep 17 00:00:00 2001
From: Florian Henry <florian.henry@open-concept.pro>
Date: Mon, 8 Jul 2013 14:54:55 +0200
Subject: [PATCH 04/16] Just update space into change log

---
 ChangeLog | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index 01cdffd5ead..54f5b31b06a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -57,7 +57,7 @@ For users:
 - New: [ task #900 ] Review code of ficheinter.class.php
 - Fix: [Bug #958] LocalTax2 for Spain fails on Suppliers
 - Fix: [ bug #972 ] Auto completion contact field do not take account the min caract number before search
--Fix : [ bug #971 ] html.form.class.php select_contact with autocomplete do not exclude id from exclude array
+- Fix : [ bug #971 ] html.form.class.php select_contact with autocomplete do not exclude id from exclude array
 
 For translators:
 - Update language files.

From aa628fb47a30a176ae15d3a96a647d4f835bcf92 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 9 Jul 2013 00:35:55 +0200
Subject: [PATCH 05/16] Fix help

---
 htdocs/paypal/admin/paypal.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/htdocs/paypal/admin/paypal.php b/htdocs/paypal/admin/paypal.php
index efa3891cd18..e62301edf6b 100644
--- a/htdocs/paypal/admin/paypal.php
+++ b/htdocs/paypal/admin/paypal.php
@@ -241,9 +241,9 @@ $sandboxpaypalurl='developer.paypal.com';
 
 print '<div id="apidoc">';
 print 'Your API authentication information can be found with following steps. We recommend that you open a separate Web browser session when carrying out this procedure.<br>
-1. Log in to your PayPal Premier or Business account (on real paypal <a href="https://'.$realpaypalurl.'" target="_blank">'.$realpaypalurl.'</a> (or sandbox <a href="https://'.$sandboxpaypalurl.'" target="_blank">'.$sandboxpaypalurl.'</a>).<br>
-2. Click the Profile subtab located under the My Account heading.<br>
-3. Click the API Access link under the Account Information header.<br>
+1. Log in to your PayPal account (on real paypal <a href="https://'.$realpaypalurl.'" target="_blank">'.$realpaypalurl.'</a> (or sandbox <a href="https://'.$sandboxpaypalurl.'" target="_blank">'.$sandboxpaypalurl.'</a>).<br>
+2. Click the "Profile" or "Preferencies" subtab located under the My Account heading.<br>
+3. Click the link "API Access".<br>
 4. Click the View API Certificate link in the right column.<br>
 5. Click the Request API signature radio button on the Request API Credentials page.<br>
 6. Complete the Request API Credential Request form by clicking the agreement checkbox and clicking Submit.<br>

From f4428c8a8a037e82abc570cfc9552396a5d489b6 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 9 Jul 2013 15:27:06 +0200
Subject: [PATCH 06/16] Fix: Bad link

---
 htdocs/admin/geoipmaxmind.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/admin/geoipmaxmind.php b/htdocs/admin/geoipmaxmind.php
index 675abfbc634..308d45f18f7 100644
--- a/htdocs/admin/geoipmaxmind.php
+++ b/htdocs/admin/geoipmaxmind.php
@@ -118,12 +118,12 @@ print '<br>';
 
 print $langs->trans("NoteOnPathLocation").'<br>';
 
-$url1='http://www.maxmind.com/app/perl?rId=awstats';
+$url1='http://www.maxmind.com/en/city?rId=awstats';
 print $langs->trans("YouCanDownloadFreeDatFileTo",'<a href="'.$url1.'" target="_blank">'.$url1.'</a>');
 
 print '<br>';
 
-$url2='http://www.maxmind.com/app/perl?rId=awstats';
+$url2='http://www.maxmind.com/en/city?rId=awstats';
 print $langs->trans("YouCanDownloadAdvancedDatFileTo",'<a href="'.$url2.'" target="_blank">'.$url2.'</a>');
 
 if ($geoip)

From 4aa966f7add5b68458f203eff588f80342c36d88 Mon Sep 17 00:00:00 2001
From: Florian Henry <florian.henry@open-concept.pro>
Date: Wed, 10 Jul 2013 10:30:33 +0200
Subject: [PATCH 07/16] remove pgsql warning on date insert

---
 htdocs/commande/class/commande.class.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/commande/class/commande.class.php b/htdocs/commande/class/commande.class.php
index edfbb35f5cd..499a332e792 100644
--- a/htdocs/commande/class/commande.class.php
+++ b/htdocs/commande/class/commande.class.php
@@ -636,7 +636,7 @@ class Commande extends CommonOrder
         $sql.= ", remise_absolue, remise_percent";
         $sql.= ", entity";
         $sql.= ")";
-        $sql.= " VALUES ('(PROV)',".$this->socid.", ".$this->db->idate($now).", ".$user->id;
+        $sql.= " VALUES ('(PROV)',".$this->socid.", '".$this->db->idate($now)."', ".$user->id;
         $sql.= ", ".($this->fk_project?$this->fk_project:"null");
         $sql.= ", ".$this->db->idate($date);
         $sql.= ", ".($this->source>=0 && $this->source != '' ?$this->source:'null');

From b9bfccd0e2c420279d8eb6dca0c160853d024d5e Mon Sep 17 00:00:00 2001
From: Florian Henry <florian.henry@open-concept.pro>
Date: Wed, 10 Jul 2013 10:35:10 +0200
Subject: [PATCH 08/16] fix pgsql warning date

---
 htdocs/commande/class/commande.class.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/commande/class/commande.class.php b/htdocs/commande/class/commande.class.php
index 499a332e792..d57699b998e 100644
--- a/htdocs/commande/class/commande.class.php
+++ b/htdocs/commande/class/commande.class.php
@@ -638,7 +638,7 @@ class Commande extends CommonOrder
         $sql.= ")";
         $sql.= " VALUES ('(PROV)',".$this->socid.", '".$this->db->idate($now)."', ".$user->id;
         $sql.= ", ".($this->fk_project?$this->fk_project:"null");
-        $sql.= ", ".$this->db->idate($date);
+        $sql.= ", '".$this->db->idate($date)."'";
         $sql.= ", ".($this->source>=0 && $this->source != '' ?$this->source:'null');
         $sql.= ", '".$this->db->escape($this->note_private)."'";
         $sql.= ", '".$this->db->escape($this->note_public)."'";

From 44cd024f8950aaf75c509e8f9aab66ab35f14f57 Mon Sep 17 00:00:00 2001
From: Florian Henry <florian.henry@open-concept.pro>
Date: Wed, 10 Jul 2013 13:10:32 +0200
Subject: [PATCH 09/16] Fix bug on from_confrim using ajax and radio button
 question type

---
 htdocs/core/class/html.form.class.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index ca5b2c833d0..267815f8ddf 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -2517,6 +2517,7 @@ class Form
                          		$.each(inputok, function(i, inputname) {
                          			var more = "";
                          			if ($("#" + inputname).attr("type") == "checkbox") { more = ":checked"; }
+                         		    if ($("#" + inputname).attr("type") == "radio") { more = ":checked"; }
                          			var inputvalue = $("#" + inputname + more).val();
                          			if (typeof inputvalue == "undefined") { inputvalue=""; }
                          			options += "&" + inputname + "=" + inputvalue;

From 729cef3eb4ae6914b2213bedaabfeb55aa0b2b38 Mon Sep 17 00:00:00 2001
From: Florian Henry <florian.henry@open-concept.pro>
Date: Wed, 10 Jul 2013 13:32:42 +0200
Subject: [PATCH 10/16] Qual: Return id of order creates instead of 1 with
 method createFromProposal

---
 htdocs/commande/class/commande.class.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/commande/class/commande.class.php b/htdocs/commande/class/commande.class.php
index d57699b998e..21b55a39413 100644
--- a/htdocs/commande/class/commande.class.php
+++ b/htdocs/commande/class/commande.class.php
@@ -989,7 +989,7 @@ class Commande extends CommonOrder
                         $this->fetch($ret);
                         $this->valid($user);
                     }
-                    return 1;
+                    return $ret;
                 }
                 else return -1;
             }

From 50395fc8c43fa4e36a5e82f13a04b773f80f11c5 Mon Sep 17 00:00:00 2001
From: simnandez <jmenent@2byte.es>
Date: Wed, 10 Jul 2013 15:32:29 +0200
Subject: [PATCH 11/16] Fix: Regression in options MAIN_PROFIDx_IN_ADDRESS

---
 htdocs/admin/pdf.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/admin/pdf.php b/htdocs/admin/pdf.php
index 085d33f3df0..85a707339f6 100755
--- a/htdocs/admin/pdf.php
+++ b/htdocs/admin/pdf.php
@@ -52,10 +52,10 @@ if ($action == 'update')
 	dolibarr_set_const($db, "MAIN_PDF_FORMAT",    $_POST["MAIN_PDF_FORMAT"],'chaine',0,'',$conf->entity);
 
 	
-    dolibarr_set_const($db, "MAIN_PROFID2_IN_ADDRESS",    $_POST["MAIN_PROFID2_IN_ADDRESS"],'chaine',0,'',$conf->entity);
+    dolibarr_set_const($db, "MAIN_PROFID1_IN_ADDRESS",    $_POST["MAIN_PROFID1_IN_ADDRESS"],'chaine',0,'',$conf->entity);
+	dolibarr_set_const($db, "MAIN_PROFID2_IN_ADDRESS",    $_POST["MAIN_PROFID2_IN_ADDRESS"],'chaine',0,'',$conf->entity);
 	dolibarr_set_const($db, "MAIN_PROFID3_IN_ADDRESS",    $_POST["MAIN_PROFID3_IN_ADDRESS"],'chaine',0,'',$conf->entity);
 	dolibarr_set_const($db, "MAIN_PROFID4_IN_ADDRESS",    $_POST["MAIN_PROFID4_IN_ADDRESS"],'chaine',0,'',$conf->entity);
-	dolibarr_set_const($db, "MAIN_PROFID4_IN_ADDRESS",    $_POST["MAIN_PROFID4_IN_ADDRESS"],'chaine',0,'',$conf->entity);
 	dolibarr_set_const($db, "MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT",    $_POST["MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT"],'chaine',0,'',$conf->entity);
 
 	dolibarr_set_const($db, "MAIN_TVAINTRA_NOT_IN_ADDRESS",    $_POST["MAIN_TVAINTRA_NOT_IN_ADDRESS"],'chaine',0,'',$conf->entity);

From 548ea4f93fdfab539c24e8d52ab0fcb4ac3f91f8 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 10 Jul 2013 23:57:18 +0200
Subject: [PATCH 12/16] Fix: Navigation

---
 htdocs/adherents/cotisations.php |  2 ++
 htdocs/fourn/commande/liste.php  | 14 +++++++++++---
 2 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/htdocs/adherents/cotisations.php b/htdocs/adherents/cotisations.php
index ad71332eff2..13167439704 100644
--- a/htdocs/adherents/cotisations.php
+++ b/htdocs/adherents/cotisations.php
@@ -88,6 +88,8 @@ if ($result)
 
     $title=$langs->trans("ListOfSubscriptions");
     if (! empty($date_select)) $title.=' ('.$langs->trans("Year").' '.$date_select.')';
+
+    $param="";
     $param.="&amp;statut=$statut&amp;date_select=$date_select";
     print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder,'',$num);
 
diff --git a/htdocs/fourn/commande/liste.php b/htdocs/fourn/commande/liste.php
index da493a8cd17..d68b2acd74a 100644
--- a/htdocs/fourn/commande/liste.php
+++ b/htdocs/fourn/commande/liste.php
@@ -33,6 +33,10 @@ $sref=GETPOST('search_ref');
 $snom=GETPOST('search_nom');
 $suser=GETPOST('search_user');
 $sttc=GETPOST('search_ttc');
+$search_ref=GETPOST('search_ref');
+$search_nom=GETPOST('search_nom');
+$search_user=GETPOST('search_user');
+$search_ttc=GETPOST('search_ttc');
 $sall=GETPOST('search_all');
 
 $page  = GETPOST('page','int');
@@ -119,9 +123,13 @@ if ($resql)
 	$num = $db->num_rows($resql);
 	$i = 0;
 
-
-	print_barre_liste($title, $page, "liste.php", "", $sortfield, $sortorder, '', $num);
-	print '<form action="liste.php" method="GET">';
+	$param="";
+	if ($search_ref)   $param.="&search_ref=".$search_ref;
+	if ($search_nom)   $param.="&search_nom=".$search_nom;
+	if ($search_user)  $param.="&search_user=".$search_user;
+	if ($search_ttc)   $param.="&search_ttc=".$search_ttc;
+	print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num);
+	print '<form action="'.$_SERVER["PHP_SELF"].'" method="POST">';
 	print '<table class="noborder" width="100%">';
 	print '<tr class="liste_titre">';
 	print_liste_field_titre($langs->trans("Ref"),$_SERVER["PHP_SELF"],"cf.ref","","",'',$sortfield,$sortorder);

From 11bf611618b38fc127e6cbde170fd93f9f9ba38a Mon Sep 17 00:00:00 2001
From: simnandez <jmenent@2byte.es>
Date: Thu, 11 Jul 2013 11:50:31 +0200
Subject: [PATCH 13/16] Trad: Fix ca_ES and es_ES missing translation

---
 htdocs/langs/ca_ES/compta.lang | 4 +++-
 htdocs/langs/es_ES/compta.lang | 2 ++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/htdocs/langs/ca_ES/compta.lang b/htdocs/langs/ca_ES/compta.lang
index eff4e5cd8ad..11a90b887a6 100644
--- a/htdocs/langs/ca_ES/compta.lang
+++ b/htdocs/langs/ca_ES/compta.lang
@@ -162,4 +162,6 @@ Pcg_version=Versió del pla
 Pcg_type=Tipus de compte
 Pcg_subtype=Subtipus de compte
 InvoiceLinesToDispatch=Línies de factures a desglossar
-InvoiceDispatched=Factures desglossades
\ No newline at end of file
+InvoiceDispatched=Factures desglossades
+AccountancyDashboard=Resum financer
+ByProductsAndServices=Per productes i serveis
\ No newline at end of file
diff --git a/htdocs/langs/es_ES/compta.lang b/htdocs/langs/es_ES/compta.lang
index 69b3ce55846..db357f190b3 100644
--- a/htdocs/langs/es_ES/compta.lang
+++ b/htdocs/langs/es_ES/compta.lang
@@ -165,3 +165,5 @@ Pcg_type=Tipo de cuenta
 Pcg_subtype=Subtipo de cuenta
 InvoiceLinesToDispatch=Líneas de facturas a desglosar
 InvoiceDispatched=Facturas desglosadas
+AccountancyDashboard=Resumen financiero
+ByProductsAndServices=Por productos y servicios
\ No newline at end of file

From 84447fec353a9bdb11bd9111eb571b8acd0f0aea Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 12 Jul 2013 10:57:49 +0200
Subject: [PATCH 14/16] More complete examples

---
 htdocs/master.inc.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/htdocs/master.inc.php b/htdocs/master.inc.php
index 9e1c5ad2e14..b39d5216218 100644
--- a/htdocs/master.inc.php
+++ b/htdocs/master.inc.php
@@ -83,6 +83,7 @@ if (! empty($dolibarr_main_document_root_alt))
 			print "Should found something like following examples:<br>\n";
 			print "\"/extensions\"<br>\n";
 			print "\"/extensions1,/extensions2,...\"<br>\n";
+			print "\"/../extensions\"<br>\n";
 			print "\"/custom\"<br>\n";
 			exit;
 		}

From ad8904a4fb2711aeff50448ee97b390256c7f2d0 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 12 Jul 2013 15:10:32 +0200
Subject: [PATCH 15/16] Can add a picto onto line of files list.

---
 htdocs/core/class/html.formfile.class.php | 63 +++++++++++------------
 htdocs/core/lib/files.lib.php             |  2 +-
 2 files changed, 30 insertions(+), 35 deletions(-)

diff --git a/htdocs/core/class/html.formfile.class.php b/htdocs/core/class/html.formfile.class.php
index 8f725368f9c..fc87c58cdc4 100644
--- a/htdocs/core/class/html.formfile.class.php
+++ b/htdocs/core/class/html.formfile.class.php
@@ -184,8 +184,8 @@ class FormFile
      *      Return a string to show the box with list of available documents for object.
      *      This also set the property $this->numoffiles
      *
-     *      @param      string				$modulepart         propal, facture, facture_fourn, ...
-     *      @param      string				$filename           Sub-directory to scan (Example: '0/1/10', 'FA/DD/MM/YY/9999'). Use '' if $filedir is already complete)
+     *      @param      string				$modulepart         Module the files are related to ('propal', 'facture', 'facture_fourn', 'mymodule', 'mymodule_temp', ...)
+     *      @param      string				$filename           Existing (so sanitized) sub-directory to scan (Example: '0/1/10', 'FA/DD/MM/YY/9999'). Use '' if $filedir is already complete)
      *      @param      string				$filedir            Directory to scan
      *      @param      string				$urlsource          Url of origin page (for return)
      *      @param      int					$genallowed         Generation is allowed (1/0 or array list of templates)
@@ -200,9 +200,10 @@ class FormFile
      * 		@param		string				$title				Title to show on top of form
      * 		@param		string				$buttonlabel		Label on submit button
      * 		@param		string				$codelang			Default language code to use on lang combo box if multilang is enabled
+     * 		@param		string				$morepicto			Add more HTML content into cell with picto
      * 		@return		string              					Output string with HTML array of documents (might be empty string)
      */
-    function showdocuments($modulepart,$filename,$filedir,$urlsource,$genallowed,$delallowed=0,$modelselected='',$allowgenifempty=1,$forcenomultilang=0,$iconPDF=0,$maxfilenamelength=28,$noform=0,$param='',$title='',$buttonlabel='',$codelang='')
+    function showdocuments($modulepart,$filename,$filedir,$urlsource,$genallowed,$delallowed=0,$modelselected='',$allowgenifempty=1,$forcenomultilang=0,$iconPDF=0,$maxfilenamelength=28,$noform=0,$param='',$title='',$buttonlabel='',$codelang='',$morepicto='')
     {
         global $langs,$conf,$hookmanager;
         global $bc;
@@ -220,7 +221,6 @@ class FormFile
         $out='';
         $var=true;
 
-        //$filename = dol_sanitizeFileName($filename);    //Must be sanitized before calling show_documents
         $headershown=0;
         $showempty=0;
         $i=0;
@@ -231,7 +231,7 @@ class FormFile
         $out.= "\n".'<!-- Start show_document -->'."\n";
         //print 'filedir='.$filedir;
 
-        // Affiche en-tete tableau
+        // Show table
         if ($genallowed)
         {
             $modellist=array();
@@ -390,19 +390,6 @@ class FormFile
             $buttonlabeltoshow=$buttonlabel;
             if (empty($buttonlabel)) $buttonlabel=$langs->trans('Generate');
 
-
-// Keep this. Used for test with jmobile
-/*print '
-<form id="form1" name="form1">
-<select id="custom-select2a" name="custom-select2a">
-<option value="" data-placeholder="true">Choose One...</option>
-<option value="option1">Option #1</option>
-<option value="option2">Option #2</option>
-<option value="option3">Option #3 - This is a really f fsd f gdfgdgd gd gd gd fgd gd gd fgd fgfdreally really really really long label.</option>
-</select>
-</form>
-';*/
-
             if (empty($noform)) $out.= '<form action="'.$urlsource.(empty($conf->global->MAIN_JUMP_TAG)?'':'#builddoc').'" name="'.$forname.'" id="'.$forname.'_form" method="post">';
             $out.= '<input type="hidden" name="action" value="builddoc">';
             $out.= '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
@@ -448,7 +435,8 @@ class FormFile
             $out.= '</th>';
 
             // Button
-            $out.= '<th align="center" colspan="'.($delallowed?'2':'1').'" class="formdocbutton liste_titre">';
+            $addcolumforpicto=($delallowed || $printer || $morepicto);
+            $out.= '<th align="center" colspan="'.($addcolumforpicto?'2':'1').'" class="formdocbutton liste_titre">';
             $genbutton = '<input class="button" id="'.$forname.'_generatebutton"';
             $genbutton.= ' type="submit" value="'.$buttonlabel.'"';
             if (! $allowgenifempty && ! is_array($modellist) && empty($modellist)) $genbutton.= ' disabled="disabled"';
@@ -462,7 +450,6 @@ class FormFile
             $out.= $genbutton;
             $out.= '</th>';
 
-            if ($printer) $out.= '<th></th>';
             if($hookmanager->hooks['formfile'])
             {
                 foreach($hookmanager->hooks['formfile'] as $module)
@@ -524,22 +511,30 @@ class FormFile
 					$date=(! empty($file['date'])?$file['date']:dol_filemtime($filedir."/".$file["name"]));
 					$out.= '<td align="right" class="nowrap">'.dol_print_date($date, 'dayhour').'</td>';
 
-					if ($delallowed)
+					if ($delallowed || $printer || $morepicto)
 					{
 						$out.= '<td align="right">';
-						$out.= '<a href="'.$urlsource.(strpos($urlsource,'?')?'&':'?').'action=remove_file&file='.urlencode($relativepath);
-						$out.= ($param?'&'.$param:'');
-						//$out.= '&modulepart='.$modulepart; // TODO obsolete ?
-						//$out.= '&urlsource='.urlencode($urlsource); // TODO obsolete ?
-						$out.= '">'.img_delete().'</a></td>';
-					}
-                    // Printer Icon
-                    if ($printer)
-                    {
-                        $out.= '<td align="right">';
-                        $out.= '&nbsp;<a href="'.$urlsource.'&action=print_file&amp;printer='.$modulepart.'&amp;file='.urlencode($relativepath);
-                        $out.= ($param?'&'.$param:'');
-                        $out.= '">'.img_printer().'</a></td>';
+						if ($delallowed)
+						{
+							$out.= '<a href="'.$urlsource.(strpos($urlsource,'?')?'&':'?').'action=remove_file&file='.urlencode($relativepath);
+							$out.= ($param?'&'.$param:'');
+							//$out.= '&modulepart='.$modulepart; // TODO obsolete ?
+							//$out.= '&urlsource='.urlencode($urlsource); // TODO obsolete ?
+							$out.= '">'.img_picto($langs->trans("Delete"), 'delete.png').'</a>';
+							//$out.='</td>';
+						}
+						if ($printer)
+						{
+							//$out.= '<td align="right">';
+    	                    $out.= '&nbsp;<a href="'.$urlsource.(strpos($urlsource,'?')?'&':'?').'action=print_file&amp;printer='.$modulepart.'&amp;file='.urlencode($relativepath);
+        	                $out.= ($param?'&'.$param:'');
+            	            $out.= '">'.img_picto($langs->trans("Print"),'printer.png').'</a>';
+						}
+						if ($morepicto)
+						{
+                        	$out.=$morepicto;
+						}
+                        $out.='</td>';
                     }
                     if (is_object($hookmanager))
                     {
diff --git a/htdocs/core/lib/files.lib.php b/htdocs/core/lib/files.lib.php
index 02cb6e663e2..e76705a1690 100644
--- a/htdocs/core/lib/files.lib.php
+++ b/htdocs/core/lib/files.lib.php
@@ -1233,7 +1233,7 @@ function dol_most_recent_file($dir,$regexfilter='',$excludefilter=array('\.meta$
 /**
  * Security check when accessing to a document (used by document.php, viewimage.php and webservices)
  *
- * @param	string	$modulepart			Module of document
+ * @param	string	$modulepart			Module of document (module, module_user_temp, module_user or module_temp)
  * @param	string	$original_file		Relative path with filename
  * @param	string	$entity				Restrict onto entity
  * @param  	User	$fuser				User object (forced)

From f009100126e19c7a511a3a3a27c72865a54974e1 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 12 Jul 2013 16:51:31 +0200
Subject: [PATCH 16/16] Fix: Bad column

---
 htdocs/compta/facture/impayees.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/htdocs/compta/facture/impayees.php b/htdocs/compta/facture/impayees.php
index 1d7fda3934f..470dfa56ba3 100644
--- a/htdocs/compta/facture/impayees.php
+++ b/htdocs/compta/facture/impayees.php
@@ -414,7 +414,6 @@ if ($resql)
 		print '<td align="right"><b>'.price($total_paid).'</b></td>';
 		print '<td align="center">&nbsp;</td>';
 		print '<td align="center">&nbsp;</td>';
-		print '<td align="center">&nbsp;</td>';
 		print "</tr>\n";
 	}