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/38] 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/38] [ 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/38] [ 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/38] 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/38] 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/38] 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/38] 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/38] 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/38] 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/38] 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/38] 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/38] 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 807cbe416310ac8c43046c371f3fa3456a2b7d14 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 11 Jul 2013 09:43:07 +0200
Subject: [PATCH 13/38] Add option MAIN_GENERATE_DOCUMENT_WITH_PICTURE

---
 .../modules/propale/doc/pdf_azur.modules.php  | 84 +++++++++++++++++--
 1 file changed, 79 insertions(+), 5 deletions(-)

diff --git a/htdocs/core/modules/propale/doc/pdf_azur.modules.php b/htdocs/core/modules/propale/doc/pdf_azur.modules.php
index 772e7599568..d0295a33f72 100644
--- a/htdocs/core/modules/propale/doc/pdf_azur.modules.php
+++ b/htdocs/core/modules/propale/doc/pdf_azur.modules.php
@@ -33,7 +33,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/pdf.lib.php';
 
 
 /**
- *	Classe permettant de generer les propales au modele Azur
+ *	Class to generate PDF proposal Azur
  */
 class pdf_azur extends ModelePDFPropales
 {
@@ -102,6 +102,7 @@ class pdf_azur extends ModelePDFPropales
 
 		// Define position of columns
 		$this->posxdesc=$this->marge_gauche+1;
+		$this->posxpicture=95;
 		$this->posxtva=111;
 		$this->posxup=126;
 		$this->posxqty=145;
@@ -281,7 +282,15 @@ class pdf_azur extends ModelePDFPropales
 					$showpricebeforepagebreak=1;
 
 					$pdf->startTransaction();
-					pdf_writelinedesc($pdf,$object,$i,$outputlangs,$this->posxtva-$curX,3,$curX,$curY,$hideref,$hidedesc);
+					if (empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITH_PICTURE))
+					{
+						pdf_writelinedesc($pdf,$object,$i,$outputlangs,$this->posxtva-$curX,3,$curX,$curY,$hideref,$hidedesc);
+					}
+					else
+					{
+						pdf_writelinedesc($pdf,$object,$i,$outputlangs,$this->posxpicture-$curX,3,$curX,$curY,$hideref,$hidedesc);
+					}
+
 					$pageposafter=$pdf->getPage();
 					if ($pageposafter > $pageposbefore)	// There is a pagebreak
 					{
@@ -289,7 +298,15 @@ class pdf_azur extends ModelePDFPropales
 						$pageposafter=$pageposbefore;
 						//print $pageposafter.'-'.$pageposbefore;exit;
 						$pdf->setPageOrientation('', 1, $heightforfooter);	// The only function to edit the bottom margin of current page to set it.
-						pdf_writelinedesc($pdf,$object,$i,$outputlangs,$this->posxtva-$curX,4,$curX,$curY,$hideref,$hidedesc);
+						if (empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITH_PICTURE))
+						{
+							pdf_writelinedesc($pdf,$object,$i,$outputlangs,$this->posxtva-$curX,3,$curX,$curY,$hideref,$hidedesc);
+						}
+						else
+						{
+							pdf_writelinedesc($pdf,$object,$i,$outputlangs,$this->posxpicture-$curX,3,$curX,$curY,$hideref,$hidedesc);
+						}
+
 						$pageposafter=$pdf->getPage();
 						$posyafter=$pdf->GetY();
 						if ($posyafter > ($this->page_hauteur - ($heightforfooter+$heightforfreetext+$heightforinfotot)))	// There is no space left for total+free text
@@ -326,6 +343,53 @@ class pdf_azur extends ModelePDFPropales
 
 					$pdf->SetFont('','', $default_font_size - 1);   // On repositionne la police par defaut
 
+					// Photo
+					if (! empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITH_PICTURE))
+					{
+						$curX = $this->posxpicture-1;
+						if ($object->lines[$i]->fk_product)
+						{
+							$objphoto = new Product($this->db);
+							$objphoto->fetch($object->lines[$i]->fk_product);
+
+							$pdir = get_exdir($object->lines[$i]->fk_product,2) . $object->lines[$i]->fk_product ."/photos/";
+							$dir = $conf->product->dir_output.'/'.$pdir;
+
+							$realpath='';
+							if ($object->ref == 'SPECIMEN')
+							{
+								$realpath = DOL_DOCUMENT_ROOT.'/theme/common/nophoto.jpg';
+							}
+							else
+							{
+								foreach ($objphoto->liste_photos($dir,1) as $key => $obj)
+								{
+									if ($obj['photo_vignette'])
+									{
+										$filename='thumbs/'.$obj['photo_vignette'];
+									}
+									else
+									{
+										$filename=$obj['photo'];
+									}
+
+									$realpath = $dir.$filename;
+									break;
+								}
+							}
+
+							if (!empty($realpath))
+							{
+								$tmp=pdf_getHeightForImage($realpath);
+								//var_dump($tmp['height']);exit;
+								$pdf->Image($realpath, $curX, $curY-1, $tmp['width'], $tmp['height'],'','','',2, 300);	// Use 300 dpi
+								//$nexY += 7;	// +7 for height = 12
+								$nexY += round($tmp['height'] / 12 * 7);
+								//var_dump($nexY);exit;
+							}
+						}
+					}
+
 					// VAT Rate
 					if (empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT))
 					{
@@ -744,7 +808,7 @@ class pdf_azur extends ModelePDFPropales
 				//{
 					foreach( $this->localtax1 as $localtax_type => $localtax_rate )
 					{
-						if (in_array((string) $localtax_type, array('1','3','5','7'))) continue;
+						if (in_array((string) $localtax_type, array('1','3','5'))) continue;
 
 						foreach( $localtax_rate as $tvakey => $tvaval )
 						{
@@ -776,7 +840,7 @@ class pdf_azur extends ModelePDFPropales
 				//{
 					foreach( $this->localtax2 as $localtax_type => $localtax_rate )
 					{
-						if (in_array((string) $localtax_type, array('1','3','5','7'))) continue;
+						if (in_array((string) $localtax_type, array('1','3','5'))) continue;
 
 						foreach( $localtax_rate as $tvakey => $tvaval )
 						{
@@ -1009,6 +1073,16 @@ class pdf_azur extends ModelePDFPropales
 			$pdf->MultiCell(108,2, $outputlangs->transnoentities("Designation"),'','L');
 		}
 
+		if (! empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITH_PICTURE))
+		{
+			$pdf->line($this->posxpicture-1, $tab_top, $this->posxpicture-1, $tab_top + $tab_height);
+			if (empty($hidetop))
+			{
+				$pdf->SetXY($this->posxpicture-1, $tab_top+1);
+				$pdf->MultiCell($this->posxtva-$this->posxpicture-1,2, $outputlangs->transnoentities("Photo"),'','C');
+			}
+		}
+
 		if (empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT))
 		{
 			$pdf->line($this->posxtva-1, $tab_top, $this->posxtva-1, $tab_top + $tab_height);

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 14/38] 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 15/38] 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 16/38] 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 17/38] 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";
 	}
 

From b5820315f9166f3cf0f56027a19ccadfad4cff36 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 13 Jul 2013 10:34:19 +0200
Subject: [PATCH 18/38] Fix: Correct permissions on files

---
 dev/initdata/generate-commande.php            |   0
 dev/initdata/generate-facture.php             |   0
 dev/initdata/generate-produit.php             |   0
 dev/initdata/generate-propale.php             |   4 +-
 dev/initdata/generate-societe.php             |   0
 htdocs/admin/geoipmaxmind.php                 |   2 +-
 htdocs/admin/pdf.php                          |   0
 htdocs/admin/proxy.php                        |   0
 htdocs/admin/sms.php                          |   0
 htdocs/admin/system/perf.php                  | 142 +++++++++---------
 htdocs/admin/translation.php                  |   0
 htdocs/admin/workflow.php                     |   0
 htdocs/core/class/CSMSFile.class.php          |   0
 .../core/class/commondocgenerator.class.php   |   0
 htdocs/core/class/extrafields.class.php       |   0
 htdocs/core/class/genericobject.class.php     |   0
 htdocs/core/class/hookmanager.class.php       |   0
 htdocs/core/class/html.formfile.class.php     |   8 +-
 htdocs/core/class/html.formsms.class.php      |   0
 htdocs/core/class/rssparser.class.php         |   0
 htdocs/core/class/smtps.class.php             |   0
 htdocs/core/class/vcard.class.php             |   0
 .../interface_20_all_Logevents.class.php      |   0
 ...face_20_modPaypal_PaypalWorkflow.class.php |   0
 ...e_20_modWorkflow_WorkflowManager.class.php |   0
 ...terface_50_modAgenda_ActionsAuto.class.php |  28 ++--
 ...interface_50_modLdap_Ldapsynchro.class.php |   0
 ..._50_modNotification_Notification.class.php |   0
 .../interface_90_all_Demo.class.php-NORUN     |   0
 htdocs/filefunc.inc.php                       |   0
 htdocs/fourn/commande/index.php               |   0
 htdocs/fourn/commande/liste.php               |   6 +-
 htdocs/includes/jquery/plugins/flot/Makefile  |  24 +--
 33 files changed, 107 insertions(+), 107 deletions(-)
 mode change 100644 => 100755 dev/initdata/generate-commande.php
 mode change 100644 => 100755 dev/initdata/generate-facture.php
 mode change 100644 => 100755 dev/initdata/generate-produit.php
 mode change 100644 => 100755 dev/initdata/generate-propale.php
 mode change 100644 => 100755 dev/initdata/generate-societe.php
 mode change 100755 => 100644 htdocs/admin/pdf.php
 mode change 100755 => 100644 htdocs/admin/proxy.php
 mode change 100755 => 100644 htdocs/admin/sms.php
 mode change 100755 => 100644 htdocs/admin/translation.php
 mode change 100755 => 100644 htdocs/admin/workflow.php
 mode change 100755 => 100644 htdocs/core/class/CSMSFile.class.php
 mode change 100755 => 100644 htdocs/core/class/commondocgenerator.class.php
 mode change 100755 => 100644 htdocs/core/class/extrafields.class.php
 mode change 100755 => 100644 htdocs/core/class/genericobject.class.php
 mode change 100755 => 100644 htdocs/core/class/hookmanager.class.php
 mode change 100755 => 100644 htdocs/core/class/html.formsms.class.php
 mode change 100755 => 100644 htdocs/core/class/rssparser.class.php
 mode change 100755 => 100644 htdocs/core/class/smtps.class.php
 mode change 100755 => 100644 htdocs/core/class/vcard.class.php
 mode change 100755 => 100644 htdocs/core/triggers/interface_20_all_Logevents.class.php
 mode change 100755 => 100644 htdocs/core/triggers/interface_20_modPaypal_PaypalWorkflow.class.php
 mode change 100755 => 100644 htdocs/core/triggers/interface_20_modWorkflow_WorkflowManager.class.php
 mode change 100755 => 100644 htdocs/core/triggers/interface_50_modAgenda_ActionsAuto.class.php
 mode change 100755 => 100644 htdocs/core/triggers/interface_50_modLdap_Ldapsynchro.class.php
 mode change 100755 => 100644 htdocs/core/triggers/interface_50_modNotification_Notification.class.php
 mode change 100755 => 100644 htdocs/core/triggers/interface_90_all_Demo.class.php-NORUN
 mode change 100755 => 100644 htdocs/filefunc.inc.php
 mode change 100755 => 100644 htdocs/fourn/commande/index.php

diff --git a/dev/initdata/generate-commande.php b/dev/initdata/generate-commande.php
old mode 100644
new mode 100755
diff --git a/dev/initdata/generate-facture.php b/dev/initdata/generate-facture.php
old mode 100644
new mode 100755
diff --git a/dev/initdata/generate-produit.php b/dev/initdata/generate-produit.php
old mode 100644
new mode 100755
diff --git a/dev/initdata/generate-propale.php b/dev/initdata/generate-propale.php
old mode 100644
new mode 100755
index b0724ecde4f..6d9db265b37
--- a/dev/initdata/generate-propale.php
+++ b/dev/initdata/generate-propale.php
@@ -143,8 +143,8 @@ while ($i < GEN_NUMBER_PROPAL && $result >= 0)
 		while ($xnbp < $nbp)
 		{
 			$prodid = rand(1, $num_prods);
-			$product=new Product($db);
-			$result=$product->fetch($prodids[$prodid]);
+			$product=new Product($db);
+			$result=$product->fetch($prodids[$prodid]);
 			$result=$propal->addline($product->description, $product->price, rand(1,5), 0, 0, 0, $prodids[$prodid], 0);
 			if ($result < 0)
 			{
diff --git a/dev/initdata/generate-societe.php b/dev/initdata/generate-societe.php
old mode 100644
new mode 100755
diff --git a/htdocs/admin/geoipmaxmind.php b/htdocs/admin/geoipmaxmind.php
index b06853b4383..fd7704c2858 100644
--- a/htdocs/admin/geoipmaxmind.php
+++ b/htdocs/admin/geoipmaxmind.php
@@ -90,7 +90,7 @@ if (! empty($conf->global->GEOIPMAXMIND_COUNTRY_DATAFILE))
 }
 else
 {
-	if (function_exists('geoip_country_code_by_name')) 	$geointernal=true;
+	if (function_exists('geoip_country_code_by_name')) 	$geointernal=true;
 }
 
 // Mode
diff --git a/htdocs/admin/pdf.php b/htdocs/admin/pdf.php
old mode 100755
new mode 100644
diff --git a/htdocs/admin/proxy.php b/htdocs/admin/proxy.php
old mode 100755
new mode 100644
diff --git a/htdocs/admin/sms.php b/htdocs/admin/sms.php
old mode 100755
new mode 100644
diff --git a/htdocs/admin/system/perf.php b/htdocs/admin/system/perf.php
index 563bb3e8385..4f24998227a 100644
--- a/htdocs/admin/system/perf.php
+++ b/htdocs/admin/system/perf.php
@@ -22,8 +22,8 @@
 
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/memory.lib.php';
-require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
-require_once DOL_DOCUMENT_ROOT.'/core/lib/geturl.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/geturl.lib.php';
 
 $langs->load("admin");
 $langs->load("install");
@@ -55,18 +55,18 @@ print $langs->trans("YouMayFindPerfAdviceHere",'http://wiki.dolibarr.org/index.p
 print '<br>';
 print '<strong>'.$langs->trans("XDebug").'</strong>: ';
 $test=!function_exists('xdebug_is_enabled');
-if ($test) print img_picto('','tick.png').' '.$langs->trans("NotInstalled");
+if ($test) print img_picto('','tick.png').' '.$langs->trans("NotInstalled");
 else 
 {
 	print img_picto('','warning').' '.$langs->trans("XDebugInstalled");
 	print $langs->trans("MoreInformation").' <a href="'.DOL_URL_ROOT.'/admin/xdebug.php'.'">XDebug admin page</a>';
-}
-print '<br>';
+}
+print '<br>';
 
 // Applicative cache
-print '<br>';
-print '<strong>'.$langs->trans("ApplicativeCache").'</strong>: ';
-$test=!empty($conf->memcached->enabled);
+print '<br>';
+print '<strong>'.$langs->trans("ApplicativeCache").'</strong>: ';
+$test=!empty($conf->memcached->enabled);
 if ($test) 
 {
 	if (!empty($conf->global->MEMCACHED_SERVER))
@@ -78,28 +78,28 @@ if ($test)
 	{
 		print img_picto('','warning').' '.$langs->trans("MemcachedModuleAvailableButNotSetup");
 	}
-}
-else print img_picto('','warning').' '.$langs->trans("MemcachedNotAvailable");
+}
+else print img_picto('','warning').' '.$langs->trans("MemcachedNotAvailable");
 print '</br>';
 
 // OPCode cache
-print '<br>';
+print '<br>';
 print '<strong>'.$langs->trans("OPCodeCache").'</strong>: ';
-$test1=function_exists('xcache_info');
+$test1=function_exists('xcache_info');
 if ($test1) 
 {
 	print img_picto('','tick.png').' '.$langs->trans("XCacheInstalled");
-	print $langs->trans("MoreInformation").' <a href="'.DOL_URL_ROOT.'/admin/xcache.php'.'">Xcache admin page</a>';
-}
+	print $langs->trans("MoreInformation").' <a href="'.DOL_URL_ROOT.'/admin/xcache.php'.'">Xcache admin page</a>';
+}
 else 
 {
 	$test2=function_exists('eaccelerator_info');
 	if ($test2) print img_picto('','tick.png').' '.$langs->trans("EAcceleratorInstalled");
 	else print $langs->trans("NoOPCodeCacheFound");
-}
-print '<br>';
+}
+print '<br>';
 
-// HTTPCacheStaticResources
+// HTTPCacheStaticResources
 print '<script type="text/javascript" language="javascript">
 jQuery(document).ready(function() {
   var getphpurl;
@@ -360,28 +360,28 @@ print '<div id="httpcachejsphpko">'.img_picto('','warning.png').' '.$langs->tran
 print '<br>';
 print '<strong>'.$langs->trans("HTTPCacheStaticResources").' - ';
 print $langs->trans("CacheByClient").':</strong><br>';
-print $langs->trans("TestNotPossibleWithCurrentBrowsers").'<br>';
+print $langs->trans("TestNotPossibleWithCurrentBrowsers").'<br>';
 
 
-// Compressions
-print '<br>';
+// Compressions
+print '<br>';
 print '<strong>'.$langs->trans("CompressionOfResources").'</strong>: ';
 //$tmp=getURLContent(DOL_URL_ROOT.'/index.php','GET');var_dump($tmp);
-print '<br>';
-// on PHP
-print '<div id="httpcompphpok">'.img_picto('','tick.png').' '.$langs->trans("FilesOfTypeCompressed",'php (.php)').'</div>';
-print '<div id="httpcompphpko">'.img_picto('','warning.png').' '.$langs->trans("FilesOfTypeNotCompressed",'php (.php)').'</div>';
-// on rest
-print '<div id="httpcompcssok">'.img_picto('','tick.png').' '.$langs->trans("FilesOfTypeCompressed",'css (.css)').'</div>';
-print '<div id="httpcompcssko">'.img_picto('','warning.png').' '.$langs->trans("FilesOfTypeNotCompressed",'css (.css)').'</div>';
-print '<div id="httpcompcssphpok">'.img_picto('','tick.png').' '.$langs->trans("FilesOfTypeCompressed",'css (.css.php)').'</div>';
-print '<div id="httpcompcssphpko">'.img_picto('','warning.png').' '.$langs->trans("FilesOfTypeNotCompressed",'css (.css.php)').'</div>';
-//print '<div id="httpcompimgok">'.img_picto('','tick.png').' '.$langs->trans("FilesOfTypeCompressed",'img (.png)').'</div>';
-//print '<div id="httpcompimgko">'.img_picto('','warning.png').' '.$langs->trans("FilesOfTypeNotCompressed",'img (.png)').'</div>';
-print '<div id="httpcompjsok">'.img_picto('','tick.png').' '.$langs->trans("FilesOfTypeCompressed",'javascript (.js)').'</div>';
-print '<div id="httpcompjsko">'.img_picto('','warning.png').' '.$langs->trans("FilesOfTypeNotCompressed",'javascript (.js)').'</div>';
-print '<div id="httpcompjsphpok">'.img_picto('','tick.png').' '.$langs->trans("FilesOfTypeCompressed",'javascript (.js.php)').'</div>';
-print '<div id="httpcompjsphpko">'.img_picto('','warning.png').' '.$langs->trans("FilesOfTypeNotCompressed",'javascript (.js.php)').'</div>';
+print '<br>';
+// on PHP
+print '<div id="httpcompphpok">'.img_picto('','tick.png').' '.$langs->trans("FilesOfTypeCompressed",'php (.php)').'</div>';
+print '<div id="httpcompphpko">'.img_picto('','warning.png').' '.$langs->trans("FilesOfTypeNotCompressed",'php (.php)').'</div>';
+// on rest
+print '<div id="httpcompcssok">'.img_picto('','tick.png').' '.$langs->trans("FilesOfTypeCompressed",'css (.css)').'</div>';
+print '<div id="httpcompcssko">'.img_picto('','warning.png').' '.$langs->trans("FilesOfTypeNotCompressed",'css (.css)').'</div>';
+print '<div id="httpcompcssphpok">'.img_picto('','tick.png').' '.$langs->trans("FilesOfTypeCompressed",'css (.css.php)').'</div>';
+print '<div id="httpcompcssphpko">'.img_picto('','warning.png').' '.$langs->trans("FilesOfTypeNotCompressed",'css (.css.php)').'</div>';
+//print '<div id="httpcompimgok">'.img_picto('','tick.png').' '.$langs->trans("FilesOfTypeCompressed",'img (.png)').'</div>';
+//print '<div id="httpcompimgko">'.img_picto('','warning.png').' '.$langs->trans("FilesOfTypeNotCompressed",'img (.png)').'</div>';
+print '<div id="httpcompjsok">'.img_picto('','tick.png').' '.$langs->trans("FilesOfTypeCompressed",'javascript (.js)').'</div>';
+print '<div id="httpcompjsko">'.img_picto('','warning.png').' '.$langs->trans("FilesOfTypeNotCompressed",'javascript (.js)').'</div>';
+print '<div id="httpcompjsphpok">'.img_picto('','tick.png').' '.$langs->trans("FilesOfTypeCompressed",'javascript (.js.php)').'</div>';
+print '<div id="httpcompjsphpko">'.img_picto('','warning.png').' '.$langs->trans("FilesOfTypeNotCompressed",'javascript (.js.php)').'</div>';
 
 // Database driver
 print '<br>';
@@ -389,52 +389,52 @@ print '<strong>'.$langs->trans("DriverType").'</strong>: ';
 print '<br>';
 if ($conf->db->type == 'mysql' || $conf->db->type == 'mysqli')
 {
-	$test=($conf->db->type == 'mysqli');
-	if ($test)
-	{
-		print img_picto('','tick.png').' '.$langs->trans("YouUseBestDriver",$conf->db->type);
-	}
-	else
-	{
+	$test=($conf->db->type == 'mysqli');
+	if ($test)
+	{
+		print img_picto('','tick.png').' '.$langs->trans("YouUseBestDriver",$conf->db->type);
+	}
+	else
+	{
 		print img_picto('','warning.png').' '.$langs->trans("YouDoNotUseBestDriver",$conf->db->type,'mysqli');
-	}
-	print '<br>';
+	}
+	print '<br>';
 }
-
-// Product search
-print '<br>';
-print '<strong>'.$langs->trans("SearchOptim").'</strong>: ';
+
+// Product search
 print '<br>';
-$tab = array();
-$sql = "SELECT COUNT(*) as nb";
-$sql.= " FROM ".MAIN_DB_PREFIX."product as p";
-$resql=$db->query($sql);
-if ($resql)
+print '<strong>'.$langs->trans("SearchOptim").'</strong>: ';
+print '<br>';
+$tab = array();
+$sql = "SELECT COUNT(*) as nb";
+$sql.= " FROM ".MAIN_DB_PREFIX."product as p";
+$resql=$db->query($sql);
+if ($resql)
 {
 	$limitforoptim=10000;
-	$num=$db->num_rows($resql);
+	$num=$db->num_rows($resql);
 	if ($nb > $limitforoptim)
 	{
-		if (empty($conf->global->PRODUCT_DONOTSEARCH_ANYWHERE))
-		{
-			print img_picto('','warning.png').' '.$langs->trans("YouHaveXProductUseSearchOptim",$num);
-		}
-		else
-		{
-			print img_picto('','tick.png').' '.$langs->trans("YouHaveXProductAndSearchOptimOn",$num);
-		}
+		if (empty($conf->global->PRODUCT_DONOTSEARCH_ANYWHERE))
+		{
+			print img_picto('','warning.png').' '.$langs->trans("YouHaveXProductUseSearchOptim",$num);
+		}
+		else
+		{
+			print img_picto('','tick.png').' '.$langs->trans("YouHaveXProductAndSearchOptimOn",$num);
+		}
 	}
 	else 
 	{
 		print img_picto('','tick.png').' '.$langs->trans("NbOfProductIsLowerThanNoPb",$limitforoptim);		
 	}
 	print '<br>';
-	$db->free($resql);
-}
+	$db->free($resql);
+}
 
 // Browser
-print '<br>';
-print '<strong>'.$langs->trans("Browser").'</strong>:<br>';
+print '<br>';
+print '<strong>'.$langs->trans("Browser").'</strong>:<br>';
 if (! in_array($conf->browser->name, array('chrome','opera','safari','firefox')))
 {
 	print img_picto('','warning.png').' '.$langs->trans("BrowserIsKO",$conf->browser->name); 
@@ -443,14 +443,14 @@ else
 {
 	print img_picto('','tick.png').' '.$langs->trans("BrowserIsOK",$conf->browser->name);
 }
-print '<br>';
+print '<br>';
 
 // Database statistics update
 /*
-print '<br>';
-print '<strong>'.$langs->trans("DatabaseStatistics").'</strong>: ';
-print '<br>';
-*/
+print '<br>';
+print '<strong>'.$langs->trans("DatabaseStatistics").'</strong>: ';
+print '<br>';
+*/
 
 
 llxFooter();
diff --git a/htdocs/admin/translation.php b/htdocs/admin/translation.php
old mode 100755
new mode 100644
diff --git a/htdocs/admin/workflow.php b/htdocs/admin/workflow.php
old mode 100755
new mode 100644
diff --git a/htdocs/core/class/CSMSFile.class.php b/htdocs/core/class/CSMSFile.class.php
old mode 100755
new mode 100644
diff --git a/htdocs/core/class/commondocgenerator.class.php b/htdocs/core/class/commondocgenerator.class.php
old mode 100755
new mode 100644
diff --git a/htdocs/core/class/extrafields.class.php b/htdocs/core/class/extrafields.class.php
old mode 100755
new mode 100644
diff --git a/htdocs/core/class/genericobject.class.php b/htdocs/core/class/genericobject.class.php
old mode 100755
new mode 100644
diff --git a/htdocs/core/class/hookmanager.class.php b/htdocs/core/class/hookmanager.class.php
old mode 100755
new mode 100644
diff --git a/htdocs/core/class/html.formfile.class.php b/htdocs/core/class/html.formfile.class.php
index fc87c58cdc4..533472e5acd 100644
--- a/htdocs/core/class/html.formfile.class.php
+++ b/htdocs/core/class/html.formfile.class.php
@@ -142,10 +142,10 @@ class FormFile
             $out .= "\n<!-- End form attach new file -->\n\n";
             $parameters = array('socid'=>(isset($GLOBALS['socid'])?$GLOBALS['socid']:''),'id'=>(isset($GLOBALS['id'])?$GLOBALS['id']:''), 'url'=>$url);
             $res = $hookmanager->executeHooks('formattachOptions',$parameters,$object);
-            if (empty($res))
-            {
-            	print $out;
-            }
+            if (empty($res))
+            {
+            	print $out;
+            }
             print $hookmanager->resprint;
 
             return 1;
diff --git a/htdocs/core/class/html.formsms.class.php b/htdocs/core/class/html.formsms.class.php
old mode 100755
new mode 100644
diff --git a/htdocs/core/class/rssparser.class.php b/htdocs/core/class/rssparser.class.php
old mode 100755
new mode 100644
diff --git a/htdocs/core/class/smtps.class.php b/htdocs/core/class/smtps.class.php
old mode 100755
new mode 100644
diff --git a/htdocs/core/class/vcard.class.php b/htdocs/core/class/vcard.class.php
old mode 100755
new mode 100644
diff --git a/htdocs/core/triggers/interface_20_all_Logevents.class.php b/htdocs/core/triggers/interface_20_all_Logevents.class.php
old mode 100755
new mode 100644
diff --git a/htdocs/core/triggers/interface_20_modPaypal_PaypalWorkflow.class.php b/htdocs/core/triggers/interface_20_modPaypal_PaypalWorkflow.class.php
old mode 100755
new mode 100644
diff --git a/htdocs/core/triggers/interface_20_modWorkflow_WorkflowManager.class.php b/htdocs/core/triggers/interface_20_modWorkflow_WorkflowManager.class.php
old mode 100755
new mode 100644
diff --git a/htdocs/core/triggers/interface_50_modAgenda_ActionsAuto.class.php b/htdocs/core/triggers/interface_50_modAgenda_ActionsAuto.class.php
old mode 100755
new mode 100644
index 7b6b6399587..12abe3ea88a
--- a/htdocs/core/triggers/interface_50_modAgenda_ActionsAuto.class.php
+++ b/htdocs/core/triggers/interface_50_modAgenda_ActionsAuto.class.php
@@ -556,20 +556,20 @@ class InterfaceActionsAuto
         }
 
         // Projects
-        elseif ($action == 'PROJECT_CREATE')
-        {
-        	dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
-        	$langs->load("other");
-        	$langs->load("projects");
-        	$langs->load("agenda");
-
-        	$object->actiontypecode='AC_OTH_AUTO';
-        	if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("ProjectCreatedInDolibarr",$object->ref);
-        	$object->actionmsg=$langs->transnoentities("ProjectCreatedInDolibarr",$object->ref);
-        	$object->actionmsg.="\n".$langs->transnoentities("Project").': '.$object->ref;
-        	$object->actionmsg.="\n".$langs->transnoentities("Author").': '.$user->login;
-        	$object->sendtoid=0;
-        	$ok=1;
+        elseif ($action == 'PROJECT_CREATE')
+        {
+        	dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
+        	$langs->load("other");
+        	$langs->load("projects");
+        	$langs->load("agenda");
+
+        	$object->actiontypecode='AC_OTH_AUTO';
+        	if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("ProjectCreatedInDolibarr",$object->ref);
+        	$object->actionmsg=$langs->transnoentities("ProjectCreatedInDolibarr",$object->ref);
+        	$object->actionmsg.="\n".$langs->transnoentities("Project").': '.$object->ref;
+        	$object->actionmsg.="\n".$langs->transnoentities("Author").': '.$user->login;
+        	$object->sendtoid=0;
+        	$ok=1;
         }
 
 		// If not found
diff --git a/htdocs/core/triggers/interface_50_modLdap_Ldapsynchro.class.php b/htdocs/core/triggers/interface_50_modLdap_Ldapsynchro.class.php
old mode 100755
new mode 100644
diff --git a/htdocs/core/triggers/interface_50_modNotification_Notification.class.php b/htdocs/core/triggers/interface_50_modNotification_Notification.class.php
old mode 100755
new mode 100644
diff --git a/htdocs/core/triggers/interface_90_all_Demo.class.php-NORUN b/htdocs/core/triggers/interface_90_all_Demo.class.php-NORUN
old mode 100755
new mode 100644
diff --git a/htdocs/filefunc.inc.php b/htdocs/filefunc.inc.php
old mode 100755
new mode 100644
diff --git a/htdocs/fourn/commande/index.php b/htdocs/fourn/commande/index.php
old mode 100755
new mode 100644
diff --git a/htdocs/fourn/commande/liste.php b/htdocs/fourn/commande/liste.php
index 26b8ab9f006..a65e19137ee 100644
--- a/htdocs/fourn/commande/liste.php
+++ b/htdocs/fourn/commande/liste.php
@@ -125,9 +125,9 @@ if ($resql)
 
 	$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;
+	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%">';
diff --git a/htdocs/includes/jquery/plugins/flot/Makefile b/htdocs/includes/jquery/plugins/flot/Makefile
index c3aba861c50..2e070d0c3c0 100644
--- a/htdocs/includes/jquery/plugins/flot/Makefile
+++ b/htdocs/includes/jquery/plugins/flot/Makefile
@@ -1,12 +1,12 @@
-# Makefile for generating minified files
-
-.PHONY: all
-
-# we cheat and process all .js files instead of an exhaustive list
-all: $(patsubst %.js,%.min.js,$(filter-out %.min.js,$(wildcard *.js)))
-
-%.min.js: %.js
-	yui-compressor $< -o $@
-
-test:
-	./node_modules/.bin/jshint *jquery.flot.js
+# Makefile for generating minified files
+
+.PHONY: all
+
+# we cheat and process all .js files instead of an exhaustive list
+all: $(patsubst %.js,%.min.js,$(filter-out %.min.js,$(wildcard *.js)))
+
+%.min.js: %.js
+	yui-compressor $< -o $@
+
+test:
+	./node_modules/.bin/jshint *jquery.flot.js

From 3f94950b0ee80dde16a7791dc051194159f3f65f Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 13 Jul 2013 16:54:17 +0200
Subject: [PATCH 19/38] Fix: Clean supplier ref

---
 htdocs/fourn/class/fournisseur.class.php         | 3 +--
 htdocs/fourn/class/fournisseur.facture.class.php | 3 ++-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/htdocs/fourn/class/fournisseur.class.php b/htdocs/fourn/class/fournisseur.class.php
index 708f75a9b2a..5440b11e874 100644
--- a/htdocs/fourn/class/fournisseur.class.php
+++ b/htdocs/fourn/class/fournisseur.class.php
@@ -29,8 +29,7 @@ require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.product.class.php';
 
 
 /**
- *	\class 	Fournisseur
- *	\brief 	Class to manage suppliers
+ * 	Class to manage suppliers
  */
 class Fournisseur extends Societe
 {
diff --git a/htdocs/fourn/class/fournisseur.facture.class.php b/htdocs/fourn/class/fournisseur.facture.class.php
index e62832ec692..246c3231012 100644
--- a/htdocs/fourn/class/fournisseur.facture.class.php
+++ b/htdocs/fourn/class/fournisseur.facture.class.php
@@ -120,7 +120,8 @@ class FactureFournisseur extends CommonInvoice
 		$error=0;
         $now=dol_now();
 
-        // Clear parameters
+        // Clean parameters
+        if (isset($this->ref_supplier)) $this->ref_supplier=trim($this->ref_supplier);
         if (empty($this->date)) $this->date=$now;
 
         $socid = $this->socid;

From 41cb5ec2353bf022ac21d188c8d5f32f5c350c9b Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 13 Jul 2013 17:25:10 +0200
Subject: [PATCH 20/38] Fix: Missing label

---
 htdocs/compta/bank/releve.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/htdocs/compta/bank/releve.php b/htdocs/compta/bank/releve.php
index c76e35a5ed8..4c04655ae65 100644
--- a/htdocs/compta/bank/releve.php
+++ b/htdocs/compta/bank/releve.php
@@ -309,10 +309,10 @@ else
 			print img_next().'</a>';
 			print "</td>\n";
 
-			// Num cheque
+			// Type and num
 			print '<td class="nowrap">'.$objp->fk_type.' '.($objp->num_chq?$objp->num_chq:'').'</td>';
 
-			// Libelle
+			// Description
 			print '<td valign="center"><a href="'.DOL_URL_ROOT.'/compta/bank/ligne.php?rowid='.$objp->rowid.'&amp;account='.$acct->id.'">';
 			$reg=array();
 			preg_match('/\((.+)\)/i',$objp->label,$reg);	// Si texte entoure de parenthese on tente recherche de traduction
@@ -355,7 +355,7 @@ else
 				{
 					$paymentvatstatic->id=$links[$key]['url_id'];
 					$paymentvatstatic->ref=$langs->trans("Payment");
-					print ' '.$paymentvatstatic->getNomUrl(2);
+					print ' '.$paymentvatstatic->getNomUrl(1);
 				}
 				elseif ($links[$key]['type']=='banktransfert') {
 					// Do not show link to transfer since there is no transfer card (avoid confusion). Can already be accessed from transaction detail.

From d06e9efc0fc91a091891a38b3ea06a75f7848d29 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 13 Jul 2013 17:55:14 +0200
Subject: [PATCH 21/38] Fix: Bug to delete bank line

---
 htdocs/compta/bank/account.php | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/htdocs/compta/bank/account.php b/htdocs/compta/bank/account.php
index ac36247fdba..04bae53a6b0 100644
--- a/htdocs/compta/bank/account.php
+++ b/htdocs/compta/bank/account.php
@@ -120,7 +120,7 @@ if ($action == 'add' && $id && ! isset($_POST["cancel"]) && $user->rights->banqu
 if ($action == 'confirm_delete' && $confirm == 'yes' && $user->rights->banque->modifier)
 {
 	$accline=new AccountLine($db);
-	$accline->fetch($_GET["rowid"]);
+	$result=$accline->fetch(GETPOST("rowid"));
 	$result=$accline->delete();
 }
 
@@ -295,6 +295,14 @@ if ($id > 0 || ! empty($ref))
 	 */
 	$param.='&amp;account='.$object->id.'&amp;vline='.$vline;
 
+	// Confirmation delete
+	if ($action == 'delete')
+	{
+		$text=$langs->trans('ConfirmDeleteTransaction');
+		$ret=$form->form_confirm($_SERVER['PHP_SELF'].'?id='.$object->id.'&amp;rowid='.GETPOST("rowid"),$langs->trans('DeleteTransaction'),$text,'confirm_delete');
+		if ($ret == 'html') print '<br>';
+	}
+
 	// Define transaction list navigation string
 	print '<form action="'.$_SERVER["PHP_SELF"].'" name="newpage" method="POST">';
 	print '<input type="hidden" name="token"        value="'.$_SESSION['newtoken'].'">';
@@ -321,14 +329,6 @@ if ($id > 0 || ! empty($ref))
 	$navig.='</fieldset></div>';
 	//var_dump($navig);
 
-	// Confirmation delete
-	if ($action == 'delete')
-	{
-		$text=$langs->trans('ConfirmDeleteTransaction');
-		$ret=$form->form_confirm($_SERVER['PHP_SELF'].'?id='.$object->id.'&amp;rowid='.$_GET["rowid"],$langs->trans('DeleteTransaction'),$text,'confirm_delete');
-		if ($ret == 'html') print '<br>';
-	}
-
 	print '<table class="notopnoleftnoright" width="100%">';
 
 	// Show title

From 6db9b67e35674545bfa2a5d20a92eee1de338056 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 13 Jul 2013 17:55:36 +0200
Subject: [PATCH 22/38] Fix: Missing user param

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

diff --git a/htdocs/compta/bank/class/account.class.php b/htdocs/compta/bank/class/account.class.php
index 01ec205564a..7db4831c294 100644
--- a/htdocs/compta/bank/class/account.class.php
+++ b/htdocs/compta/bank/class/account.class.php
@@ -1159,7 +1159,7 @@ class AccountLine extends CommonObject
         $this->db->begin();
 
         // Delete urls
-        $result=$this->delete_urls();
+        $result=$this->delete_urls($user);
         if ($result < 0)
         {
             $nbko++;

From 73a33a6daea9f09d260ad4c4a73bf2cc1796b4f5 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 13 Jul 2013 17:55:14 +0200
Subject: [PATCH 23/38] Fix: Bug to delete bank line

---
 htdocs/compta/bank/account.php | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/htdocs/compta/bank/account.php b/htdocs/compta/bank/account.php
index fe9cbdd0bfc..828dcf94262 100644
--- a/htdocs/compta/bank/account.php
+++ b/htdocs/compta/bank/account.php
@@ -120,7 +120,7 @@ if ($action == 'add' && $id && ! isset($_POST["cancel"]) && $user->rights->banqu
 if ($action == 'confirm_delete' && $confirm == 'yes' && $user->rights->banque->modifier)
 {
 	$accline=new AccountLine($db);
-	$accline->fetch($_GET["rowid"]);
+	$result=$accline->fetch(GETPOST("rowid"));
 	$result=$accline->delete();
 }
 
@@ -294,6 +294,14 @@ if ($id > 0 || ! empty($ref))
 	 */
 	$param.='&amp;account='.$object->id;
 
+	// Confirmation delete
+	if ($action == 'delete')
+	{
+		$text=$langs->trans('ConfirmDeleteTransaction');
+		$ret=$form->form_confirm($_SERVER['PHP_SELF'].'?id='.$object->id.'&amp;rowid='.GETPOST("rowid"),$langs->trans('DeleteTransaction'),$text,'confirm_delete');
+		if ($ret == 'html') print '<br>';
+	}
+
 	// Define transaction list navigation string
 	$navig = '<form action="'.$_SERVER["PHP_SELF"].'" name="newpage" method="GET"><div data-role="fieldcontain">';
 	//print 'nbpage='.$totalPages.' viewline='.$viewline.' limitsql='.$limitsql;
@@ -316,14 +324,6 @@ if ($id > 0 || ! empty($ref))
 	$navig.='</fieldset></div></form>';
 	//var_dump($navig);
 
-	// Confirmation delete
-	if ($action == 'delete')
-	{
-		$text=$langs->trans('ConfirmDeleteTransaction');
-		$ret=$form->form_confirm($_SERVER['PHP_SELF'].'?id='.$object->id.'&amp;rowid='.$_GET["rowid"],$langs->trans('DeleteTransaction'),$text,'confirm_delete');
-		if ($ret == 'html') print '<br>';
-	}
-
 	print '<table class="notopnoleftnoright" width="100%">';
 
 	// Show title

From 7481aa121e206a5ea29115b8c2282d49137eb635 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 13 Jul 2013 19:20:01 +0200
Subject: [PATCH 24/38] Qual: All script files must add a line into log when
 launched.

---
 scripts/bank/export-bank-receipts.php                        | 1 +
 scripts/company/export-contacts-xls-example.php              | 1 +
 scripts/company/sync_contacts_dolibarr2ldap.php              | 1 +
 scripts/contracts/email_expire_services_to_customers.php     | 3 ++-
 .../contracts/email_expire_services_to_representatives.php   | 3 ++-
 scripts/invoices/email_unpaid_invoices_to_customers.php      | 1 +
 .../invoices/email_unpaid_invoices_to_representatives.php    | 1 +
 scripts/invoices/rebuild_merge_pdf.php                       | 1 +
 scripts/members/sync_members_dolibarr2ldap.php               | 1 +
 scripts/members/sync_members_ldap2dolibarr.php               | 1 +
 scripts/user/sync_groups_dolibarr2ldap.php                   | 1 +
 scripts/user/sync_groups_ldap2dolibarr.php                   | 2 +-
 scripts/user/sync_users_dolibarr2ldap.php                    | 1 +
 scripts/user/sync_users_ldap2dolibarr.php                    | 1 +
 scripts/withdrawals/build_withdrawal_file.php                | 5 ++---
 15 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/scripts/bank/export-bank-receipts.php b/scripts/bank/export-bank-receipts.php
index 18aa26b8246..705d60a9e3c 100755
--- a/scripts/bank/export-bank-receipts.php
+++ b/scripts/bank/export-bank-receipts.php
@@ -60,6 +60,7 @@ $error=0;
 
 @set_time_limit(0);
 print "***** ".$script_file." (".$version.") pid=".getmypid()." *****\n";
+dol_syslog($script_file." launched with arg ".join(',',$argv));
 
 if (! isset($argv[3]) || ! $argv[3]) {
 	print "Usage: ".$script_file." bank_ref bank_receipt_number (csv|tsv|excel|excel2007) [lang=xx_XX]\n";
diff --git a/scripts/company/export-contacts-xls-example.php b/scripts/company/export-contacts-xls-example.php
index 5e7b6404994..63c0018baf9 100644
--- a/scripts/company/export-contacts-xls-example.php
+++ b/scripts/company/export-contacts-xls-example.php
@@ -60,6 +60,7 @@ $error=0;
 
 @set_time_limit(0);
 print "***** ".$script_file." (".$version.") pid=".getmypid()." *****\n";
+dol_syslog($script_file." launched with arg ".join(',',$argv));
 
 $fname = DOL_DATA_ROOT.'/export-contacts.xls';
 
diff --git a/scripts/company/sync_contacts_dolibarr2ldap.php b/scripts/company/sync_contacts_dolibarr2ldap.php
index edede8d3ba2..d751808ba0f 100644
--- a/scripts/company/sync_contacts_dolibarr2ldap.php
+++ b/scripts/company/sync_contacts_dolibarr2ldap.php
@@ -57,6 +57,7 @@ $error=0;
 
 @set_time_limit(0);
 print "***** ".$script_file." (".$version.") pid=".getmypid()." *****\n";
+dol_syslog($script_file." launched with arg ".join(',',$argv));
 
 print "Mails sending disabled (useless in batch mode)\n";
 $conf->global->MAIN_DISABLE_ALL_MAILS=1;	// On bloque les mails
diff --git a/scripts/contracts/email_expire_services_to_customers.php b/scripts/contracts/email_expire_services_to_customers.php
index 96e97e13771..13734eeb8b7 100755
--- a/scripts/contracts/email_expire_services_to_customers.php
+++ b/scripts/contracts/email_expire_services_to_customers.php
@@ -66,6 +66,7 @@ $error=0;
 
 @set_time_limit(0);
 print "***** ".$script_file." (".$version.") pid=".getmypid()." *****\n";
+dol_syslog($script_file." launched with arg ".join(',',$argv));
 
 $now=dol_now('tzserver');
 $duration_value=isset($argv[2])?$argv[2]:'none';
@@ -130,7 +131,7 @@ if ($resql)
             $outputlangs->load("bills");
             $outputlangs->load("main");
             $outputlangs->load("contracts");
-            
+
             if (dol_strlen($oldemail))
             {
             	$message .= $langs->trans("Contract")." ".$obj->ref.": ".$langs->trans("Service")." ".$obj->label." (".price($obj->total_ttc,0,$outputlangs,0,0,-1,$conf->currency)."), ".$langs->trans("DateEndPlannedShort")." ".dol_print_date($db->jdate($obj->date_fin_validite),'day')."\n\n";
diff --git a/scripts/contracts/email_expire_services_to_representatives.php b/scripts/contracts/email_expire_services_to_representatives.php
index 08d068685e3..810d019b016 100755
--- a/scripts/contracts/email_expire_services_to_representatives.php
+++ b/scripts/contracts/email_expire_services_to_representatives.php
@@ -66,6 +66,7 @@ $error=0;
 
 @set_time_limit(0);
 print "***** ".$script_file." (".$version.") pid=".getmypid()." *****\n";
+dol_syslog($script_file." launched with arg ".join(',',$argv));
 
 $now=dol_now('tzserver');
 $duration_value=isset($argv[2])?$argv[2]:'none';
@@ -130,7 +131,7 @@ if ($resql)
             $outputlangs->setDefaultLang(empty($obj->lang)?$langs->defaultlang:$obj->lang);	// By default language of sale representative
             $outputlangs->load("bills");
             $outputlangs->load("main");
-            
+
             if (dol_strlen($obj->email))
             {
             	$message .= $langs->trans("Contract")." ".$obj->ref.": ".$langs->trans("Service")." ".$obj->label." (".price($obj->total_ttc,0,$outputlangs,0,0,-1,$conf->currency).") ".$obj->nom.", ".$langs->trans("DateEndPlannedShort")." ".dol_print_date($db->jdate($obj->date_fin_validite),'day')."\n\n";
diff --git a/scripts/invoices/email_unpaid_invoices_to_customers.php b/scripts/invoices/email_unpaid_invoices_to_customers.php
index 487c346b732..0e73a713089 100755
--- a/scripts/invoices/email_unpaid_invoices_to_customers.php
+++ b/scripts/invoices/email_unpaid_invoices_to_customers.php
@@ -67,6 +67,7 @@ $error=0;
 
 @set_time_limit(0);
 print "***** ".$script_file." (".$version.") pid=".getmypid()." *****\n";
+dol_syslog($script_file." launched with arg ".join(',',$argv));
 
 $now=dol_now('tzserver');
 $duration_value=isset($argv[3])?$argv[3]:'none';
diff --git a/scripts/invoices/email_unpaid_invoices_to_representatives.php b/scripts/invoices/email_unpaid_invoices_to_representatives.php
index 67247db7e8a..7038c7297dc 100755
--- a/scripts/invoices/email_unpaid_invoices_to_representatives.php
+++ b/scripts/invoices/email_unpaid_invoices_to_representatives.php
@@ -66,6 +66,7 @@ $error=0;
 
 @set_time_limit(0);
 print "***** ".$script_file." (".$version.") pid=".getmypid()." *****\n";
+dol_syslog($script_file." launched with arg ".join(',',$argv));
 
 $now=dol_now('tzserver');
 $duration_value=isset($argv[2])?$argv[2]:'none';
diff --git a/scripts/invoices/rebuild_merge_pdf.php b/scripts/invoices/rebuild_merge_pdf.php
index eeb5407b37b..ea6c6316d01 100755
--- a/scripts/invoices/rebuild_merge_pdf.php
+++ b/scripts/invoices/rebuild_merge_pdf.php
@@ -57,6 +57,7 @@ $error=0;
 
 @set_time_limit(0);
 print "***** ".$script_file." (".$version.") pid=".getmypid()." *****\n";
+dol_syslog($script_file." launched with arg ".join(',',$argv));
 
 // Check parameters
 if (! isset($argv[1]))
diff --git a/scripts/members/sync_members_dolibarr2ldap.php b/scripts/members/sync_members_dolibarr2ldap.php
index 31df696aedf..e2095327e1f 100755
--- a/scripts/members/sync_members_dolibarr2ldap.php
+++ b/scripts/members/sync_members_dolibarr2ldap.php
@@ -52,6 +52,7 @@ $error=0;
 
 @set_time_limit(0);
 print "***** ".$script_file." (".$version.") pid=".getmypid()." *****\n";
+dol_syslog($script_file." launched with arg ".join(',',$argv));
 
 if (! isset($argv[1]) || ! $argv[1]) {
     print "Usage: $script_file now\n";
diff --git a/scripts/members/sync_members_ldap2dolibarr.php b/scripts/members/sync_members_ldap2dolibarr.php
index 52735e2a30e..69e72f0e3d7 100755
--- a/scripts/members/sync_members_ldap2dolibarr.php
+++ b/scripts/members/sync_members_ldap2dolibarr.php
@@ -57,6 +57,7 @@ $forcecommit=0;
 
 @set_time_limit(0);
 print "***** ".$script_file." (".$version.") pid=".getmypid()." *****\n";
+dol_syslog($script_file." launched with arg ".join(',',$argv));
 
 // List of fields to get from LDAP
 $required_fields = array(
diff --git a/scripts/user/sync_groups_dolibarr2ldap.php b/scripts/user/sync_groups_dolibarr2ldap.php
index 5ecb9ee2097..c16f822a04f 100755
--- a/scripts/user/sync_groups_dolibarr2ldap.php
+++ b/scripts/user/sync_groups_dolibarr2ldap.php
@@ -55,6 +55,7 @@ $error=0;
 
 @set_time_limit(0);
 print "***** ".$script_file." (".$version.") pid=".getmypid()." *****\n";
+dol_syslog($script_file." launched with arg ".join(',',$argv));
 
 /*
 if (! $conf->global->LDAP_SYNCHRO_ACTIVE)
diff --git a/scripts/user/sync_groups_ldap2dolibarr.php b/scripts/user/sync_groups_ldap2dolibarr.php
index ae8690e3996..38051c25fd4 100755
--- a/scripts/user/sync_groups_ldap2dolibarr.php
+++ b/scripts/user/sync_groups_ldap2dolibarr.php
@@ -57,7 +57,7 @@ $forcecommit=0;
 
 @set_time_limit(0);
 print "***** ".$script_file." (".$version.") pid=".getmypid()." *****\n";
-
+dol_syslog($script_file." launched with arg ".join(',',$argv));
 
 // List of fields to get from LDAP
 $required_fields = array(
diff --git a/scripts/user/sync_users_dolibarr2ldap.php b/scripts/user/sync_users_dolibarr2ldap.php
index 9f2dfe5d53b..1f89d9de43f 100755
--- a/scripts/user/sync_users_dolibarr2ldap.php
+++ b/scripts/user/sync_users_dolibarr2ldap.php
@@ -55,6 +55,7 @@ $error=0;
 
 @set_time_limit(0);
 print "***** ".$script_file." (".$version.") pid=".getmypid()." *****\n";
+dol_syslog($script_file." launched with arg ".join(',',$argv));
 
 /*
 if (! $conf->global->LDAP_SYNCHRO_ACTIVE)
diff --git a/scripts/user/sync_users_ldap2dolibarr.php b/scripts/user/sync_users_ldap2dolibarr.php
index 44ead523fd6..a73496538fc 100755
--- a/scripts/user/sync_users_ldap2dolibarr.php
+++ b/scripts/user/sync_users_ldap2dolibarr.php
@@ -55,6 +55,7 @@ $forcecommit=0;
 
 @set_time_limit(0);
 print "***** ".$script_file." (".$version.") pid=".getmypid()." *****\n";
+dol_syslog($script_file." launched with arg ".join(',',$argv));
 
 // List of fields to get from LDAP
 $required_fields = array(
diff --git a/scripts/withdrawals/build_withdrawal_file.php b/scripts/withdrawals/build_withdrawal_file.php
index 2db617e8405..1ae37abaf59 100644
--- a/scripts/withdrawals/build_withdrawal_file.php
+++ b/scripts/withdrawals/build_withdrawal_file.php
@@ -51,8 +51,9 @@ $error=0;
 
 @set_time_limit(0);
 print "***** ".$script_file." (".$version.") pid=".getmypid()." *****\n";
+dol_syslog($script_file." launched with arg ".join(',',$argv));
 
-$datetimeprev = time();
+$datetimeprev = dol_now();
 
 $month = strftime("%m", $datetimeprev);
 $year = strftime("%Y", $datetimeprev);
@@ -60,8 +61,6 @@ $year = strftime("%Y", $datetimeprev);
 $user = new user($db);
 $user->fetch($conf->global->PRELEVEMENT_USER);
 
-
-print "***** ".$script_file." (".$version.") *****\n";
 if (! isset($argv[1])) {	// Check parameters
     print "This script check invoices with a withdrawal request and\n";
     print "then create payment and build a withdraw file.\n";

From 7cdc7c0ab25a01e72e4fd445cfaf0326ebd5bd40 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 13 Jul 2013 19:41:27 +0200
Subject: [PATCH 25/38] Fix: Typo

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

diff --git a/htdocs/core/class/html.formfile.class.php b/htdocs/core/class/html.formfile.class.php
index 533472e5acd..62f001622c7 100644
--- a/htdocs/core/class/html.formfile.class.php
+++ b/htdocs/core/class/html.formfile.class.php
@@ -146,7 +146,7 @@ class FormFile
             {
             	print $out;
             }
-            print $hookmanager->resprint;
+            print $hookmanager->resPrint;
 
             return 1;
         }

From f169984c7c09b4cb5216590c2affc16a4177aabb Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 13 Jul 2013 20:22:17 +0200
Subject: [PATCH 26/38] Better test

---
 test/phpunit/DateLibTest.php | 23 ++++++++++++++++-------
 1 file changed, 16 insertions(+), 7 deletions(-)

diff --git a/test/phpunit/DateLibTest.php b/test/phpunit/DateLibTest.php
index 5b2dba2dd22..eb3fa40f98d 100644
--- a/test/phpunit/DateLibTest.php
+++ b/test/phpunit/DateLibTest.php
@@ -301,7 +301,21 @@ class DateLibTest extends PHPUnit_Framework_TestCase
         $langs=$this->savlangs;
         $db=$this->savdb;
 
-        $stime='1970-01-01T02:00:00Z';
+		$conf->global->MAIN_OLD_DATE=1;
+
+		$stime='19700102';
+		$result=dol_stringtotime($stime);
+		print __METHOD__." result=".$result."\n";
+		$this->assertEquals(86400,$result);
+
+		$conf->global->MAIN_OLD_DATE=0;
+
+		$stime='19700102';
+		$result=dol_stringtotime($stime);
+		print __METHOD__." result=".$result."\n";
+		$this->assertEquals(86400,$result);
+
+		$stime='1970-01-01T02:00:00Z';
         $result=dol_stringtotime($stime);
     	print __METHOD__." result=".$result."\n";
 		$this->assertEquals(7200,$result);
@@ -310,7 +324,7 @@ class DateLibTest extends PHPUnit_Framework_TestCase
         $result=dol_stringtotime($stime);
     	print __METHOD__." result=".$result."\n";
 		$this->assertEquals(7200,$result);
-		
+
         $stime='19700101T020000Z';
         $result=dol_stringtotime($stime);
     	print __METHOD__." result=".$result."\n";
@@ -321,11 +335,6 @@ class DateLibTest extends PHPUnit_Framework_TestCase
 		print __METHOD__." result=".$result."\n";
 		$this->assertEquals(7200,$result);
 
-		$stime='19700101';
-		$result=dol_stringtotime($stime);
-		print __METHOD__." result=".$result."\n";
-		$this->assertEquals(0,$result);
-
         return $result;
     }
 

From bd53218245d151f4f7b048a1952f982cac0c471e Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 13 Jul 2013 20:25:55 +0200
Subject: [PATCH 27/38] More complete message

---
 scripts/invoices/rebuild_merge_pdf.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/invoices/rebuild_merge_pdf.php b/scripts/invoices/rebuild_merge_pdf.php
index ea6c6316d01..ba47d0be063 100755
--- a/scripts/invoices/rebuild_merge_pdf.php
+++ b/scripts/invoices/rebuild_merge_pdf.php
@@ -125,7 +125,7 @@ foreach ($argv as $key => $value)
 		$paymentdatebefore=dol_stringtotime($argv[$key+2]);
 		if (empty($paymentdateafter) || empty($paymentdatebefore))
 		{
-			print 'Error: Bad date format'."\n";
+			print 'Error: Bad date format or value'."\n";
 			exit(-1);
 		}
 		print 'Rebuild PDF for invoices with at least one payment between '.dol_print_date($paymentdateafter,'day')." and ".dol_print_date($paymentdatebefore,'day').".\n";

From 0f1c4032ab8f2862ef00efa773b28c8f05d4c960 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 13 Jul 2013 21:06:12 +0200
Subject: [PATCH 28/38] Add option all to export

---
 scripts/bank/export-bank-receipts.php | 27 ++++++++++++++++-----------
 1 file changed, 16 insertions(+), 11 deletions(-)

diff --git a/scripts/bank/export-bank-receipts.php b/scripts/bank/export-bank-receipts.php
index 705d60a9e3c..6478f420931 100755
--- a/scripts/bank/export-bank-receipts.php
+++ b/scripts/bank/export-bank-receipts.php
@@ -63,7 +63,7 @@ print "***** ".$script_file." (".$version.") pid=".getmypid()." *****\n";
 dol_syslog($script_file." launched with arg ".join(',',$argv));
 
 if (! isset($argv[3]) || ! $argv[3]) {
-	print "Usage: ".$script_file." bank_ref bank_receipt_number (csv|tsv|excel|excel2007) [lang=xx_XX]\n";
+	print "Usage: ".$script_file." bank_ref [bank_receipt_number|all] (csv|tsv|excel|excel2007) [lang=xx_XX]\n";
 	exit(-1);
 }
 $bankref=$argv[1];
@@ -173,26 +173,31 @@ $array_export_TypeFields=array(
 );
 
 
-// Recherche les ecritures pour le releve
-$listofnum="'";
-$arraynum=explode(',',$num);
-foreach($arraynum as $val)
+// Build request to find records for a bank account/receipt
+$listofnum="";
+if (! empty($num) && $num != "all")
 {
-	if ($listofnum != "'") $listofnum.="','";
-	$listofnum.=$val;
+	$listofnum.="'";
+	$arraynum=explode(',',$num);
+	foreach($arraynum as $val)
+	{
+		if ($listofnum != "'") $listofnum.="','";
+		$listofnum.=$val;
+	}
+	$listofnum.="'";
 }
-$listofnum.="'";
 $sql = "SELECT b.rowid, b.dateo as do, b.datev as dv,";
 $sql.= " b.amount, b.label, b.rappro, b.num_releve, b.num_chq, b.fk_type,";
 $sql.= " ba.rowid as bankid, ba.ref as bankref, ba.label as banklabel";
 $sql.= " FROM ".MAIN_DB_PREFIX."bank_account as ba";
 $sql.= ", ".MAIN_DB_PREFIX."bank as b";
-$sql.= " WHERE b.num_releve IN (".$listofnum.")";
-if (!isset($num))	$sql.= " OR b.num_releve is null";
-$sql.= " AND b.fk_account = ".$acct->id;
+$sql.= " WHERE b.fk_account = ".$acct->id;
+if ($listofnum) $sql.= " AND b.num_releve IN (".$listofnum.")";
+if (!isset($num)) $sql.= " OR b.num_releve is null";
 $sql.= " AND b.fk_account = ba.rowid";
 $sql.= $db->order("b.num_releve, b.datev, b.datec", "ASC");  // We add date of creation to have correct order when everything is done the same day
 //print $sql;
+
 $resql=$db->query($sql);
 if ($resql)
 {

From 3a9ffb19c3ebd82e963dc4370a518fe41715d8bd Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 13 Jul 2013 21:14:05 +0200
Subject: [PATCH 29/38] fix: eol

---
 htdocs/compta/bank/account.php                |  16 +--
 htdocs/core/lib/pdf.lib.php                   |  27 ++++
 .../modules/propale/doc/pdf_azur.modules.php  | 125 +++++++++---------
 scripts/bank/export-bank-receipts.php         |   4 +-
 .../company/export-contacts-xls-example.php   |   2 +-
 .../company/sync_contacts_dolibarr2ldap.php   |   2 +-
 .../email_expire_services_to_customers.php    |   2 +-
 ...ail_expire_services_to_representatives.php |   2 +-
 .../email_unpaid_invoices_to_customers.php    |   2 +-
 ...ail_unpaid_invoices_to_representatives.php |   2 +-
 scripts/invoices/rebuild_merge_pdf.php        |   2 +-
 .../members/sync_members_dolibarr2ldap.php    |   2 +-
 .../members/sync_members_ldap2dolibarr.php    |   2 +-
 scripts/user/sync_groups_dolibarr2ldap.php    |   2 +-
 scripts/user/sync_groups_ldap2dolibarr.php    |   2 +-
 scripts/user/sync_users_dolibarr2ldap.php     |   2 +-
 scripts/user/sync_users_ldap2dolibarr.php     |   2 +-
 scripts/withdrawals/build_withdrawal_file.php |   2 +-
 18 files changed, 117 insertions(+), 83 deletions(-)

diff --git a/htdocs/compta/bank/account.php b/htdocs/compta/bank/account.php
index 04bae53a6b0..80182c61adb 100644
--- a/htdocs/compta/bank/account.php
+++ b/htdocs/compta/bank/account.php
@@ -295,14 +295,14 @@ if ($id > 0 || ! empty($ref))
 	 */
 	$param.='&amp;account='.$object->id.'&amp;vline='.$vline;
 
-	// Confirmation delete
-	if ($action == 'delete')
-	{
-		$text=$langs->trans('ConfirmDeleteTransaction');
-		$ret=$form->form_confirm($_SERVER['PHP_SELF'].'?id='.$object->id.'&amp;rowid='.GETPOST("rowid"),$langs->trans('DeleteTransaction'),$text,'confirm_delete');
-		if ($ret == 'html') print '<br>';
-	}
-
+	// Confirmation delete
+	if ($action == 'delete')
+	{
+		$text=$langs->trans('ConfirmDeleteTransaction');
+		$ret=$form->form_confirm($_SERVER['PHP_SELF'].'?id='.$object->id.'&amp;rowid='.GETPOST("rowid"),$langs->trans('DeleteTransaction'),$text,'confirm_delete');
+		if ($ret == 'html') print '<br>';
+	}
+
 	// Define transaction list navigation string
 	print '<form action="'.$_SERVER["PHP_SELF"].'" name="newpage" method="POST">';
 	print '<input type="hidden" name="token"        value="'.$_SESSION['newtoken'].'">';
diff --git a/htdocs/core/lib/pdf.lib.php b/htdocs/core/lib/pdf.lib.php
index d6d135edc4a..61d247ff2c2 100644
--- a/htdocs/core/lib/pdf.lib.php
+++ b/htdocs/core/lib/pdf.lib.php
@@ -1553,4 +1553,31 @@ function pdf_getLinkedObjects($object,$outputlangs)
 	return $linkedobjects;
 }
 
+/**
+ * Return dimensions to use for images onto PDF
+ *
+ * @param	string		$realpath		Full path to photo file to use
+ * @return	array						Height/Width to use to output image (in pixel)
+ */
+function pdf_getHeightForImage($realpath)
+{
+	$maxheight=12; $maxwidth=16;
+	include_once DOL_DOCUMENT_ROOT.'/core/lib/images.lib.php';
+	$tmp=dol_getImageSize($realpath);
+	if ($tmp['height'])
+	{
+		$width=(int) round($maxheight*$tmp['width']/$tmp['height']);
+		if ($width > $maxwidth)
+		{
+			$height=(int) round($height*$maxwidth/$width);
+			$width=$maxwidth;
+		}
+		else
+		{
+			$height=$maxheight;
+		}
+	}
+	return array('width'=>$width,'height'=>$height);
+}
+
 ?>
diff --git a/htdocs/core/modules/propale/doc/pdf_azur.modules.php b/htdocs/core/modules/propale/doc/pdf_azur.modules.php
index d0295a33f72..caeb4c3be1d 100644
--- a/htdocs/core/modules/propale/doc/pdf_azur.modules.php
+++ b/htdocs/core/modules/propale/doc/pdf_azur.modules.php
@@ -282,15 +282,15 @@ class pdf_azur extends ModelePDFPropales
 					$showpricebeforepagebreak=1;
 
 					$pdf->startTransaction();
-					if (empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITH_PICTURE))
-					{
+					if (empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITH_PICTURE))
+					{
 						pdf_writelinedesc($pdf,$object,$i,$outputlangs,$this->posxtva-$curX,3,$curX,$curY,$hideref,$hidedesc);
-					}
-					else
-					{
-						pdf_writelinedesc($pdf,$object,$i,$outputlangs,$this->posxpicture-$curX,3,$curX,$curY,$hideref,$hidedesc);
 					}
-
+					else
+					{
+						pdf_writelinedesc($pdf,$object,$i,$outputlangs,$this->posxpicture-$curX,3,$curX,$curY,$hideref,$hidedesc);
+					}
+
 					$pageposafter=$pdf->getPage();
 					if ($pageposafter > $pageposbefore)	// There is a pagebreak
 					{
@@ -298,13 +298,13 @@ class pdf_azur extends ModelePDFPropales
 						$pageposafter=$pageposbefore;
 						//print $pageposafter.'-'.$pageposbefore;exit;
 						$pdf->setPageOrientation('', 1, $heightforfooter);	// The only function to edit the bottom margin of current page to set it.
-						if (empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITH_PICTURE))
-						{
-							pdf_writelinedesc($pdf,$object,$i,$outputlangs,$this->posxtva-$curX,3,$curX,$curY,$hideref,$hidedesc);
-						}
-						else
-						{
-							pdf_writelinedesc($pdf,$object,$i,$outputlangs,$this->posxpicture-$curX,3,$curX,$curY,$hideref,$hidedesc);
+						if (empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITH_PICTURE))
+						{
+							pdf_writelinedesc($pdf,$object,$i,$outputlangs,$this->posxtva-$curX,3,$curX,$curY,$hideref,$hidedesc);
+						}
+						else
+						{
+							pdf_writelinedesc($pdf,$object,$i,$outputlangs,$this->posxpicture-$curX,3,$curX,$curY,$hideref,$hidedesc);
 						}
 
 						$pageposafter=$pdf->getPage();
@@ -343,53 +343,60 @@ class pdf_azur extends ModelePDFPropales
 
 					$pdf->SetFont('','', $default_font_size - 1);   // On repositionne la police par defaut
 
-					// Photo
-					if (! empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITH_PICTURE))
-					{
-						$curX = $this->posxpicture-1;
-						if ($object->lines[$i]->fk_product)
-						{
-							$objphoto = new Product($this->db);
-							$objphoto->fetch($object->lines[$i]->fk_product);
-
-							$pdir = get_exdir($object->lines[$i]->fk_product,2) . $object->lines[$i]->fk_product ."/photos/";
-							$dir = $conf->product->dir_output.'/'.$pdir;
-
+					// Photo
+					if (! empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITH_PICTURE))
+					{
+						$curX = $this->posxpicture-1;
+						if ($object->lines[$i]->fk_product)
+						{
+							$objphoto = new Product($this->db);
+							$objphoto->fetch($object->lines[$i]->fk_product);
+
+							$pdir = get_exdir($object->lines[$i]->fk_product,2) . $object->lines[$i]->fk_product ."/photos/";
+							$dir = $conf->product->dir_output.'/'.$pdir;
+
 							$realpath='';
 							if ($object->ref == 'SPECIMEN')
 							{
 								$realpath = DOL_DOCUMENT_ROOT.'/theme/common/nophoto.jpg';
 							}
 							else
-							{
-								foreach ($objphoto->liste_photos($dir,1) as $key => $obj)
-								{
-									if ($obj['photo_vignette'])
-									{
-										$filename='thumbs/'.$obj['photo_vignette'];
-									}
-									else
-									{
-										$filename=$obj['photo'];
-									}
-
+							{
+								foreach ($objphoto->liste_photos($dir,1) as $key => $obj)
+								{
+									if ($obj['photo_vignette'])
+									{
+										$filename='thumbs/'.$obj['photo_vignette'];
+									}
+									else
+									{
+										$filename=$obj['photo'];
+									}
+
 									$realpath = $dir.$filename;
-									break;
-								}
+									break;
+								}
 							}
-
-							if (!empty($realpath))
-							{
+
+							if (!empty($realpath))
+							{
+								//$pdf->setImageScale(PDF_IMAGE_SCALE_RATIO);
 								$tmp=pdf_getHeightForImage($realpath);
-								//var_dump($tmp['height']);exit;
-								$pdf->Image($realpath, $curX, $curY-1, $tmp['width'], $tmp['height'],'','','',2, 300);	// Use 300 dpi
+								//var_dump(constant('PDF_IMAGE_SCALE_RATIO'));var_dump($pdf->getImageScale());var_dump($tmp['width']);var_dump($pdf->pixelsToUnits($tmp['width']));exit;
+								// measures 1/72 of an inch, i.e. approximately 0.0139 inch or 25.4/72 = 0.3528 mm
+								var_dump($this->page_largeur);exit;
+								//var_dump(tmp['height']);exit;
+								$pdf->Line($this->posxtva,10,$this->posxtva+0.5,10);
+								$pdf->Image($realpath, $this->posxtva, 10, $tmp['width'], $tmp['height'],'','','',2,0);	// Use 300 dpi
+								$pdf->Line($this->posxtva+$pdf->pixelsToUnits($tmp['width']),10,$this->posxtva+$pdf->pixelsToUnits($tmp['width'])+0.5,10);
+								$pdf->Image($realpath, $curX + ($this->posxtva-$this->posxpicture-($pdf->pixelsToUnits($tmp['width'])))/2, $curY-1, $tmp['width'], $tmp['height'],'','','',2, 300);	// Use 300 dpi
 								//$nexY += 7;	// +7 for height = 12
-								$nexY += round($tmp['height'] / 12 * 7);
-								//var_dump($nexY);exit;
+								$nexY += round($pdf->pixelsToUnits($tmp['height']));
+								//var_dump($nexY);exit;
 							}
-						}
-					}
-
+						}
+					}
+
 					// VAT Rate
 					if (empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT))
 					{
@@ -1073,15 +1080,15 @@ class pdf_azur extends ModelePDFPropales
 			$pdf->MultiCell(108,2, $outputlangs->transnoentities("Designation"),'','L');
 		}
 
-		if (! empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITH_PICTURE))
-		{
-			$pdf->line($this->posxpicture-1, $tab_top, $this->posxpicture-1, $tab_top + $tab_height);
-			if (empty($hidetop))
-			{
-				$pdf->SetXY($this->posxpicture-1, $tab_top+1);
-				$pdf->MultiCell($this->posxtva-$this->posxpicture-1,2, $outputlangs->transnoentities("Photo"),'','C');
-			}
-		}
+		if (! empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITH_PICTURE))
+		{
+			$pdf->line($this->posxpicture-1, $tab_top, $this->posxpicture-1, $tab_top + $tab_height);
+			if (empty($hidetop))
+			{
+				$pdf->SetXY($this->posxpicture-1, $tab_top+1);
+				$pdf->MultiCell($this->posxtva-$this->posxpicture-1,2, $outputlangs->transnoentities("Photo"),'','C');
+			}
+		}
 
 		if (empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT))
 		{
diff --git a/scripts/bank/export-bank-receipts.php b/scripts/bank/export-bank-receipts.php
index 6478f420931..6da877e6018 100755
--- a/scripts/bank/export-bank-receipts.php
+++ b/scripts/bank/export-bank-receipts.php
@@ -60,7 +60,7 @@ $error=0;
 
 @set_time_limit(0);
 print "***** ".$script_file." (".$version.") pid=".getmypid()." *****\n";
-dol_syslog($script_file." launched with arg ".join(',',$argv));
+dol_syslog($script_file." launched with arg ".join(',',$argv));
 
 if (! isset($argv[3]) || ! $argv[3]) {
 	print "Usage: ".$script_file." bank_ref [bank_receipt_number|all] (csv|tsv|excel|excel2007) [lang=xx_XX]\n";
@@ -177,7 +177,7 @@ $array_export_TypeFields=array(
 $listofnum="";
 if (! empty($num) && $num != "all")
 {
-	$listofnum.="'";
+	$listofnum.="'";
 	$arraynum=explode(',',$num);
 	foreach($arraynum as $val)
 	{
diff --git a/scripts/company/export-contacts-xls-example.php b/scripts/company/export-contacts-xls-example.php
index 63c0018baf9..55c1b04b400 100644
--- a/scripts/company/export-contacts-xls-example.php
+++ b/scripts/company/export-contacts-xls-example.php
@@ -60,7 +60,7 @@ $error=0;
 
 @set_time_limit(0);
 print "***** ".$script_file." (".$version.") pid=".getmypid()." *****\n";
-dol_syslog($script_file." launched with arg ".join(',',$argv));
+dol_syslog($script_file." launched with arg ".join(',',$argv));
 
 $fname = DOL_DATA_ROOT.'/export-contacts.xls';
 
diff --git a/scripts/company/sync_contacts_dolibarr2ldap.php b/scripts/company/sync_contacts_dolibarr2ldap.php
index d751808ba0f..d4e6f9e7ca5 100644
--- a/scripts/company/sync_contacts_dolibarr2ldap.php
+++ b/scripts/company/sync_contacts_dolibarr2ldap.php
@@ -57,7 +57,7 @@ $error=0;
 
 @set_time_limit(0);
 print "***** ".$script_file." (".$version.") pid=".getmypid()." *****\n";
-dol_syslog($script_file." launched with arg ".join(',',$argv));
+dol_syslog($script_file." launched with arg ".join(',',$argv));
 
 print "Mails sending disabled (useless in batch mode)\n";
 $conf->global->MAIN_DISABLE_ALL_MAILS=1;	// On bloque les mails
diff --git a/scripts/contracts/email_expire_services_to_customers.php b/scripts/contracts/email_expire_services_to_customers.php
index 13734eeb8b7..9753599115c 100755
--- a/scripts/contracts/email_expire_services_to_customers.php
+++ b/scripts/contracts/email_expire_services_to_customers.php
@@ -66,7 +66,7 @@ $error=0;
 
 @set_time_limit(0);
 print "***** ".$script_file." (".$version.") pid=".getmypid()." *****\n";
-dol_syslog($script_file." launched with arg ".join(',',$argv));
+dol_syslog($script_file." launched with arg ".join(',',$argv));
 
 $now=dol_now('tzserver');
 $duration_value=isset($argv[2])?$argv[2]:'none';
diff --git a/scripts/contracts/email_expire_services_to_representatives.php b/scripts/contracts/email_expire_services_to_representatives.php
index 810d019b016..a41a59de3cf 100755
--- a/scripts/contracts/email_expire_services_to_representatives.php
+++ b/scripts/contracts/email_expire_services_to_representatives.php
@@ -66,7 +66,7 @@ $error=0;
 
 @set_time_limit(0);
 print "***** ".$script_file." (".$version.") pid=".getmypid()." *****\n";
-dol_syslog($script_file." launched with arg ".join(',',$argv));
+dol_syslog($script_file." launched with arg ".join(',',$argv));
 
 $now=dol_now('tzserver');
 $duration_value=isset($argv[2])?$argv[2]:'none';
diff --git a/scripts/invoices/email_unpaid_invoices_to_customers.php b/scripts/invoices/email_unpaid_invoices_to_customers.php
index 0e73a713089..fbd7bf7b466 100755
--- a/scripts/invoices/email_unpaid_invoices_to_customers.php
+++ b/scripts/invoices/email_unpaid_invoices_to_customers.php
@@ -67,7 +67,7 @@ $error=0;
 
 @set_time_limit(0);
 print "***** ".$script_file." (".$version.") pid=".getmypid()." *****\n";
-dol_syslog($script_file." launched with arg ".join(',',$argv));
+dol_syslog($script_file." launched with arg ".join(',',$argv));
 
 $now=dol_now('tzserver');
 $duration_value=isset($argv[3])?$argv[3]:'none';
diff --git a/scripts/invoices/email_unpaid_invoices_to_representatives.php b/scripts/invoices/email_unpaid_invoices_to_representatives.php
index 7038c7297dc..e3b23a932d5 100755
--- a/scripts/invoices/email_unpaid_invoices_to_representatives.php
+++ b/scripts/invoices/email_unpaid_invoices_to_representatives.php
@@ -66,7 +66,7 @@ $error=0;
 
 @set_time_limit(0);
 print "***** ".$script_file." (".$version.") pid=".getmypid()." *****\n";
-dol_syslog($script_file." launched with arg ".join(',',$argv));
+dol_syslog($script_file." launched with arg ".join(',',$argv));
 
 $now=dol_now('tzserver');
 $duration_value=isset($argv[2])?$argv[2]:'none';
diff --git a/scripts/invoices/rebuild_merge_pdf.php b/scripts/invoices/rebuild_merge_pdf.php
index ba47d0be063..2bba8666e0c 100755
--- a/scripts/invoices/rebuild_merge_pdf.php
+++ b/scripts/invoices/rebuild_merge_pdf.php
@@ -57,7 +57,7 @@ $error=0;
 
 @set_time_limit(0);
 print "***** ".$script_file." (".$version.") pid=".getmypid()." *****\n";
-dol_syslog($script_file." launched with arg ".join(',',$argv));
+dol_syslog($script_file." launched with arg ".join(',',$argv));
 
 // Check parameters
 if (! isset($argv[1]))
diff --git a/scripts/members/sync_members_dolibarr2ldap.php b/scripts/members/sync_members_dolibarr2ldap.php
index e2095327e1f..840cf464ba2 100755
--- a/scripts/members/sync_members_dolibarr2ldap.php
+++ b/scripts/members/sync_members_dolibarr2ldap.php
@@ -52,7 +52,7 @@ $error=0;
 
 @set_time_limit(0);
 print "***** ".$script_file." (".$version.") pid=".getmypid()." *****\n";
-dol_syslog($script_file." launched with arg ".join(',',$argv));
+dol_syslog($script_file." launched with arg ".join(',',$argv));
 
 if (! isset($argv[1]) || ! $argv[1]) {
     print "Usage: $script_file now\n";
diff --git a/scripts/members/sync_members_ldap2dolibarr.php b/scripts/members/sync_members_ldap2dolibarr.php
index 69e72f0e3d7..83dfd196ae0 100755
--- a/scripts/members/sync_members_ldap2dolibarr.php
+++ b/scripts/members/sync_members_ldap2dolibarr.php
@@ -57,7 +57,7 @@ $forcecommit=0;
 
 @set_time_limit(0);
 print "***** ".$script_file." (".$version.") pid=".getmypid()." *****\n";
-dol_syslog($script_file." launched with arg ".join(',',$argv));
+dol_syslog($script_file." launched with arg ".join(',',$argv));
 
 // List of fields to get from LDAP
 $required_fields = array(
diff --git a/scripts/user/sync_groups_dolibarr2ldap.php b/scripts/user/sync_groups_dolibarr2ldap.php
index c16f822a04f..c6793212032 100755
--- a/scripts/user/sync_groups_dolibarr2ldap.php
+++ b/scripts/user/sync_groups_dolibarr2ldap.php
@@ -55,7 +55,7 @@ $error=0;
 
 @set_time_limit(0);
 print "***** ".$script_file." (".$version.") pid=".getmypid()." *****\n";
-dol_syslog($script_file." launched with arg ".join(',',$argv));
+dol_syslog($script_file." launched with arg ".join(',',$argv));
 
 /*
 if (! $conf->global->LDAP_SYNCHRO_ACTIVE)
diff --git a/scripts/user/sync_groups_ldap2dolibarr.php b/scripts/user/sync_groups_ldap2dolibarr.php
index 38051c25fd4..485f0dbf72a 100755
--- a/scripts/user/sync_groups_ldap2dolibarr.php
+++ b/scripts/user/sync_groups_ldap2dolibarr.php
@@ -57,7 +57,7 @@ $forcecommit=0;
 
 @set_time_limit(0);
 print "***** ".$script_file." (".$version.") pid=".getmypid()." *****\n";
-dol_syslog($script_file." launched with arg ".join(',',$argv));
+dol_syslog($script_file." launched with arg ".join(',',$argv));
 
 // List of fields to get from LDAP
 $required_fields = array(
diff --git a/scripts/user/sync_users_dolibarr2ldap.php b/scripts/user/sync_users_dolibarr2ldap.php
index 1f89d9de43f..9fcd3bc40dc 100755
--- a/scripts/user/sync_users_dolibarr2ldap.php
+++ b/scripts/user/sync_users_dolibarr2ldap.php
@@ -55,7 +55,7 @@ $error=0;
 
 @set_time_limit(0);
 print "***** ".$script_file." (".$version.") pid=".getmypid()." *****\n";
-dol_syslog($script_file." launched with arg ".join(',',$argv));
+dol_syslog($script_file." launched with arg ".join(',',$argv));
 
 /*
 if (! $conf->global->LDAP_SYNCHRO_ACTIVE)
diff --git a/scripts/user/sync_users_ldap2dolibarr.php b/scripts/user/sync_users_ldap2dolibarr.php
index a73496538fc..8e831e26e84 100755
--- a/scripts/user/sync_users_ldap2dolibarr.php
+++ b/scripts/user/sync_users_ldap2dolibarr.php
@@ -55,7 +55,7 @@ $forcecommit=0;
 
 @set_time_limit(0);
 print "***** ".$script_file." (".$version.") pid=".getmypid()." *****\n";
-dol_syslog($script_file." launched with arg ".join(',',$argv));
+dol_syslog($script_file." launched with arg ".join(',',$argv));
 
 // List of fields to get from LDAP
 $required_fields = array(
diff --git a/scripts/withdrawals/build_withdrawal_file.php b/scripts/withdrawals/build_withdrawal_file.php
index 1ae37abaf59..a842aeb1f1b 100644
--- a/scripts/withdrawals/build_withdrawal_file.php
+++ b/scripts/withdrawals/build_withdrawal_file.php
@@ -51,7 +51,7 @@ $error=0;
 
 @set_time_limit(0);
 print "***** ".$script_file." (".$version.") pid=".getmypid()." *****\n";
-dol_syslog($script_file." launched with arg ".join(',',$argv));
+dol_syslog($script_file." launched with arg ".join(',',$argv));
 
 $datetimeprev = dol_now();
 

From 95ea3a01dfd93e3d5ed8989a4fe00a08ad41b74a Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 13 Jul 2013 23:05:25 +0200
Subject: [PATCH 30/38] Removed dead code

---
 scripts/bank/export-bank-receipts.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/scripts/bank/export-bank-receipts.php b/scripts/bank/export-bank-receipts.php
index 6da877e6018..00a193efd29 100755
--- a/scripts/bank/export-bank-receipts.php
+++ b/scripts/bank/export-bank-receipts.php
@@ -407,7 +407,6 @@ if ($resql)
 		$rec->accountelem=$accountelem;
 		$rec->debit=$debit;
 		$rec->credit=$credit;
-		$rec->sold=$sold;
 		$rec->comment=$comment;
 		$rec->soldbefore=price2num($totalbefore);
 		$rec->soldafter=price2num($total);

From 55d14f430cd49e5883a9c52d408fce1bf552e757 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 13 Jul 2013 23:36:21 +0200
Subject: [PATCH 31/38] Fix: Search on supplier ref

---
 htdocs/fourn/facture/index.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/htdocs/fourn/facture/index.php b/htdocs/fourn/facture/index.php
index 80b76772f09..540cbebea12 100644
--- a/htdocs/fourn/facture/index.php
+++ b/htdocs/fourn/facture/index.php
@@ -73,7 +73,7 @@ if ($mode == 'search')
 	if ($modesearch == 'soc')
 	{
 		$sql = "SELECT s.rowid FROM ".MAIN_DB_PREFIX."societe as s ";
-		$sql.= " WHERE s.nom LIKE '%".$db->escape(strtolower($socname))."%'";
+		$sql.= " WHERE s.nom LIKE '%".$db->escape($socname)."%'";
 		$sql.= " AND s.entity IN (".getEntity('societe', 1).")";
 	}
 
@@ -127,7 +127,8 @@ if (GETPOST('filtre'))
 
 if (GETPOST("search_ref"))
 {
-	$sql .= " AND fac.rowid = ".$db->escape(GETPOST("search_ref"));
+	if (is_numeric(GETPOST("search_ref"))) $sql .= " AND (fac.rowid = ".GETPOST("search_ref",'int')." OR fac.ref = '".$db->escape(GETPOST("search_ref"))."')";	// For backward compatibility
+	else $sql .= " AND fac.ref LIKE '%".$db->escape(GETPOST("search_ref"))."%'";
 }
 if (GETPOST("search_ref_supplier"))
 {

From bbe9778cedea9426969bf5145f22e94d4ca3692c Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 14 Jul 2013 00:09:42 +0200
Subject: [PATCH 32/38] Fix: automatic ecm for supplier invoices

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

diff --git a/htdocs/core/class/html.formfile.class.php b/htdocs/core/class/html.formfile.class.php
index 62f001622c7..27a1ac03af4 100644
--- a/htdocs/core/class/html.formfile.class.php
+++ b/htdocs/core/class/html.formfile.class.php
@@ -852,7 +852,7 @@ class FormFile
                 // To show ref or specific information according to view to show (defined by $module)
                 if ($modulepart == 'company')          { preg_match('/(\d+)\/[^\/]+$/',$relativefile,$reg); $id=(isset($reg[1])?$reg[1]:''); }
                 if ($modulepart == 'invoice')          { preg_match('/(.*)\/[^\/]+$/',$relativefile,$reg);  $ref=(isset($reg[1])?$reg[1]:''); }
-                if ($modulepart == 'invoice_supplier') { preg_match('/(\d+)\/[^\/]+$/',$relativefile,$reg); $id=(isset($reg[1])?$reg[1]:''); }
+                if ($modulepart == 'invoice_supplier') { preg_match('/([^\/]+)\/[^\/]+$/',$relativefile,$reg); $ref=(isset($reg[1])?$reg[1]:''); if (is_numeric($ref)) { $id=$ref; $ref=''; } }	// $ref may be also id with old supplier invoices
                 if ($modulepart == 'propal')           { preg_match('/(.*)\/[^\/]+$/',$relativefile,$reg);  $ref=(isset($reg[1])?$reg[1]:''); }
                 if ($modulepart == 'order')            { preg_match('/(.*)\/[^\/]+$/',$relativefile,$reg);  $ref=(isset($reg[1])?$reg[1]:''); }
                 if ($modulepart == 'order_supplier')   { preg_match('/(.*)\/[^\/]+$/',$relativefile,$reg);  $ref=(isset($reg[1])?$reg[1]:''); }

From 1e6171ad0ee1515dca6de70b808b5047044db88c Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 14 Jul 2013 00:40:22 +0200
Subject: [PATCH 33/38] Fix: Sort on ref for supplier invoice into ged

---
 htdocs/core/class/html.formfile.class.php | 2 +-
 htdocs/core/lib/files.lib.php             | 6 ++++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/htdocs/core/class/html.formfile.class.php b/htdocs/core/class/html.formfile.class.php
index 27a1ac03af4..a29b4d53ddf 100644
--- a/htdocs/core/class/html.formfile.class.php
+++ b/htdocs/core/class/html.formfile.class.php
@@ -774,7 +774,7 @@ class FormFile
         print '<table width="100%" class="nobordernopadding">';
         print '<tr class="liste_titre">';
         $sortref="fullname";
-        if ($modulepart == 'invoice_supplier') $sortref='';    // No sort for supplier invoices as path name is not
+        if ($modulepart == 'invoice_supplier') $sortref='level1name';
         print_liste_field_titre($langs->trans("Ref"),$url,$sortref,"",$param,'align="left"',$sortfield,$sortorder);
         print_liste_field_titre($langs->trans("Documents2"),$url,"name","",$param,'align="left"',$sortfield,$sortorder);
         print_liste_field_titre($langs->trans("Size"),$url,"size","",$param,'align="right"',$sortfield,$sortorder);
diff --git a/htdocs/core/lib/files.lib.php b/htdocs/core/lib/files.lib.php
index e76705a1690..3e726a67c60 100644
--- a/htdocs/core/lib/files.lib.php
+++ b/htdocs/core/lib/files.lib.php
@@ -135,8 +135,11 @@ function dol_dir_list($path, $types="all", $recursive=0, $filter="", $excludefil
 
 							if (! $filter || preg_match('/'.$filter.'/i',$file))	// We do not search key $filter into $path, only into $file
 							{
+								preg_match('/([^\/]+)\/[^\/]+$/',$path.'/'.$file,$reg);
+								$level1name=(isset($reg[1])?$reg[1]:'');
 								$file_list[] = array(
 										"name" => $file,
+										"level1name" => $level1name,
 										"fullname" => $path.'/'.$file,
 										"date" => $filedate,
 										"size" => $filesize,
@@ -159,8 +162,11 @@ function dol_dir_list($path, $types="all", $recursive=0, $filter="", $excludefil
 
 						if (! $filter || preg_match('/'.$filter.'/i',$file))	// We do not search key $filter into $path, only into $file
 						{
+							preg_match('/([^\/]+)\/[^\/]+$/',$path.'/'.$file,$reg);
+							$level1name=(isset($reg[1])?$reg[1]:'');
 							$file_list[] = array(
 									"name" => $file,
+									"level1name" => $level1name,
 									"fullname" => $path.'/'.$file,
 									"date" => $filedate,
 									"size" => $filesize,

From 8a8e55ffd3a88be0b593f62df256f775dad67738 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 14 Jul 2013 01:08:53 +0200
Subject: [PATCH 34/38] Fix: bad sort order into ecm module

---
 htdocs/ecm/index.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/htdocs/ecm/index.php b/htdocs/ecm/index.php
index c671fa2e29b..3ca6ccb2221 100644
--- a/htdocs/ecm/index.php
+++ b/htdocs/ecm/index.php
@@ -63,6 +63,7 @@ $pageprev = $page - 1;
 $pagenext = $page + 1;
 if (! $sortorder) $sortorder="ASC";
 if (! $sortfield) $sortfield="fullname";
+if ($module == 'invoice_supplier' && $sortfield == "fullname") $sortfield="level1name";
 
 $ecmdir = new EcmDirectory($db);
 if ($section)

From 94e32775161eeed9b0b002cf49daf03b11a4635c Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 14 Jul 2013 01:19:05 +0200
Subject: [PATCH 35/38] Fix: Navigation after using numbering for supplier ref.

---
 htdocs/fourn/facture/contact.php  | 6 +++---
 htdocs/fourn/facture/document.php | 2 +-
 htdocs/fourn/facture/note.php     | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/htdocs/fourn/facture/contact.php b/htdocs/fourn/facture/contact.php
index c96018c4d33..8221037703e 100644
--- a/htdocs/fourn/facture/contact.php
+++ b/htdocs/fourn/facture/contact.php
@@ -146,7 +146,7 @@ if ($id > 0 || ! empty($ref))
 
 		// Reference du facture
 		print '<tr><td width="20%">'.$langs->trans("Ref").'</td><td colspan="3">';
-		print $form->showrefnav($object, 'facid', $linkback, 1, 'rowid', 'ref', $morehtmlref);
+		print $form->showrefnav($object, 'ref', $linkback, 1, 'ref', 'ref', $morehtmlref);
 		print "</td></tr>";
 
         // Ref supplier
@@ -161,10 +161,10 @@ if ($id > 0 || ! empty($ref))
 		print '</div>';
 
 		print '<br>';
-		
+
 		// Contacts lines
 		include DOL_DOCUMENT_ROOT.'/core/tpl/contacts.tpl.php';
-		
+
 	}
 	else
 	{
diff --git a/htdocs/fourn/facture/document.php b/htdocs/fourn/facture/document.php
index 494b5cf23e6..155f73108bd 100644
--- a/htdocs/fourn/facture/document.php
+++ b/htdocs/fourn/facture/document.php
@@ -130,7 +130,7 @@ if ($object->id > 0)
 
 	// Ref
 	print '<tr><td width="30%" class="nowrap">'.$langs->trans("Ref").'</td><td colspan="3">';
-	print $form->showrefnav($object, 'facid', $linkback, 1, 'rowid', 'ref');
+	print $form->showrefnav($object, 'ref', $linkback, 1, 'ref', 'ref');
 	print '</td>';
 	print "</tr>\n";
 
diff --git a/htdocs/fourn/facture/note.php b/htdocs/fourn/facture/note.php
index a866407a82a..bec3cdc9c03 100644
--- a/htdocs/fourn/facture/note.php
+++ b/htdocs/fourn/facture/note.php
@@ -92,7 +92,7 @@ if ($id)
 
 	// Ref
 	print '<tr><td width="20%" class="nowrap">'.$langs->trans("Ref").'</td><td colspan="3">';
-	print $form->showrefnav($object, 'facid', $linkback, 1, 'rowid', 'ref', $morehtmlref);
+	print $form->showrefnav($object, 'ref', $linkback, 1, 'ref', 'ref', $morehtmlref);
 	print '</td>';
 	print "</tr>\n";
 

From ada3df4245f628a70894c3b629ec3ac1a16aefa2 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 14 Jul 2013 01:21:00 +0200
Subject: [PATCH 36/38] eol

---
 htdocs/ecm/index.php          | 2 +-
 htdocs/fourn/facture/note.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/ecm/index.php b/htdocs/ecm/index.php
index 3ca6ccb2221..bb8844eafc6 100644
--- a/htdocs/ecm/index.php
+++ b/htdocs/ecm/index.php
@@ -63,7 +63,7 @@ $pageprev = $page - 1;
 $pagenext = $page + 1;
 if (! $sortorder) $sortorder="ASC";
 if (! $sortfield) $sortfield="fullname";
-if ($module == 'invoice_supplier' && $sortfield == "fullname") $sortfield="level1name";
+if ($module == 'invoice_supplier' && $sortfield == "fullname") $sortfield="level1name";
 
 $ecmdir = new EcmDirectory($db);
 if ($section)
diff --git a/htdocs/fourn/facture/note.php b/htdocs/fourn/facture/note.php
index bec3cdc9c03..b6611f8fda0 100644
--- a/htdocs/fourn/facture/note.php
+++ b/htdocs/fourn/facture/note.php
@@ -92,7 +92,7 @@ if ($id)
 
 	// Ref
 	print '<tr><td width="20%" class="nowrap">'.$langs->trans("Ref").'</td><td colspan="3">';
-	print $form->showrefnav($object, 'ref', $linkback, 1, 'ref', 'ref', $morehtmlref);
+	print $form->showrefnav($object, 'ref', $linkback, 1, 'ref', 'ref', $morehtmlref);
 	print '</td>';
 	print "</tr>\n";
 

From 89d8eb19c084ed01d19c15aa9fd9255c4df86be4 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 14 Jul 2013 01:29:26 +0200
Subject: [PATCH 37/38] Fix: navigation fails

---
 htdocs/fourn/facture/contact.php  | 2 +-
 htdocs/fourn/facture/document.php | 3 ++-
 htdocs/fourn/facture/note.php     | 6 +++---
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/htdocs/fourn/facture/contact.php b/htdocs/fourn/facture/contact.php
index 8221037703e..004e5cbb648 100644
--- a/htdocs/fourn/facture/contact.php
+++ b/htdocs/fourn/facture/contact.php
@@ -51,7 +51,7 @@ $object = new FactureFournisseur($db);
 
 if ($action == 'addcontact' && $user->rights->fournisseur->facture->creer)
 {
-	$result = $object->fetch($id);
+	$result = $object->fetch($id, $ref);
 
     if ($result > 0 && $id > 0)
     {
diff --git a/htdocs/fourn/facture/document.php b/htdocs/fourn/facture/document.php
index 155f73108bd..2ddebb916da 100644
--- a/htdocs/fourn/facture/document.php
+++ b/htdocs/fourn/facture/document.php
@@ -39,6 +39,7 @@ $langs->load("companies");
 $id = GETPOST('facid','int')?GETPOST('facid','int'):GETPOST('id','int');
 $action=GETPOST('action','alpha');
 $confirm=GETPOST('confirm','alpha');
+$ref = GETPOST('ref','alpha');
 
 // Security check
 if ($user->societe_id) $socid=$user->societe_id;
@@ -58,7 +59,7 @@ if (! $sortorder) $sortorder="ASC";
 if (! $sortfield) $sortfield="name";
 
 $object = new FactureFournisseur($db);
-if ($object->fetch($id))
+if ($object->fetch($id, $ref))
 {
 	$object->fetch_thirdparty();
 	$ref=dol_sanitizeFileName($object->ref);
diff --git a/htdocs/fourn/facture/note.php b/htdocs/fourn/facture/note.php
index b6611f8fda0..d1143966010 100644
--- a/htdocs/fourn/facture/note.php
+++ b/htdocs/fourn/facture/note.php
@@ -41,7 +41,7 @@ if ($user->societe_id) $socid=$user->societe_id;
 $result = restrictedArea($user, 'fournisseur', $id, 'facture_fourn', 'facture');
 
 $object = new FactureFournisseur($db);
-$object->fetch($id,$ref);
+$object->fetch($id, $ref);
 
 
 
@@ -71,13 +71,13 @@ if ($action == 'setlabel' && $user->rights->fournisseur->facture->creer)
 
 /*
  * View
-*/
+ */
 
 $form = new Form($db);
 
 llxHeader();
 
-if ($id)
+if ($object->id > 0)
 {
 	$object->fetch_thirdparty();
 

From a1e7663614ca708c23a3525bda0a46b298a3c920 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 14 Jul 2013 01:49:43 +0200
Subject: [PATCH 38/38] eol

---
 htdocs/fourn/facture/document.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/fourn/facture/document.php b/htdocs/fourn/facture/document.php
index 2ddebb916da..a8fceb2a998 100644
--- a/htdocs/fourn/facture/document.php
+++ b/htdocs/fourn/facture/document.php
@@ -39,7 +39,7 @@ $langs->load("companies");
 $id = GETPOST('facid','int')?GETPOST('facid','int'):GETPOST('id','int');
 $action=GETPOST('action','alpha');
 $confirm=GETPOST('confirm','alpha');
-$ref = GETPOST('ref','alpha');
+$ref = GETPOST('ref','alpha');
 
 // Security check
 if ($user->societe_id) $socid=$user->societe_id;