From 578c4ca3835ac327bceb3e2ad0233ec193de4f4b Mon Sep 17 00:00:00 2001
From: HENRY Florian <florian.henry@open-concept.pro>
Date: Fri, 19 Dec 2014 12:32:43 +0100
Subject: [PATCH 01/34] Update odt2pdf.sh

Fix odt2pdf.sh
---
 scripts/odt2pdf/odt2pdf.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/odt2pdf/odt2pdf.sh b/scripts/odt2pdf/odt2pdf.sh
index 0599e4291c5..9d9bf18a8c7 100755
--- a/scripts/odt2pdf/odt2pdf.sh
+++ b/scripts/odt2pdf/odt2pdf.sh
@@ -22,7 +22,7 @@ if [ -f "$1.odt" ]
   nbprocess=$(pgrep -c soffice)
   if [ $nbprocess -ne 1 ]
    then
-    soffice --invisible --accept="socket,host=127.0.0.1,port=8100;urp;" --nofirststartwizard --headless&
+    soffice --invisible --accept="socket,host=127.0.0.1,port=8100;urp;" --nofirststartwizard --headless &
     retcode=$?
     if [ $retcode -ne 0 ]
      then

From 1c2c1ff3d877d31d12d870d319a7318a9e18e4f5 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 19 Dec 2014 19:09:15 +0100
Subject: [PATCH 02/34] Update codesniffer to remove travis errors.

---
 dev/codesniffer/ruleset.xml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/dev/codesniffer/ruleset.xml b/dev/codesniffer/ruleset.xml
index 7e4ae92274c..2b4cda4184b 100755
--- a/dev/codesniffer/ruleset.xml
+++ b/dev/codesniffer/ruleset.xml
@@ -21,6 +21,9 @@
 	<rule ref="Generic.CodeAnalysis.EmptyStatement.DetectedCATCH">
 		<severity>0</severity>
 	</rule>
+	<rule ref="Generic.CodeAnalysis.EmptyStatement.DetectedFOREACH">
+		<severity>0</severity>
+	</rule>
 	<rule ref="Generic.CodeAnalysis.EmptyStatement.DetectedIF">
 		<severity>0</severity>
 	</rule>

From 11368e48fe9ea4c3d662477c64cd4298d4343521 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 20 Dec 2014 00:11:12 +0100
Subject: [PATCH 03/34] Update codesniffer to remove travis errors.

---
 dev/codesniffer/ruleset.xml | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/dev/codesniffer/ruleset.xml b/dev/codesniffer/ruleset.xml
index ae13a41fcb2..9cff30f457d 100755
--- a/dev/codesniffer/ruleset.xml
+++ b/dev/codesniffer/ruleset.xml
@@ -30,7 +30,10 @@
 	<rule ref="Generic.CodeAnalysis.EmptyStatement.DetectedELSE">
 		<severity>0</severity>
 	</rule>
-
+	<rule ref="Generic.CodeAnalysis.EmptyStatement.DetectedELSEIF">
+		<severity>0</severity>
+	</rule>
+	
 	<rule ref="Generic.CodeAnalysis.EmptyStatement.NotAllowed">
 		<severity>0</severity>
 	</rule>

From beaec59ab6619ee799c30f9b3fff2af458fceb16 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 20 Dec 2014 00:29:53 +0100
Subject: [PATCH 04/34] PHPCS

---
 htdocs/core/db/mysqli.class.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/htdocs/core/db/mysqli.class.php b/htdocs/core/db/mysqli.class.php
index 7a964d07afc..f768a1115bd 100644
--- a/htdocs/core/db/mysqli.class.php
+++ b/htdocs/core/db/mysqli.class.php
@@ -351,7 +351,6 @@ class DoliDBMysqli extends DoliDB
      *	@return int		    Nombre de lignes
      *	@see    num_rows
      */
-
     function affected_rows($resultset)
     {
         // If resultset not provided, we take the last used by connexion

From 219cd0f8552c4e635ced30a32fe4c355290aa7cc Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 20 Dec 2014 15:52:50 +0100
Subject: [PATCH 05/34] Fixed: Translation

---
 htdocs/langs/fr_FR/compta.lang | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/langs/fr_FR/compta.lang b/htdocs/langs/fr_FR/compta.lang
index 5f0f1c522b9..daf273cee3d 100644
--- a/htdocs/langs/fr_FR/compta.lang
+++ b/htdocs/langs/fr_FR/compta.lang
@@ -199,7 +199,7 @@ AccountancyJournal=Code journal comptabilité
 COMPTA_PRODUCT_BUY_ACCOUNT=Code comptable par défaut pour l'achat de produits
 COMPTA_PRODUCT_SOLD_ACCOUNT=Code comptable par défaut pour la vente de produits
 COMPTA_SERVICE_BUY_ACCOUNT=Code comptable par défaut pour l'achat de services
-COMPTA_SERVICE_SOLD_ACCOUNT=Code comptable par défaut pour la vente de produits
+COMPTA_SERVICE_SOLD_ACCOUNT=Code comptable par défaut pour la vente de services
 COMPTA_VAT_ACCOUNT=Code comptable par défaut pour l'encaissement de TVA
 COMPTA_VAT_BUY_ACCOUNT=Code comptable par défaut pour le versement de la TVA
 COMPTA_ACCOUNT_CUSTOMER=Code comptable par défaut des tiers clients

From 748bef6134a5f663c71fe409f4490a2caf04f8d2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= <frederic.france@free.fr>
Date: Mon, 22 Dec 2014 20:02:53 +0100
Subject: [PATCH 06/34] Translation error

---
 htdocs/langs/en_US/products.lang | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/langs/en_US/products.lang b/htdocs/langs/en_US/products.lang
index 1e3027acd25..e290bd49c31 100644
--- a/htdocs/langs/en_US/products.lang
+++ b/htdocs/langs/en_US/products.lang
@@ -28,10 +28,10 @@ ProductsAndServicesStatistics=Products and Services statistics
 ProductsStatistics=Products statistics
 ProductsOnSell=Available products
 ProductsNotOnSell=Obsolete products
-ProductsOnSellAndOnBuy=Products not for sale nor purchase
+ProductsOnSellAndOnBuy=Products for sale and for purchase
 ServicesOnSell=Available services
 ServicesNotOnSell=Obsolete services
-ServicesOnSellAndOnBuy=Services not for sale nor purchase
+ServicesOnSellAndOnBuy=Services for sale and for purchase
 InternalRef=Internal reference
 LastRecorded=Last products/services on sell recorded
 LastRecordedProductsAndServices=Last %s recorded products/services

From 46fe2c67e0a5ce2dbf82ba4b420154e1ae4d5940 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marcos=20Garci=CC=81a=20de=20La=20Fuente?=
 <marcosgdf@gmail.com>
Date: Mon, 22 Dec 2014 22:32:05 +0100
Subject: [PATCH 07/34] Fix: [ bug #1736 ] Failing supplier Elephant numeration
 module with some masks

---
 ChangeLog                          | 1 +
 htdocs/core/lib/functions2.lib.php | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index a169a80654b..92b3911a14c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -19,6 +19,7 @@ Fix: Paypal link were broken dur to SSL v3 closed.
 - Fix: Show sender Country on PDF docs when sender Country <> receiver Country
 - Fix: [ bug #1624 ] Use lowest buying price for margin when selling with POS
 - Fix: [ bug #1749 ] Undefined $mailchimp
+- Fix: [ bug #1736 ] Failing supplier Elephant numeration module with some masks
 
 ***** ChangeLog for 3.6.1 compared to 3.6.* *****
 For users:
diff --git a/htdocs/core/lib/functions2.lib.php b/htdocs/core/lib/functions2.lib.php
index 4127686b459..4c2dd6e5189 100644
--- a/htdocs/core/lib/functions2.lib.php
+++ b/htdocs/core/lib/functions2.lib.php
@@ -738,7 +738,7 @@ function get_next_value($db,$mask,$table,$field,$where='',$objsoc='',$date='',$m
     $sql = "SELECT MAX(".$sqlstring.") as val";
     $sql.= " FROM ".MAIN_DB_PREFIX.$table;
     $sql.= " WHERE ".$field." LIKE '".$maskLike."'";
-    $sql.= " AND ".$field." NOT LIKE '%PROV%'";
+    $sql.= " AND ".$field." NOT LIKE '(PROV%)'";
     $sql.= " AND entity IN (".getEntity($table, 1).")";
     if ($where) $sql.=$where;
     if ($sqlwhere) $sql.=' AND '.$sqlwhere;

From db301863867d9f1c48020a0897d9079e3e361358 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marcos=20Garci=CC=81a=20de=20La=20Fuente?=
 <marcosgdf@gmail.com>
Date: Mon, 22 Dec 2014 22:52:43 +0100
Subject: [PATCH 08/34] Fix: [ bug #1731 ] Can't use quick navigation on
 project tasks secondary tabs

---
 ChangeLog                        |  1 +
 htdocs/projet/tasks/contact.php  | 10 +++++-----
 htdocs/projet/tasks/document.php |  2 +-
 htdocs/projet/tasks/note.php     |  2 +-
 htdocs/projet/tasks/time.php     |  8 ++++----
 5 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index a169a80654b..00a07efb2d1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -19,6 +19,7 @@ Fix: Paypal link were broken dur to SSL v3 closed.
 - Fix: Show sender Country on PDF docs when sender Country <> receiver Country
 - Fix: [ bug #1624 ] Use lowest buying price for margin when selling with POS
 - Fix: [ bug #1749 ] Undefined $mailchimp
+- Fix: [ bug #1731 ] Can't use quick navigation on project tasks secondary tabs
 
 ***** ChangeLog for 3.6.1 compared to 3.6.* *****
 For users:
diff --git a/htdocs/projet/tasks/contact.php b/htdocs/projet/tasks/contact.php
index f0bdce25fca..8a6ebb0a3d4 100644
--- a/htdocs/projet/tasks/contact.php
+++ b/htdocs/projet/tasks/contact.php
@@ -57,7 +57,7 @@ $projectstatic = new Project($db);
 // Add new contact
 if ($action == 'addcontact' && $user->rights->projet->creer)
 {
-	$result = $object->fetch($id);
+	$result = $object->fetch($id, $ref);
 
     if ($result > 0 && $id > 0)
     {
@@ -87,7 +87,7 @@ if ($action == 'addcontact' && $user->rights->projet->creer)
 // bascule du statut d'un contact
 if ($action == 'swapstatut' && $user->rights->projet->creer)
 {
-	if ($object->fetch($id))
+	if ($object->fetch($id, $ref))
 	{
 	    $result=$object->swapContactStatus(GETPOST('ligne'));
 	}
@@ -100,7 +100,7 @@ if ($action == 'swapstatut' && $user->rights->projet->creer)
 // Efface un contact
 if ($action == 'deleteline' && $user->rights->projet->creer)
 {
-	$object->fetch($id);
+	$object->fetch($id, $ref);
 	$result = $object->delete_contact($_GET["lineid"]);
 
 	if ($result >= 0)
@@ -152,7 +152,7 @@ $userstatic = new User($db);
 
 if ($id > 0 || ! empty($ref))
 {
-	if ($object->fetch($id) > 0)
+	if ($object->fetch($id, $ref) > 0)
 	{
 		$result=$projectstatic->fetch($object->fk_project);
 		if (! empty($projectstatic->socid)) $projectstatic->societe->fetch($projectstatic->socid);
@@ -245,7 +245,7 @@ if ($id > 0 || ! empty($ref))
 		    $object->next_prev_filter=" fk_projet in (".$projectsListId.")";
 		}
 		else $object->next_prev_filter=" fk_projet = ".$projectstatic->id;
-	    print $form->showrefnav($object,'id',$linkback,1,'rowid','ref','',$param);
+	    print $form->showrefnav($object,'ref',$linkback,1,'ref','ref','',$param);
 		print '</td></tr>';
 
 		// Label
diff --git a/htdocs/projet/tasks/document.php b/htdocs/projet/tasks/document.php
index 50763f839f7..03ca7bae452 100644
--- a/htdocs/projet/tasks/document.php
+++ b/htdocs/projet/tasks/document.php
@@ -209,7 +209,7 @@ if ($object->id > 0)
 		$object->next_prev_filter=" fk_projet in (".$projectsListId.")";
 	}
 	else $object->next_prev_filter=" fk_projet = ".$projectstatic->id;
-	print $form->showrefnav($object,'id',$linkback,1,'rowid','ref','',$param);
+	print $form->showrefnav($object,'ref',$linkback,1,'ref','ref','',$param);
 	print '</td>';
 	print '</tr>';
 
diff --git a/htdocs/projet/tasks/note.php b/htdocs/projet/tasks/note.php
index a6f8846ce0e..04e92c7c7f2 100644
--- a/htdocs/projet/tasks/note.php
+++ b/htdocs/projet/tasks/note.php
@@ -181,7 +181,7 @@ if ($object->id > 0)
 	    $object->next_prev_filter=" fk_projet in (".$projectsListId.")";
 	}
 	else $object->next_prev_filter=" fk_projet = ".$projectstatic->id;
-	print $form->showrefnav($object,'id',$linkback,1,'rowid','ref','',$param);
+	print $form->showrefnav($object,'ref',$linkback,1,'ref','ref','',$param);
 	print '</td></tr>';
 
 	// Label
diff --git a/htdocs/projet/tasks/time.php b/htdocs/projet/tasks/time.php
index 7136ffc43c5..8f72510adba 100644
--- a/htdocs/projet/tasks/time.php
+++ b/htdocs/projet/tasks/time.php
@@ -72,7 +72,7 @@ if ($action == 'addtimespent' && $user->rights->projet->creer)
 
 	if (! $error)
 	{
-		$object->fetch($id);
+		$object->fetch($id, $ref);
 
 		$object->timespent_note = $_POST["timespent_note"];
 		$object->timespent_duration = $_POST["timespent_durationhour"]*60*60;	// We store duration in seconds
@@ -109,7 +109,7 @@ if ($action == 'updateline' && ! $_POST["cancel"] && $user->rights->projet->cree
 
 	if (! $error)
 	{
-		$object->fetch($id);
+		$object->fetch($id, $ref);
 
 		$object->timespent_id = $_POST["lineid"];
 		$object->timespent_note = $_POST["timespent_note_line"];
@@ -183,7 +183,7 @@ if ($id > 0 || ! empty($ref))
 	/*
 	 * Fiche projet en mode visu
 	*/
-	if ($object->fetch($id) >= 0)
+	if ($object->fetch($id, $ref) >= 0)
 	{
 		$result=$projectstatic->fetch($object->fk_project);
 		if (! empty($projectstatic->socid)) $projectstatic->societe->fetch($projectstatic->socid);
@@ -277,7 +277,7 @@ if ($id > 0 || ! empty($ref))
 			$object->next_prev_filter=" fk_projet in (".$projectsListId.")";
 		}
 		else $object->next_prev_filter=" fk_projet = ".$projectstatic->id;
-		print $form->showrefnav($object,'id',$linkback,1,'rowid','ref','',$param);
+		print $form->showrefnav($object,'ref',$linkback,1,'ref','ref','',$param);
 		print '</td></tr>';
 
 		// Label

From 56eddeade17904ddd5eb55dc6f0b23cc4a152d39 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 23 Dec 2014 02:36:01 +0100
Subject: [PATCH 09/34] Fix merge changelog

---
 ChangeLog | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index a169a80654b..5f468fa452d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,9 +2,6 @@
 English Dolibarr ChangeLog
 --------------------------------------------------------------
 
-***** ChangeLog for 3.5.7 compared to 3.5.6 *****
-Fix: Paypal link were broken dur to SSL v3 closed.
-
 ***** ChangeLog for 3.6.2 compared to 3.6.1 *****
 - Fix: fix ErrorBadValueForParamNotAString error message in price customer multiprice.
 - Fix: bug 1588 : relative discount.
@@ -154,6 +151,9 @@ removed. You must now use the 6 parameters way. See file modMyModule.class.php f
 - Remove add_photo_web() that is ot used anymore by core code.
 
 
+***** ChangeLog for 3.5.7 compared to 3.5.6 *****
+Fix: Paypal link were broken dur to SSL v3 closed.
+
 ***** ChangeLog for 3.5.6 compared to 3.5.5 *****
 Fix: Avoid missing class error for fetch_thirdparty method #1973
 Fix: Can't update phone_pro from web service

From 3212fd2b27973d248e8ab7e36746a7ee63186a94 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marcos=20Garci=CC=81a=20de=20La=20Fuente?=
 <marcosgdf@gmail.com>
Date: Tue, 23 Dec 2014 11:00:18 +0100
Subject: [PATCH 10/34] Fix: [ bug #1649 ] Cancel button of several thirdparty
 actions, does the same thing as modify

---
 ChangeLog              |  1 +
 htdocs/comm/fiche.php  | 30 +++++++++++++++++++-----------
 htdocs/fourn/fiche.php | 20 ++++++++++++--------
 3 files changed, 32 insertions(+), 19 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 5f468fa452d..0e00afbbda0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -16,6 +16,7 @@ English Dolibarr ChangeLog
 - Fix: Show sender Country on PDF docs when sender Country <> receiver Country
 - Fix: [ bug #1624 ] Use lowest buying price for margin when selling with POS
 - Fix: [ bug #1749 ] Undefined $mailchimp
+- Fix: [ bug #1649 ] Cancel button of several thirdparty actions, does the same thing as modify
 
 ***** ChangeLog for 3.6.1 compared to 3.6.* *****
 For users:
diff --git a/htdocs/comm/fiche.php b/htdocs/comm/fiche.php
index 7ba1cc8bc48..307a8c57385 100644
--- a/htdocs/comm/fiche.php
+++ b/htdocs/comm/fiche.php
@@ -79,17 +79,21 @@ $object = new Societe($db);
 $parameters = array('socid' => $id);
 $reshook = $hookmanager->executeHooks('doActions', $parameters, $object, $action); // Note that $action and $object may have been modified by some
 
+//Some actions show a "cancel" input submit button with name="cancel"
+$cancelbutton = GETPOST('cancel');
 
 if ($action == 'setcustomeraccountancycode')
 {
-	$result=$object->fetch($id);
-	$object->code_compta=$_POST["customeraccountancycode"];
-	$result=$object->update($object->id,$user,1,1,0);
-	if ($result < 0)
-	{
-		$mesgs[]=join(',',$object->errors);
+	if (!$cancelbutton) {
+		$result=$object->fetch($id);
+		$object->code_compta=$_POST["customeraccountancycode"];
+		$result=$object->update($object->id,$user,1,1,0);
+		if ($result < 0)
+		{
+			$mesgs[]=join(',',$object->errors);
+		}
+		$action="";
 	}
-	$action="";
 }
 
 // conditions de reglement
@@ -139,10 +143,14 @@ if ($action == 'cstc')
 // Update communication level
 if ($action == 'setOutstandingBill')
 {
-	$object->fetch($id);
-	$object->outstanding_limit=GETPOST('OutstandingBill');
-	$result=$object->set_OutstandingBill($user);
-	if ($result < 0) setEventMessage($object->error,'errors');
+	if (!$cancelbutton) {
+		$object->fetch($id);
+		$object->outstanding_limit = GETPOST('OutstandingBill');
+		$result = $object->set_OutstandingBill($user);
+		if ($result < 0) {
+			setEventMessage($object->error, 'errors');
+		}
+	}
 }
 
 
diff --git a/htdocs/fourn/fiche.php b/htdocs/fourn/fiche.php
index 2719f9e0a9b..b4ceb2ae1b0 100644
--- a/htdocs/fourn/fiche.php
+++ b/htdocs/fourn/fiche.php
@@ -60,14 +60,18 @@ $reshook = $hookmanager->executeHooks('doActions', $parameters, $object, $action
 
 if ($action == 'setsupplieraccountancycode')
 {
-    $result=$object->fetch($id);
-    $object->code_compta_fournisseur=$_POST["supplieraccountancycode"];
-    $result=$object->update($object->id,$user,1,0,1);
-    if ($result < 0)
-    {
-        $mesg=join(',',$object->errors);
-    }
-    $action="";
+	$cancelbutton = GETPOST('cancel');
+
+	if (!$cancelbutton) {
+
+		$result = $object->fetch($id);
+		$object->code_compta_fournisseur = $_POST["supplieraccountancycode"];
+		$result = $object->update($object->id, $user, 1, 0, 1);
+		if ($result < 0) {
+			$mesg = join(',', $object->errors);
+		}
+		$action = "";
+	}
 }
 // conditions de reglement
 if ($action == 'setconditions' && $user->rights->societe->creer)

From 8a1440997403cf077ebdd8ee4ddd503edbd38e17 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marcos=20Garci=CC=81a=20de=20La=20Fuente?=
 <marcosgdf@gmail.com>
Date: Tue, 23 Dec 2014 11:39:43 +0100
Subject: [PATCH 11/34] Fix: [ bug #1533 ] Links triggers do not show trigger
 error message

---
 ChangeLog                                            | 1 +
 htdocs/core/class/link.class.php                     | 3 ++-
 htdocs/core/tpl/document_actions_pre_headers.tpl.php | 9 +++++++--
 3 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 5ec86761300..de2f3618cc9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -100,6 +100,7 @@ For users:
 - Fix: [ bug #1501 ] DEPLACEMENT_CREATE trigger do not intercept trigger action
 - Fix: [ bug #1506, #1507 ] ECM trigger error problem
 - Fix: [ bug #1469 ] Triggers CONTACT_MODIFY and CONTACT_DELETE duplicates error message
+- Fix: [ bug #1533 ] Links triggers do not show trigger error message
 - Fix: [ bug #1537 ] Difference between societe.nom and adherent.societe.
 - Fix: [ bug #1535 ] Supplier invoice Extrafields are not shown
 - Fix: datepicker first day of week can be monday by setting into display setup
diff --git a/htdocs/core/class/link.class.php b/htdocs/core/class/link.class.php
index dce575a1d47..0cdc6a8c4a8 100644
--- a/htdocs/core/class/link.class.php
+++ b/htdocs/core/class/link.class.php
@@ -187,7 +187,7 @@ class Link extends CommonObject
             {
                 // Call trigger
                 $result=$this->call_trigger('LINK_MODIFY',$user);
-                if ($result < 0) $error++;            
+                if ($result < 0) $error++;
                 // End call triggers
             }
 
@@ -197,6 +197,7 @@ class Link extends CommonObject
                 $this->db->commit();
                 return 1;
             } else {
+                setEventMessages('', $this->errors, 'errors');
                 $this->db->rollback();
                 return -1;
             }
diff --git a/htdocs/core/tpl/document_actions_pre_headers.tpl.php b/htdocs/core/tpl/document_actions_pre_headers.tpl.php
index a4d97e7defb..36b6ce75fe1 100644
--- a/htdocs/core/tpl/document_actions_pre_headers.tpl.php
+++ b/htdocs/core/tpl/document_actions_pre_headers.tpl.php
@@ -72,11 +72,16 @@ if ($action == 'confirm_deletefile' && $confirm == 'yes')
             $link->id = $linkid;
             $link->fetch();
             $res = $link->delete($user);
+
             $langs->load('link');
-            if ($res) {
+            if ($res > 0) {
                 setEventMessage($langs->trans("LinkRemoved", $link->label));
             } else {
-                setEventMessage($langs->trans("ErrorFailedToDeleteLink", $link->label), 'errors');
+                if (count($link->errors)) {
+                    setEventMessages('', $link->errors, 'errors');
+                } else {
+                    setEventMessage($langs->trans("ErrorFailedToDeleteLink", $link->label), 'errors');
+                }
             }
         }
         header('Location: ' . $_SERVER["PHP_SELF"] . '?id=' . $object->id.(!empty($withproject)?'&withproject=1':''));

From a90a03412ab292966f8c02baa9ee2743ac3a9824 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marcos=20Garci=CC=81a=20de=20La=20Fuente?=
 <marcosgdf@gmail.com>
Date: Tue, 23 Dec 2014 15:43:45 +0100
Subject: [PATCH 12/34] Fixed string not translated in linked objects of a
 project

---
 htdocs/projet/element.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/htdocs/projet/element.php b/htdocs/projet/element.php
index 4a0c70e04af..28f41370d5f 100644
--- a/htdocs/projet/element.php
+++ b/htdocs/projet/element.php
@@ -373,8 +373,10 @@ foreach ($listofreferent as $key => $value)
 	}
 }
 
+$langs->load('margins');
+
 // Margin display of the project
-print_titre("Margin");
+print_titre($langs->trans("Margins"));
 print '<table class="noborder">';
 print '<tr class="liste_titre">';
 print '<td align="left" width="200">'.$langs->trans("Element").'</td>';

From 78307a748dc3c66e1855ccf3aa50258201ad6654 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marcos=20Garci=CC=81a=20de=20La=20Fuente?=
 <marcosgdf@gmail.com>
Date: Tue, 23 Dec 2014 15:56:29 +0100
Subject: [PATCH 13/34] Corrected confusing table header in task list

---
 htdocs/langs/en_US/projects.lang | 1 +
 htdocs/projet/tasks/index.php    | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/htdocs/langs/en_US/projects.lang b/htdocs/langs/en_US/projects.lang
index a37e9651bcc..e9d04c8c8db 100644
--- a/htdocs/langs/en_US/projects.lang
+++ b/htdocs/langs/en_US/projects.lang
@@ -3,6 +3,7 @@ RefProject=Ref. project
 ProjectId=Project Id
 Project=Project
 Projects=Projects
+ProjectStatus=Project status
 SharedProject=Everybody
 PrivateProject=Contacts of project
 MyProjectsDesc=This view is limited to projects you are a contact for (whatever is the type).
diff --git a/htdocs/projet/tasks/index.php b/htdocs/projet/tasks/index.php
index ec23afb1902..94711b4d92e 100644
--- a/htdocs/projet/tasks/index.php
+++ b/htdocs/projet/tasks/index.php
@@ -97,7 +97,7 @@ print '<table class="noborder" width="100%">';
 
 print '<tr class="liste_titre">';
 print '<td>'.$langs->trans("Project").'</td>';
-print '<td>'.$langs->trans("Status").'</td>';
+print '<td>'.$langs->trans("ProjectStatus").'</td>';
 print '<td>'.$langs->trans("RefTask").'</td>';
 print '<td>'.$langs->trans("LabelTask").'</td>';
 print '<td align="center">'.$langs->trans("DateStart").'</td>';

From 743867b91b8305eed0125acb9328355ffc169a5a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marcos=20Garci=CC=81a=20de=20La=20Fuente?=
 <marcosgdf@gmail.com>
Date: Tue, 23 Dec 2014 15:57:30 +0100
Subject: [PATCH 14/34] Spanish translation

---
 htdocs/langs/es_ES/projects.lang | 1 +
 1 file changed, 1 insertion(+)

diff --git a/htdocs/langs/es_ES/projects.lang b/htdocs/langs/es_ES/projects.lang
index 988b3e545c8..f393616f898 100644
--- a/htdocs/langs/es_ES/projects.lang
+++ b/htdocs/langs/es_ES/projects.lang
@@ -3,6 +3,7 @@ RefProject=Ref. proyecto
 ProjectId=Id proyecto
 Project=Proyecto
 Projects=Proyectos
+ProjectStatus=Estado del proyecto
 SharedProject=Proyecto compartido
 PrivateProject=Contactos del proyecto
 MyProjectsDesc=Esta vista muestra aquellos proyectos en los que usted es un contacto afectado (cualquier tipo).

From 416f13c708cbfbff3e0ff0e1997867e3b37b9a0e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marcos=20Garci=CC=81a=20de=20La=20Fuente?=
 <marcosgdf@gmail.com>
Date: Tue, 23 Dec 2014 16:00:04 +0100
Subject: [PATCH 15/34]  Fix: [ bug #1752 ] Date filter of margins module,
 filters since 12H instead of 00H

---
 ChangeLog                      | 1 +
 htdocs/margin/agentMargins.php | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 949492346b2..d24728054e0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -4,6 +4,7 @@ English Dolibarr ChangeLog
 
 ***** ChangeLog for 3.5.7 compared to 3.5.6 *****
 Fix: Paypal link were broken dur to SSL v3 closed.
+Fix: [ bug #1752 ] Date filter of margins module, filters since 12H instead of 00H
 
 ***** ChangeLog for 3.5.6 compared to 3.5.5 *****
 Fix: Avoid missing class error for fetch_thirdparty method #1973
diff --git a/htdocs/margin/agentMargins.php b/htdocs/margin/agentMargins.php
index e618931ee77..da7bf758f1d 100644
--- a/htdocs/margin/agentMargins.php
+++ b/htdocs/margin/agentMargins.php
@@ -57,9 +57,9 @@ $pagenext = $page + 1;
 $startdate=$enddate='';
 
 if (!empty($_POST['startdatemonth']))
-  $startdate  = dol_mktime(12, 0, 0, $_POST['startdatemonth'],  $_POST['startdateday'],  $_POST['startdateyear']);
+  $startdate  = dol_mktime(0, 0, 0, $_POST['startdatemonth'],  $_POST['startdateday'],  $_POST['startdateyear']);
 if (!empty($_POST['enddatemonth']))
-  $enddate  = dol_mktime(12, 0, 0, $_POST['enddatemonth'],  $_POST['enddateday'],  $_POST['enddateyear']);
+  $enddate  = dol_mktime(23, 59, 59, $_POST['enddatemonth'],  $_POST['enddateday'],  $_POST['enddateyear']);
 
 /*
  * View

From d03cc03cd7ed5fcaef5d26e1912ecc8d82852287 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= <frederic.france@free.fr>
Date: Tue, 23 Dec 2014 16:42:05 +0100
Subject: [PATCH 16/34] Enhance select_salesrepresentatives with select2

---
 htdocs/core/class/html.formother.class.php | 38 ++++++++++++++--------
 1 file changed, 24 insertions(+), 14 deletions(-)

diff --git a/htdocs/core/class/html.formother.class.php b/htdocs/core/class/html.formother.class.php
index d6cf08594bb..4f0439d7b3c 100644
--- a/htdocs/core/class/html.formother.class.php
+++ b/htdocs/core/class/html.formother.class.php
@@ -356,9 +356,18 @@ class FormOther
         global $conf,$langs;
         $langs->load('users');
 
+        $out = '';
+        $nodatarole = '';
+        // Enhance with select2
+        if ($conf->use_javascript_ajax)
+        {
+            include_once DOL_DOCUMENT_ROOT . '/core/lib/ajax.lib.php';
+            $out.= ajax_combobox($htmlname);
+            $nodatarole=' data-role="none"';
+        }
         // Select each sales and print them in a select input
-        $moreforfilter ='<select class="flat" name="'.$htmlname.'">';
-        $moreforfilter.='<option value="">&nbsp;</option>';
+        $out.='<select class="flat" id="'.$htmlname.'" name="'.$htmlname.'"'.$nodatarole.'>';
+        $out.='<option value="">&nbsp;</option>';
 
         // Get list of users allowed to be viewed
         $sql_usr = "SELECT u.rowid, u.lastname, u.firstname, u.statut, u.login";
@@ -383,34 +392,35 @@ class FormOther
         {
             while ($obj_usr = $this->db->fetch_object($resql_usr))
             {
-                $moreforfilter.='<option value="'.$obj_usr->rowid.'"';
 
-                if ($obj_usr->rowid == $selected) $moreforfilter.=' selected="selected"';
+                $out.='<option value="'.$obj_usr->rowid.'"';
 
-                $moreforfilter.='>';
-                $moreforfilter.=dolGetFirstLastname($obj_usr->firstname,$obj_usr->lastname);
+                if ($obj_usr->rowid == $selected) $out.=' selected="selected"';
+
+                $out.='>';
+                $out.=dolGetFirstLastname($obj_usr->firstname,$obj_usr->lastname);
                 // Complete name with more info
                 $moreinfo=0;
                 if (! empty($conf->global->MAIN_SHOW_LOGIN))
                 {
-                	$moreforfilter.=($moreinfo?' - ':' (').$obj_usr->login;
-                	$moreinfo++;
+                    $out.=($moreinfo?' - ':' (').$obj_usr->login;
+                    $moreinfo++;
                 }
                 if ($showstatus >= 0)
                 {
 					if ($obj_usr->statut == 1 && $showstatus == 1)
 					{
-						$moreforfilter.=($moreinfo?' - ':' (').$langs->trans('Enabled');
+						$out.=($moreinfo?' - ':' (').$langs->trans('Enabled');
 	                	$moreinfo++;
 					}
 					if ($obj_usr->statut == 0)
 					{
-						$moreforfilter.=($moreinfo?' - ':' (').$langs->trans('Disabled');
+						$out.=($moreinfo?' - ':' (').$langs->trans('Disabled');
                 		$moreinfo++;
 					}
 				}
-				$moreforfilter.=($moreinfo?')':'');
-                $moreforfilter.='</option>';
+				$out.=($moreinfo?')':'');
+                $out.='</option>';
             }
             $this->db->free($resql_usr);
         }
@@ -418,9 +428,9 @@ class FormOther
         {
             dol_print_error($this->db);
         }
-        $moreforfilter.='</select>';
+        $out.='</select>';
 
-        return $moreforfilter;
+        return $out;
     }
 
     /**

From 09a094104cc8199b825a3e6a7acb1fd70d78c267 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marcos=20Garci=CC=81a=20de=20La=20Fuente?=
 <marcosgdf@gmail.com>
Date: Thu, 25 Dec 2014 18:31:24 +0100
Subject: [PATCH 17/34] Removed duplicated and unused translation key

---
 htdocs/langs/en_US/projects.lang | 1 -
 1 file changed, 1 deletion(-)

diff --git a/htdocs/langs/en_US/projects.lang b/htdocs/langs/en_US/projects.lang
index 8d5d7c26a53..74204a176e4 100644
--- a/htdocs/langs/en_US/projects.lang
+++ b/htdocs/langs/en_US/projects.lang
@@ -11,7 +11,6 @@ ProjectsDesc=This view presents all projects (your user permissions grant you pe
 MyTasksDesc=This view is limited to projects or tasks you are a contact for (whatever is the type).
 TasksPublicDesc=This view presents all projects and tasks you are allowed to read.
 TasksDesc=This view presents all projects and tasks (your user permissions grant you permission to view everything).
-Myprojects=My projects
 ProjectsArea=Projects area
 NewProject=New project
 AddProject=Create project

From 146bba90e73f2ebbf92417d8b341a0f7d6bb252a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marcos=20Garci=CC=81a=20de=20La=20Fuente?=
 <marcosgdf@gmail.com>
Date: Thu, 25 Dec 2014 18:42:26 +0100
Subject: [PATCH 18/34] Fix: [ bug #1724 ] Can't add a submenu to projects

---
 ChangeLog                               | 1 +
 htdocs/core/menus/init_menu_auguria.sql | 2 +-
 htdocs/core/menus/standard/eldy.lib.php | 4 ++--
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 7b5447aed23..e6509e65d99 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -149,6 +149,7 @@ For developers:
 - Qual: Renamed all files & links "fiche.php" into "card.php".
 - Qual: Replace all constants COMPTA_* by ACCOUNTING_*.
 - Qual: Replace all constants ACCOUNTINGEX_* by ACCOUNTING_* to simplify migration of the module
+- Fix: [ bug #1724 ] Can't add a submenu to projects
 
 WARNING: Following changes may create regression for some external modules, but was necessary to make
 Dolibarr better:
diff --git a/htdocs/core/menus/init_menu_auguria.sql b/htdocs/core/menus/init_menu_auguria.sql
index 06a187fd7de..7acce783e39 100644
--- a/htdocs/core/menus/init_menu_auguria.sql
+++ b/htdocs/core/menus/init_menu_auguria.sql
@@ -232,7 +232,7 @@ insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, left
 insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->projet->enabled', __HANDLER__, 'left', 3601__+MAX_llx_menu__, 'project', '', 3600__+MAX_llx_menu__, '/projet/card.php?leftmenu=projects&amp;action=create', 'NewProject', 1, 'projects', '$user->rights->projet->creer', '', 2, 1, __ENTITY__);
 insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->projet->enabled', __HANDLER__, 'left', 3602__+MAX_llx_menu__, 'project', '', 3600__+MAX_llx_menu__, '/projet/list.php?leftmenu=projects', 'List', 1, 'projects', '$user->rights->projet->lire', '', 2, 2, __ENTITY__);
 
-insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->projet->enabled', __HANDLER__, 'left', 3610__+MAX_llx_menu__, 'project', '', 7__+MAX_llx_menu__, '/projet/index.php?leftmenu=projects&amp;mode=mine', 'MyProjects', 0, 'projects', '$user->rights->projet->lire', '', 2, 0, __ENTITY__);
+insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->projet->enabled', __HANDLER__, 'left', 3610__+MAX_llx_menu__, 'project', 'myprojects', 7__+MAX_llx_menu__, '/projet/index.php?leftmenu=projects&amp;mode=mine', 'MyProjects', 0, 'projects', '$user->rights->projet->lire', '', 2, 0, __ENTITY__);
 insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->projet->enabled', __HANDLER__, 'left', 3611__+MAX_llx_menu__, 'project', '', 3610__+MAX_llx_menu__, '/projet/card.php?leftmenu=projects&amp;action=create&amp;mode=mine', 'NewProject', 1, 'projects', '$user->rights->projet->creer', '', 2, 1, __ENTITY__);
 insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->projet->enabled', __HANDLER__, 'left', 3612__+MAX_llx_menu__, 'project', '', 3610__+MAX_llx_menu__, '/projet/list.php?leftmenu=projects&amp;mode=mine', 'List', 1, 'projects', '$user->rights->projet->lire', '', 2, 2, __ENTITY__);
 
diff --git a/htdocs/core/menus/standard/eldy.lib.php b/htdocs/core/menus/standard/eldy.lib.php
index 781de5f2913..74d6b95df73 100644
--- a/htdocs/core/menus/standard/eldy.lib.php
+++ b/htdocs/core/menus/standard/eldy.lib.php
@@ -1132,12 +1132,12 @@ function print_left_eldy_menu($db,$menu_array_before,$menu_array_after,&$tabMenu
 				$langs->load("projects");
 
 				// Project affected to user
-				$newmenu->add("/projet/index.php?leftmenu=projects&mode=mine", $langs->trans("MyProjects"), 0, $user->rights->projet->lire, '', $mainmenu, 'projects');
+				$newmenu->add("/projet/index.php?leftmenu=projects&mode=mine", $langs->trans("MyProjects"), 0, $user->rights->projet->lire, '', $mainmenu, 'myprojects');
 				$newmenu->add("/projet/card.php?leftmenu=projects&action=create&mode=mine", $langs->trans("NewProject"), 1, $user->rights->projet->creer);
 				$newmenu->add("/projet/list.php?leftmenu=projects&mode=mine", $langs->trans("List"), 1, $user->rights->projet->lire);
 
 				// All project i have permission on
-				$newmenu->add("/projet/index.php?leftmenu=projects", $langs->trans("Projects"), 0, $user->rights->projet->lire && $user->rights->projet->lire);
+				$newmenu->add("/projet/index.php?leftmenu=projects", $langs->trans("Projects"), 0, $user->rights->projet->lire && $user->rights->projet->lire, '', $mainmenu, 'projects');
 				$newmenu->add("/projet/card.php?leftmenu=projects&action=create", $langs->trans("NewProject"), 1, $user->rights->projet->creer && $user->rights->projet->creer);
 				$newmenu->add("/projet/list.php?leftmenu=projects", $langs->trans("List"), 1, $user->rights->projet->lire && $user->rights->projet->lire);
 

From f735aa676e30b5f07e01c63f6387827ad4a579fd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marcos=20Garci=CC=81a=20de=20La=20Fuente?=
 <marcosgdf@gmail.com>
Date: Thu, 25 Dec 2014 19:16:25 +0100
Subject: [PATCH 19/34] Fix: [ bug #1674 ] PayPal logo copyright issues

---
 htdocs/paypal/admin/paypal.php      |   2 +-
 htdocs/paypal/img/object_paypal.png | Bin 1055 -> 4438 bytes
 htdocs/paypal/img/paypal.png        | Bin 1684 -> 0 bytes
 htdocs/paypal/img/paypal_logo.png   | Bin 1159 -> 0 bytes
 4 files changed, 1 insertion(+), 1 deletion(-)
 delete mode 100644 htdocs/paypal/img/paypal.png
 delete mode 100644 htdocs/paypal/img/paypal_logo.png

diff --git a/htdocs/paypal/admin/paypal.php b/htdocs/paypal/admin/paypal.php
index 69b0664eb9d..e3dff71b721 100644
--- a/htdocs/paypal/admin/paypal.php
+++ b/htdocs/paypal/admin/paypal.php
@@ -93,7 +93,7 @@ llxHeader('',$langs->trans("PaypalSetup"));
 
 
 $linkback='<a href="'.DOL_URL_ROOT.'/admin/modules.php">'.$langs->trans("BackToModuleList").'</a>';
-print_fiche_titre(' - '.$langs->trans("ModuleSetup"),$linkback,'paypal_logo@paypal');
+print_fiche_titre($langs->trans("ModuleSetup").' PayPal',$linkback);
 print '<br>';
 
 $head=paypaladmin_prepare_head();
diff --git a/htdocs/paypal/img/object_paypal.png b/htdocs/paypal/img/object_paypal.png
index 4ff3c80565df25279d900d6cee4d29676f0676d5..6b1f28eb73ea2cee17cdabbfd316134f42dec56b 100644
GIT binary patch
literal 4438
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
E0AB_H&j0`b

literal 1055
zcmeAS@N?(olHy`uVBq!ia0vp^d?3uh3?wzC-F*zC*h@TpUD<E43JD4bOZ4Wx1`2T&
zctjR6FmQbUVMeDlCNqG7Ea{HEjtmSN`?>!lvNA9*GX(gAxB|r)7?~NFSs0kvS%83*
zm4%g!fsKcSlaGO0oQ+4AonM@RN0LEImq${STi!%M#gIYSLsZ8}#xhjiK90dCl@W-H
z)0lwBB#qf5jm0#b)hvSzh|DuMEV4MQvbe0Wd8~8z?DEvDe6`ISg&Ycm91DaU3&dQC
zBwULn-AbfAN@YFE<h;r)TmlrlE0p}IR0C?%0&CO*YcztYbt2nMV_K~eJFJsB&C+LC
zWX`tAo@1Xk&n2VJw_u8I;grDQY3`+qyepP?S1k3fS{78hBB^m<X4{hdo)sB=o9kz6
zs+_f_W$xCtdE5F|AD^=N$kg?xW~@E5Xv?uB+fFRqesbB)Q>*u!UA_P6+I<(c9KN*e
z#I5ZoZ|^#Bb@!=T`%d53f9A%)^LLJ1xO42{-4j<IpSk|{^o^%yZ$7(r|K+WRFFt(!
z_WRGD-+%u8|NkEplA~a#g@ELw+QUFMGnNGT1v5B2yO9RuO!ahe45_%4oRIKAw3We-
z%|Kwfz|?D31E)_fWhh>ns?yu!yr<W7YjDFJk-)&z^K0(-SO;nfh_AS6V5V+;FDAs8
z^8~9@lBCqT=PMRu%;$J`Dtm?INzLfCr43uVv|dX}MD1`t=CI||kF+Jrm%6YUIb50L
z@{`5QeYt_d4kNk3MjitNtyQ8e4-A(aQD0uAxPwPdPL6|*A(T-jIi+iN9Vmo7UHx3v
IIVCg!05E6hbpQYW

diff --git a/htdocs/paypal/img/paypal.png b/htdocs/paypal/img/paypal.png
deleted file mode 100644
index 2caabff50b7ae15efb13052edc98b896f9676bb3..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1684
zcmV;F25b3=P)<h;3K|Lk000e1NJLTq000>P000>X1^@s6#OZ}&0000PbVXQnQ*UN;
zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBU&Hc3Q5RCwBqR%vV-RS=%teY@-R700gY
zm?n19Bqa%Lm6l$lKvhc1Srzz!03jhH1PCPlA^Haigg`=-I0OO-ajOy%DrW=;DnL*{
z15wihNUAn8hvOW!<6~{F_g?00nqs#Fb)+YI*YCZV`R4m(%zXCq30N}1v9M68`k#IC
ziv#27+)iK_9WG@KfJfw6N#y530q<Bi;QccZ4}aI$w)}AW6;X3jZvq6K1Jh=~FL{6*
zADKLVRul*v9i7@cK0dn_JOccuF#xKjgQ{wwLZRF}?l`v}9hunI8jt++;GX`+JYvTP
z4TNPGcRTBo1Xx;rNrZH!umc$8(w95V;&L4^^cI>v08aoAh3Qmg`|BTl|J|8XwxgmN
zP^xMO1_LZlSfGohXFE2`WQ%?DK!e#fFqZ8Q!s#604BQA{nBacao5({UFRyt1t$`PQ
z8=Z!#YT{K45Z$uf-#NUvRIaVa7Rz03gmn%=L0|s5^<59QUlBf*mla;A8BNof{N9tN
zryo~!vkBO`%n|ajRHlD!p|T^=6f9z3#|WGYhGSTm%azvE6fNjNuw;e>8?H>ezkNg3
zCzYCtJ{<^RF;^#-|K7baKK$XpuLr?l+&V46DA%->v8maXzfz?aq9N%X)+2I2mro)v
zp3dF?=Q69K9JIxn59tVxKo(;P`n}NE8iT&oiJyFasQ^yh8Fb>97BLNDwv5C$`18m<
z7E=ehN)-(zXY(5yQpczzNi21@xBL-q@<G7s0n5Tn{2si_0oBlbrfCWPrm=WNl*G!0
z?nIhrS^MlvaXS$)I!ZM~)g$xya?eHe@JnOGaxJaYbjTJe?(!iEH*_aqcr<mFR#tos
zbjLHx0^U(k6y=(3#&yHM8)@~Cf~ibllPp(b4a_nv=x&dn+}76#o7b+yM~jLOv$5d)
zFMqlBz}H8fqlIoTgmvfEo)3s1w8@Iv%(1LVRLykNH9no&<kq9U==l9?I=6oK)YNW|
zNX&`Zd@xt6bQa3WO;gjE9S*~A4MAxJBondYci+7Aje)`O*9;_$H|U)tBI<+3jp=Oh
z>Wf5(PA1dYzGq(l^xN~|TM}b^Fy|bEn*Hflp1k+YtZeoVj!r+qAWAEi1%_A+(<_!0
zX?CHs<{}Zg+{SkTe_qw@<x38nMM%Lkp|v&o{S)`?+L%>r>D_OJKXx342pntluW9>$
zcqJYt(hF;I#cD?bv+CH=&`RicEH3@zc;bY^fuS{BZToli_Z`eD)*WwuHT(_=G;EkQ
z+`6^v)y+MvM+h3E<_lXuH{7<+V7lq}0@54?Qe}X#b=|6pBFRTWfr)4+Fx=V_`7s&^
zkI9<7>DN>9U!}68TV1|j5L<dy9C+xK_4`DD1L9z$sd?1Lg-IX@c3pebGgq!k>~|Q_
zV^}s<loc!59AHo?K47_Iwx~RMY@%>msj7BZxSu8}34D3os>t&<Ufr=D`=L!UBDQ6*
zGucvKgFY<Uue_=IZ`=0Lp%b$&jZ9=7W*CM7N6usvWT}N{IWBTkV*)nVfZsE*JmmX)
zWi0e^EbO1MFdMpP>|`b@cVzPA)eS{QC&_r^xLmWNr>3$G;${{Hnj8&EBRF#$>|Z82
zk#T6v<A@lEHhB*tL;u3(nx<RW?rea%22JJ`N?Y`r>Twx#es0*bUmeMnwJuFJ#ei3+
zT)!^4+vnkjlCcnAVNtv#Xu|fQAaw;~TUpVNXg2c1xrjStVs>FOT=<^jptCJ@Xs%GX
z(?E5{n*E2n6Oo}R4k8sPPw~g`0u*l(7wfX_zXvIMdUAf-g-~I{x%l!h4mx=!?FR9%
z|925}62R$6htU7rcWEc4?F3wXP*GvjU|X<z+u9Ff%fi-ztn|{3&=U6lfUu#cEw|W<
za=Cn0<f#X4y79e%U)mEb5tHEr-Xrkp#;aBh4V{^PT2YNa&?n{)u2BvlWEj?k2K53o
zv&(fv@Xy244V!zXdODKPfx)w%<}^L{<>22zMbne+fbxo`B#~rk9UQj-&>6!+D<6cJ
zg)#th8BW^b%b>S2Nm+s&{B*FQsJ+;pHIG2bsEyK|YgWJ5*Aa7}syF)QV{pWVR941Y
e{@=+z0t^7d5b}>|q?B?10000<MNUMnLSTa7VlTY_

diff --git a/htdocs/paypal/img/paypal_logo.png b/htdocs/paypal/img/paypal_logo.png
deleted file mode 100644
index 2a4fd7c9ad51c3bbb336089638471cd366e24ff9..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1159
zcmV;21bF+2P)<h;3K|Lk000e1NJLTq001}u000mO1^@s6LwUSK0000PbVXQnQ*UN;
zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBU$DM>^@RCwCFmS=2@Q5eV1``+8?txIbZ
z(TY&JYQ(M)#E$)e=m$a~))yg02q6(MVz2ljcEpOr3?i{b8`R!S)F^e)O4Yc-|7ri1
zr>~0EdXiu6x$k?<dCqg5^;&VsLyeMQpd)w>{2&CLf`j0d`BMo7ja|N?iA-v5jAdi@
z;9xxMMtuS5djSrCXJy=dBuE0MK_-X>Ic_yU#*;w@Dzm6C2lN7K!P!4D(6&wRL!R+J
ze`MSV^<CI~9G>=Z=zBwb8^Q5X?pz7X1`WVxa33_4v)gJ?B51|23-~y>20eRNz5jiI
z=logsO)%G2)7Y-|N}m|^3B-Y+jGC^c+_eRb6S)f>f+HYJd$28t<ah&^0jh&FyyXgD
z5O@Uofx0w42%dmb;0ovohJbfqG05efvVKa@8Y>;)ngyT5^4)eYiJn+a1LZ6d!WrCC
z^u=?&q|F&{QJr0+0HkxA6AsI;wBfIW$!_L_aFPZZdUOm}R>Cb7(6B~e0-wn(p5u59
zm}Y_jV|gkJu)HyCOfVGIw+G~rqcl+DBS>X>I7Mp2Sg;wi<g-ljJu6g*v{MI_8;W89
z7^CJ(4n8P6Xi=_;F;nS94@2sjBkV<*gNcQsfPZI1?M8>JsOYXJGGQaKKsgq;32MD~
z=^mKLcMZXK8Yj-_&fjFtze*<*D=Z?lK@*OndGnI=_0-&ztWYB78S~9RWflp!tj9d;
zM_y2P{Q^+lghFqva-Qi{w70VHe`&^d9(pjK@<?P0&modV<HV4voGWL)4r;1(mz-{P
zt0eWR=k@uUPmgRO9a*h<a%}-~#l`ueFdMuE3A{MD<^Dx&BCyC6pZLu3c)P*CY9)AD
z_PfEb+rXkWmnjm-_Yvycmw9$KL;d;>g`0=#pq_05ow!hLtqYB7&iv@hyy^{V@uo$d
zvjBadk%s%M{}w)$z0Qt}lYW?@^zEaLmh?mljZ37yfegL=)VG@JBwufVa3#*>{~tV<
zpsJ9>_EO%WQ--q=iYx>t_`j7Z&pwVNR9k~O;T8|?&9=R<`L;JkJei^j+6soeQwFnT
zh%928@~C2XhpnYG|7R%u#SHAh&@(I`_kPlAvekGM=QdG!c7q2tY_wV=$Bq_y&$6ni
z3l*>5{E5DoYP<xDX6iIn1tmtEy(Fg;8u*1hOp421XBASim6di7L*+ILPb!msyPB&H
z{f>EL?3gNY1(Hh_SS*gIKIxSGpfec3{`Y|19>w=N_`8<{ZC{Ds73y2mX1V{B)Z!()
zRF@P`-ZL~he1Q32p7g)S#%*C_RSD6u=!@t6*{Y?5O1ZXJqc7D0wgG3u)goatONIP$
z{Vn<%`kWu#fiivmn!hje_*HKhnt9(W%Jmg>*Z(N)f3T<I+%8tq1I1jH=Tj~A|HxMX
Z1^@$<AuF&nzvln|002ovPDHLkV1fpWFbDtu


From 9d82e16506f5465aa12502cbaf484afbb35bbb58 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marcos=20Garci=CC=81a=20de=20La=20Fuente?=
 <marcosgdf@gmail.com>
Date: Thu, 25 Dec 2014 19:17:52 +0100
Subject: [PATCH 20/34] Resized PayPal logo

---
 htdocs/paypal/img/object_paypal.png | Bin 4438 -> 4120 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/htdocs/paypal/img/object_paypal.png b/htdocs/paypal/img/object_paypal.png
index 6b1f28eb73ea2cee17cdabbfd316134f42dec56b..74ac4392ded01a9a13c00027dcef80a6142c39ba 100644
GIT binary patch
delta 744
zcmV<E0vG+(BA6h5iBL{Q4GJ0x0000DNk~Le0000E0000E2nGNE03S##(EtDd1ZP1_
zK>z@;j|==^1poj5AY({UO#lFTCIA3{ga82g0001h=l}q9FaQARU;qF*m;eA5aGbhP
zJOBUy32;bRa{vGf6951U69E94oEQKA4Lxa8SaeuTOgdw+J3bA60!2wgK~yLeRZ&f7
z6G0e#Gdr_MlTAZXMB+~?)kbMW@FE5A50Aa*LA(?_35wvUS8-1wBG!v|^&m*<Ne`X`
zX~9zIQIdm)R!c37g*N7Qo88RkH`}QA!N<(b?0esP^8^6FO^1L1eeqFAy6H(6(}p0)
z=UfsLb+?0hZE>T2yz~UYhZVq=4D$I0-=KJB6sqtAa8p3U0L#}eA>g<kWVllao1ZV^
z+xyKvE1-mPL?;p{*CldYr{9uSNm}!GYK2JV#~pF%oTXDhIi?oIi~$Y|8NfsWoozP2
z`@fS}dLj!^ki%HD2CnVNA?-1c1qfkax<I$diUaNr(Bn0KY)et!g1K__{=|#rvl4IS
zEG^IWihXhd_4wQ2)_~?tC4jY>(39h#89tspbKu|<OBKX0Pe2@w33!7JPubzN;2M)e
zZQ#O5GUqP|^tuRIodyGKjqD?13T%!gvA<l3Q1Do}L&#@<(W8Xo35rr_rQ5&oy7Fl;
z1`do&6+-EM>_^1j6dz4rCuB1M5yzsngv(Nmfk@|o&D9cSZ_LMWWW4k-D2}fa8Wgg?
zAWxB;v74~3)k6@pvAbI}>*eR+-HBUPV?0rN$uUH1wH@^^G-zE)2=*7We$v;ad$Rg{
zC2TZ*;N9a53xe;<7^uAbX*81d={0gZQ8|&&NlBewdZqXDW{IC?uYAt(0mw!cOLe;S
zSre_@meqx645bzzwF2=yiM1H<k(8YRpEDM53V*2nt?JqGTm5Q_)XQ~J59ep%n>k|L
a|JQHlz}o!ZyQowE0000<MNUMnLSTZ;EJwBg

delta 1052
zcmV+%1mpXdAl4!-iBL{Q4GJ0x0000DNk~Le0000O0000O2nGNE0N{5$_y7O^0drDE
zLIAGL9O<!gOAUVm$4Nv%R7eetRZVOgRS^DWf4ts}oj<#FS^-f4ZCZS26%@4>BsjDj
zkdP{Ygan65a6oO55C`Bwkx-AhA}-uOTzWt%P>CCtqL!Zum7=Jng&@+TKP~}7V#oHr
z$INqfyKB2PBd_1j%$slKdo#O)K62p58!yr1{F_=etv-M1#1?H(xVeJOweP~(l`k%z
zKYKNyG*jx{khML1`~rf94??y2sndJJF31LSyRNGj7ghDkQ%M6Sx!9fuI$zvH4hOIM
zsr#HTTdq&j&%A48teRT=d@-`>rNDcLod;9UDzf>XqXxn{Xma6gU~D2f)C1s*6lP($
zE{7l4bVh$e1)I}=N6xrG(e)>HM~8bjP}%ZcLig41y1Bs-4!9EmwmB{*Kr5`XaYuSG
zAg8!59X&hOAyEGlX#DlyNA&;P=0NVjI(qVDc5i(503chKgG%r($*4AiaQcJj5nagV
z@}8!nC*HAMS$t1&=myAYcXWn5if&sN!2l%pB3*yi*ycd??9pg9Knu^kesQH%=mHqq
zNp5au8i1V);y%I%na0t)#{7OltI2nfnXtX=bPB-9PR+o|c!rMXpp2&BgsTULP}<_?
z4?nH3qeu`it|-O76oB$eb4+yFi}Zs~)U|Dl#PQaa+>geyM-&b%SZH$eV%%!hJhio&
zDpP;T6nZO2oY(6ekR*!5u?4=y?#DEqJOn&C+i@<%;ADWCS1<3Mn!A$%fLGj`svv0`
zi~kNjp)nFLh^$G$_X!iDgmM`u@;yp+l1U^PANb*`k7XGHR4SFsQe%9Uk`>hC=pUa6
z@%&-Ol%N1cl_!z5nQN&WnMaZhpjWT|sLp?$NdpiS%KQ%6C6^P694t+8*|C!?;dX#n
z{6_V2(CceA)CVVC1Xh^WL<XT>oI&XMsc0<DeLSCzP)<oxc}$skKe3GjviWxv7d|_q
zK0W<D?k?XFGm)4g9dHG02$|a%$ly8(<2hz6(PZMh-B{P(pZf@ne`~1zQM1;o*V=!-
ze0vGEZ`={5Nr?gAmAHZuBIPMnk_#AM8&uTHF}^wXiTd#PTak4FKH7@M`+eZ;sC2#o
zk_A8FG(W-)Jxb9gU$5V<{1kf_GBE($C!}q^WC}zam`@<9#&SXv7iuB{?hCs4+qEHn
zW3{1(h;(KCsTXMZ*D1c0jyI{k11DsU!OpzOZP_^>{MR???OV&sv4<g(_zr%)^!0VN
zl_wUvTzbv4MU;STL)Y%z#oE$ZY&2vN1N61a7axJ*W|C_Waa_>K(s`Z@X$oU){{91+
W5LNtOQ{4Cf0000<MNUMnLSTXkefR7D


From 1f00794c9807bc58d990d161f794ea894e673b4a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marcos=20Garci=CC=81a=20de=20La=20Fuente?=
 <marcosgdf@gmail.com>
Date: Thu, 25 Dec 2014 21:47:39 +0100
Subject: [PATCH 21/34] Fixed bug which didn't show documents in auto GED when
 an object had '/' in its ref

---
 htdocs/comm/propal/class/propal.class.php     |  5 +++
 htdocs/commande/class/commande.class.php      |  5 +++
 htdocs/compta/facture/class/facture.class.php |  6 +++-
 .../sociales/class/chargesociales.class.php   |  5 +++
 htdocs/contrat/class/contrat.class.php        |  5 +++
 htdocs/core/class/commonobject.class.php      | 32 +++++++++++++++++++
 htdocs/core/class/html.formfile.class.php     | 15 +++++++--
 htdocs/fichinter/class/fichinter.class.php    |  5 +++
 .../class/fournisseur.commande.class.php      |  5 +++
 .../fourn/class/fournisseur.facture.class.php |  5 +++
 htdocs/product/class/product.class.php        |  5 +++
 htdocs/projet/class/project.class.php         |  5 +++
 12 files changed, 95 insertions(+), 3 deletions(-)

diff --git a/htdocs/comm/propal/class/propal.class.php b/htdocs/comm/propal/class/propal.class.php
index be22043e4b5..589afedd00c 100644
--- a/htdocs/comm/propal/class/propal.class.php
+++ b/htdocs/comm/propal/class/propal.class.php
@@ -47,6 +47,11 @@ class Propal extends CommonObject
     public $fk_element='fk_propal';
     protected $ismultientitymanaged = 1;	// 0=No test on entity, 1=Test with field entity, 2=Test with link by societe
 
+    /**
+     * {@inheritdoc}
+     */
+    protected $table_ref_field = 'ref';
+
     var $id;
 
     var $socid;		// Id client
diff --git a/htdocs/commande/class/commande.class.php b/htdocs/commande/class/commande.class.php
index 49ba2536bfa..06f381a41a9 100644
--- a/htdocs/commande/class/commande.class.php
+++ b/htdocs/commande/class/commande.class.php
@@ -44,6 +44,11 @@ class Commande extends CommonOrder
     public $fk_element = 'fk_commande';
     protected $ismultientitymanaged = 1;	// 0=No test on entity, 1=Test with field entity, 2=Test with link by societe
 
+    /**
+     * {@inheritdoc}
+     */
+    protected $table_ref_field = 'ref';
+
     var $id;
 
     var $socid;		// Id client
diff --git a/htdocs/compta/facture/class/facture.class.php b/htdocs/compta/facture/class/facture.class.php
index 632381c8541..f81fb37849f 100644
--- a/htdocs/compta/facture/class/facture.class.php
+++ b/htdocs/compta/facture/class/facture.class.php
@@ -50,6 +50,11 @@ class Facture extends CommonInvoice
 	public $fk_element = 'fk_facture';
 	protected $ismultientitymanaged = 1;	// 0=No test on entity, 1=Test with field entity, 2=Test with link by societe
 
+	/**
+	 * {@inheritdoc}
+	 */
+	protected $table_ref_field = 'facnumber';
+
 	var $id;
 	//! Id client
 	var $socid;
@@ -833,7 +838,6 @@ class Facture extends CommonInvoice
 		return $result;
 	}
 
-
 	/**
 	 *	Get object and lines from database
 	 *
diff --git a/htdocs/compta/sociales/class/chargesociales.class.php b/htdocs/compta/sociales/class/chargesociales.class.php
index fb8bc162c83..1d684c65552 100644
--- a/htdocs/compta/sociales/class/chargesociales.class.php
+++ b/htdocs/compta/sociales/class/chargesociales.class.php
@@ -34,6 +34,11 @@ class ChargeSociales extends CommonObject
     public $table='chargesociales';
     public $table_element='chargesociales';
 
+    /**
+     * {@inheritdoc}
+     */
+    protected $table_ref_field = 'ref';
+
     var $id;
     var $ref;
     var $date_ech;
diff --git a/htdocs/contrat/class/contrat.class.php b/htdocs/contrat/class/contrat.class.php
index ae384195162..5265f7025c5 100644
--- a/htdocs/contrat/class/contrat.class.php
+++ b/htdocs/contrat/class/contrat.class.php
@@ -44,6 +44,11 @@ class Contrat extends CommonObject
 	public $fk_element='fk_contrat';
 	protected $ismultientitymanaged = 1;	// 0=No test on entity, 1=Test with field entity, 2=Test with link by societe
 
+	/**
+	 * {@inheritdoc}
+	 */
+	protected $table_ref_field = 'ref';
+
 	var $id;
 	var $ref;
 	var $ref_ext;
diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php
index 54c7b9d860d..9fb4841c0a9 100644
--- a/htdocs/core/class/commonobject.class.php
+++ b/htdocs/core/class/commonobject.class.php
@@ -54,6 +54,12 @@ abstract class CommonObject
 
     // No constructor as it is an abstract class
 
+    /**
+     * Column name of the ref field.
+     * @var string
+     */
+    protected $table_ref_field = '';
+
 
     /**
      * Check an object id/ref exists
@@ -631,6 +637,32 @@ abstract class CommonObject
     }
 
 
+    /**
+     * Looks for an object with ref matching the wildcard provided
+     * It does only work when $this->table_ref_field is set
+     *
+     * @param string $ref Wildcard
+     * @return int >1 = OK, 0 = Not found or table_ref_field not defined, <0 = KO
+     */
+    public function fetchOneLike($ref)
+    {
+        if (!$this->table_ref_field) {
+            return 0;
+        }
+
+        $sql = 'SELECT rowid FROM '.MAIN_DB_PREFIX.$this->table_element.' WHERE '.$this->table_ref_field.' LIKE "'.$this->db->escape($ref).'" LIMIT 1';
+
+        $query = $this->db->query($sql);
+
+        if (!$this->db->num_rows($query)) {
+            return 0;
+        }
+
+        $result = $this->db->fetch_object($query);
+
+        return $this->fetch($result->rowid);
+    }
+
     /**
      *	Load data for barcode into properties ->barcode_type*
      *	Properties ->barcode_type that is id of barcode. Type is used to find other properties, but
diff --git a/htdocs/core/class/html.formfile.class.php b/htdocs/core/class/html.formfile.class.php
index 1ef5045c845..34f6418de34 100644
--- a/htdocs/core/class/html.formfile.class.php
+++ b/htdocs/core/class/html.formfile.class.php
@@ -997,7 +997,6 @@ class FormFile
                 if ($modulepart == 'user')             { preg_match('/(.*)\/[^\/]+$/',$relativefile,$reg);  $id=(isset($reg[1])?$reg[1]:'');}
 
                 if (! $id && ! $ref) continue;
-
                 $found=0;
                 if (! empty($this->cache_objects[$modulepart.'_'.$id.'_'.$ref]))
                 {
@@ -1006,7 +1005,19 @@ class FormFile
                 else
                 {
                     //print 'Fetch '.$id." - ".$ref.'<br>';
-                    $result=$object_instance->fetch($id,$ref);
+
+                    if ($id) {
+                        $result = $object_instance->fetch($id);
+                    } else {
+                        //fetchOneLike looks for objects with wildcards in its reference.
+                        //It is useful for those masks who get underscores instead of their actual symbols
+                        //fetchOneLike requires some info in the object. If it doesn't have it, then 0 is returned
+                        //that's why we look only look fetchOneLike when fetch returns 0
+                        if (!$result = $object_instance->fetch('', $ref)) {
+                            $result = $object_instance->fetchOneLike($ref);
+                        }
+                    }
+
                     if ($result > 0)  { $found=1; $this->cache_objects[$modulepart.'_'.$id.'_'.$ref]=dol_clone($object_instance); }    // Save object into a cache
                     if ($result == 0) { $found=1; $this->cache_objects[$modulepart.'_'.$id.'_'.$ref]='notfound'; unset($filearray[$key]); }
                 }
diff --git a/htdocs/fichinter/class/fichinter.class.php b/htdocs/fichinter/class/fichinter.class.php
index 28ef737de13..4ab0cfdb96b 100644
--- a/htdocs/fichinter/class/fichinter.class.php
+++ b/htdocs/fichinter/class/fichinter.class.php
@@ -37,6 +37,11 @@ class Fichinter extends CommonObject
 	public $fk_element='fk_fichinter';
 	public $table_element_line='fichinterdet';
 
+	/**
+	 * {@inheritdoc}
+	 */
+	protected $table_ref_field = 'ref';
+
 	var $id;
 
 	var $socid;		// Id client
diff --git a/htdocs/fourn/class/fournisseur.commande.class.php b/htdocs/fourn/class/fournisseur.commande.class.php
index 7593dcf9903..4fe4675f5d8 100644
--- a/htdocs/fourn/class/fournisseur.commande.class.php
+++ b/htdocs/fourn/class/fournisseur.commande.class.php
@@ -45,6 +45,11 @@ class CommandeFournisseur extends CommonOrder
     public $fk_element = 'fk_commande';
     protected $ismultientitymanaged = 1;	// 0=No test on entity, 1=Test with field entity, 2=Test with link by societe
 
+    /**
+     * {@inheritdoc}
+     */
+    protected $table_ref_field = 'ref';
+
     var $id;
 
     var $ref;		 // TODO deprecated
diff --git a/htdocs/fourn/class/fournisseur.facture.class.php b/htdocs/fourn/class/fournisseur.facture.class.php
index 95da7550db7..d9a4469481f 100644
--- a/htdocs/fourn/class/fournisseur.facture.class.php
+++ b/htdocs/fourn/class/fournisseur.facture.class.php
@@ -43,6 +43,11 @@ class FactureFournisseur extends CommonInvoice
     public $fk_element='fk_facture_fourn';
     protected $ismultientitymanaged = 1;	// 0=No test on entity, 1=Test with field entity, 2=Test with link by societe
 
+    /**
+     * {@inheritdoc}
+     */
+    protected $table_ref_field = 'ref';
+
     var $rowid;
     var $ref;
     var $product_ref;
diff --git a/htdocs/product/class/product.class.php b/htdocs/product/class/product.class.php
index 390f250f5d9..ba179aef616 100644
--- a/htdocs/product/class/product.class.php
+++ b/htdocs/product/class/product.class.php
@@ -46,6 +46,11 @@ class Product extends CommonObject
 	protected $isnolinkedbythird = 1;     // No field fk_soc
 	protected $ismultientitymanaged = 1;	// 0=No test on entity, 1=Test with field entity, 2=Test with link by societe
 
+	/**
+	 * {@inheritdoc}
+	 */
+	protected $table_ref_field = 'ref';
+
 	var $regeximgext='\.jpg|\.jpeg|\.bmp|\.gif|\.png|\.tiff';
 
 	//! Identifiant unique
diff --git a/htdocs/projet/class/project.class.php b/htdocs/projet/class/project.class.php
index 41ae40a259d..f762b10d2ca 100644
--- a/htdocs/projet/class/project.class.php
+++ b/htdocs/projet/class/project.class.php
@@ -38,6 +38,11 @@ class Project extends CommonObject
     public $fk_element = 'fk_projet';
     protected $ismultientitymanaged = 1;  // 0=No test on entity, 1=Test with field entity, 2=Test with link by societe
 
+    /**
+     * {@inheritdoc}
+     */
+    protected $table_ref_field = 'ref';
+
     var $id;
     var $ref;
     var $description;

From ca133d74acd8ccc25bd23bf25e143321e9f0d5fe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marcos=20Garci=CC=81a=20de=20La=20Fuente?=
 <marcosgdf@gmail.com>
Date: Thu, 25 Dec 2014 22:20:09 +0100
Subject: [PATCH 22/34] Corrected key not translated

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

diff --git a/htdocs/ecm/index_auto.php b/htdocs/ecm/index_auto.php
index 7d0fc5c64bf..7626774b24c 100644
--- a/htdocs/ecm/index_auto.php
+++ b/htdocs/ecm/index_auto.php
@@ -409,7 +409,7 @@ if (! empty($conf->global->ECM_AUTO_TREE_ENABLED))
 	if (! empty($conf->fournisseur->enabled)) { $rowspan++; $sectionauto[]=array('level'=>1, 'module'=>'invoice_supplier', 'test'=>$conf->fournisseur->enabled, 'label'=>$langs->trans("SuppliersInvoices"),   'desc'=>$langs->trans("ECMDocsByInvoices")); }
 	if (! empty($conf->tax->enabled))         { $langs->load("compta"); $rowspan++; $sectionauto[]=array('level'=>1, 'module'=>'tax', 'test'=>$conf->tax->enabled, 'label'=>$langs->trans("SocialContributions"),     'desc'=>$langs->trans("ECMDocsBySocialContributions")); }
 	if (! empty($conf->projet->enabled))      { $rowspan++; $sectionauto[]=array('level'=>1, 'module'=>'project', 'test'=>$conf->projet->enabled, 'label'=>$langs->trans("Projects"),     'desc'=>$langs->trans("ECMDocsByProjects")); }
-	if (! empty($conf->ficheinter->enabled))      { $rowspan++; $sectionauto[]=array('level'=>1, 'module'=>'fichinter', 'test'=>$conf->ficheinter->enabled, 'label'=>$langs->trans("Interventions"),     'desc'=>$langs->trans("ECMDocsByInterventions")); }
+	if (! empty($conf->ficheinter->enabled))      { $langs->load("interventions"); $rowspan++; $sectionauto[]=array('level'=>1, 'module'=>'fichinter', 'test'=>$conf->ficheinter->enabled, 'label'=>$langs->trans("Interventions"),     'desc'=>$langs->trans("ECMDocsByInterventions")); }
 	$rowspan++; $sectionauto[]=array('level'=>1, 'module'=>'user', 'test'=>1, 'label'=>$langs->trans("Users"),     'desc'=>$langs->trans("ECMDocsByUsers"));
 	
 }

From c870f0e3db09eda2ae2cdda07d8f473181e22885 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marcos=20Garci=CC=81a=20de=20La=20Fuente?=
 <marcosgdf@gmail.com>
Date: Thu, 25 Dec 2014 22:30:47 +0100
Subject: [PATCH 23/34] Updated changelog

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

diff --git a/ChangeLog b/ChangeLog
index 7b5447aed23..3f752e4db68 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -103,6 +103,7 @@ For users:
 - Fix: [ bug #1537 ] Difference between societe.nom and adherent.societe.
 - Fix: [ bug #1535 ] Supplier invoice Extrafields are not shown
 - Fix: datepicker first day of week can be monday by setting into display setup
+- Fix: [ bug #575 ] GED doesn't works if there is "/" in a mask
 
 For users, new experimental module (need to set feature level of instance to experimental to see them):
 - New: Module Accounting Expert to manage accountancy

From 7b6a4d1bfd923dfca6c8a62ea46a9bbda0196cd7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marcos=20Garci=CC=81a=20de=20La=20Fuente?=
 <marcosgdf@gmail.com>
Date: Thu, 25 Dec 2014 22:50:15 +0100
Subject: [PATCH 24/34] Fix: [ bug #1715 ] Valign and width attributes are used
 in div tags

---
 htdocs/core/class/html.form.class.php | 16 ++++++++++++++--
 htdocs/core/lib/agenda.lib.php        |  2 +-
 2 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index 61d1c08f2aa..e61f1af9617 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -400,14 +400,26 @@ class Form
         else $paramfortooltiptd =($extracss?' class="'.$extracss.'"':''); // Attribut to put on td text tag
         $s="";
         if (empty($notabs))	$s.='<table class="nobordernopadding" summary=""><tr>';
-        if ($direction < 0)	$s.='<'.$tag.$paramfortooltipimg.' valign="top" width="14">'.$img.'</'.$tag.'>';
+        if ($direction < 0)	{
+            $s.='<'.$tag.$paramfortooltipimg;
+            if ($tag == 'td') {
+                $s .= 'valign="top" ';
+            }
+            $s.= 'width="14">'.$img.'</'.$tag.'>';
+        }
         // Use another method to help avoid having a space in value in order to use this value with jquery
         // TODO add this in css
         //if ($text != '')	$s.='<'.$tag.$paramfortooltiptd.'>'.(($direction < 0)?'&nbsp;':'').$text.(($direction > 0)?'&nbsp;':'').'</'.$tag.'>';
         $paramfortooltiptd.= (($direction < 0)?' style="padding-left: 3px !important;"':'');
         $paramfortooltiptd.= (($direction > 0)?' style="padding-right: 3px !important;"':'');
         if ((string) $text != '')	$s.='<'.$tag.$paramfortooltiptd.'>'.$text.'</'.$tag.'>';
-        if ($direction > 0)	$s.='<'.$tag.$paramfortooltipimg.' valign="top" width="14">'.$img.'</'.$tag.'>';
+        if ($direction > 0)	{
+            $s.='<'.$tag.$paramfortooltipimg;
+            if ($tag == 'td') {
+                $s .= 'valign="top" ';
+            }
+            $s.= 'width="14">'.$img.'</'.$tag.'>';
+        }
         if (empty($notabs))	$s.='</tr></table>';
 
         return $s;
diff --git a/htdocs/core/lib/agenda.lib.php b/htdocs/core/lib/agenda.lib.php
index 3d51490f6b2..23a17534ccf 100644
--- a/htdocs/core/lib/agenda.lib.php
+++ b/htdocs/core/lib/agenda.lib.php
@@ -149,7 +149,7 @@ function print_actions_filter($form, $canedit, $status, $year, $month, $day, $sh
 	if (! empty($conf->browser->phone)) print '</div>';
 	else print '</td>';
 
-	if (! empty($conf->browser->phone)) print '<div class="fichehalfright" valign="middle">';
+	if (! empty($conf->browser->phone)) print '<div class="fichehalfright">';
 	else print '<td align="center" valign="middle" class="nowrap">';
 
 	print '<table><tr><td align="center">';

From eb524cfd29a38d50dbb0c09ce579a18e9d320670 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marcos=20Garci=CC=81a=20de=20La=20Fuente?=
 <marcosgdf@gmail.com>
Date: Thu, 25 Dec 2014 22:50:33 +0100
Subject: [PATCH 25/34] Copyright info

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

diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index e61f1af9617..e90dbdd203d 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -12,7 +12,7 @@
  * Copyright (C) 2010      Juanjo Menent         <jmenent@2byte.es>
  * Copyright (C) 2010-2014 Philippe Grand        <philippe.grand@atoo-net.com>
  * Copyright (C) 2011      Herve Prot            <herve.prot@symeos.com>
- * Copyright (C) 2012      Marcos García         <marcosgdf@gmail.com>
+ * Copyright (C) 2012-2014 Marcos García         <marcosgdf@gmail.com>
  * Copyright (C) 2013      Raphaël Doursenaud    <rdoursenaud@gpcsolutions.fr>
  * Copyright (C) 2014      Alexandre Spangaro    <alexandre.spangaro@gmail.com>
  *

From 2616deb58d5d2e94235dee46292c9bf6b15eabf1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marcos=20Garci=CC=81a=20de=20La=20Fuente?=
 <marcosgdf@gmail.com>
Date: Thu, 25 Dec 2014 22:52:11 +0100
Subject: [PATCH 26/34] Copyright info

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

diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php
index 9fb4841c0a9..d0e4e086640 100644
--- a/htdocs/core/class/commonobject.class.php
+++ b/htdocs/core/class/commonobject.class.php
@@ -6,7 +6,7 @@
  * Copyright (C) 2010-2014 Juanjo Menent        <jmenent@2byte.es>
  * Copyright (C) 2012-2013 Christophe Battarel  <christophe.battarel@altairis.fr>
  * Copyright (C) 2011-2014 Philippe Grand	    <philippe.grand@atoo-net.com>
- * Copyright (C) 2012      Marcos García        <marcosgdf@gmail.com>
+ * Copyright (C) 2012-2014 Marcos García        <marcosgdf@gmail.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

From 5ec38d89ffd75482a23ede368a2645b1fde6792a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marcos=20Garci=CC=81a=20de=20La=20Fuente?=
 <marcosgdf@gmail.com>
Date: Thu, 25 Dec 2014 22:59:57 +0100
Subject: [PATCH 27/34] Fixed [ bug #1763 ] Undefined variable $interface in
 Project:574

---
 htdocs/projet/class/project.class.php | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

diff --git a/htdocs/projet/class/project.class.php b/htdocs/projet/class/project.class.php
index 41ae40a259d..fb98bec1c46 100644
--- a/htdocs/projet/class/project.class.php
+++ b/htdocs/projet/class/project.class.php
@@ -568,16 +568,9 @@ class Project extends CommonObject
             {
                 // Call trigger
                 $result=$this->call_trigger('PROJECT_DELETE',$user);
-                if ($result < 0)
-                {
+
+                if ($result < 0) {
                     $error++;
-                    if (! empty($interface->errors))
-                    {
-                		foreach ($interface->errors as $errmsg ) {
-                			dol_syslog(get_class($this) . "::delete " . $errmsg, LOG_ERR);
-                			$this->errors[] =$errmsg;
-                		}
-                    }
                 }
                 // End call triggers
             }

From aec1bdb3c4bf2608963ca28fd3a771fd043135f8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marcos=20Garci=CC=81a=20de=20La=20Fuente?=
 <marcosgdf@gmail.com>
Date: Thu, 25 Dec 2014 23:08:07 +0100
Subject: [PATCH 28/34] Fixed [ bug #1766 ] PHP Warning when adding a service
 to a supplier invoice

---
 htdocs/comm/propal.php         |  5 +----
 htdocs/commande/card.php       |  4 ++--
 htdocs/compta/facture.php      |  6 +++---
 htdocs/expedition/card.php     |  4 +---
 htdocs/fourn/commande/card.php | 12 +++---------
 htdocs/fourn/facture/card.php  |  8 ++------
 htdocs/livraison/card.php      |  4 +---
 7 files changed, 13 insertions(+), 30 deletions(-)

diff --git a/htdocs/comm/propal.php b/htdocs/comm/propal.php
index 5d20743d029..3744a9e4bab 100644
--- a/htdocs/comm/propal.php
+++ b/htdocs/comm/propal.php
@@ -189,8 +189,8 @@ else if ($action == 'confirm_validate' && $confirm == 'yes' && $user->rights->pr
 					$outputlangs->setDefaultLang($newlang);
 				}
 				$model=$object->modelpdf;
-				if (empty($model)) { $tmp=getListOfModels($db, 'propal'); $keys=array_keys($tmp); $model=$keys[0]; }
 				$ret = $object->fetch($id); // Reload to get new records
+
 				$object->generateDocument($model, $outputlangs, $hidedetails, $hidedesc, $hideref);
 			}
 		}
@@ -499,9 +499,6 @@ else if ($action == 'add' && $user->rights->propal->creer)
 			    			$outputlangs->setDefaultLang($newlang);
 			    		}
 			    		$model=$object->modelpdf;
-			    		if (empty($model)) {
-			    			$tmp=getListOfModels($db, 'propal'); $keys=array_keys($tmp); $model=$keys[0];
-			    		}
 
 			    		$ret = $object->fetch($id); // Reload to get new records
 			    		$result=$object->generateDocument($model, $outputlangs, $hidedetails, $hidedesc, $hideref);
diff --git a/htdocs/commande/card.php b/htdocs/commande/card.php
index 1291d6cce26..62577387bbd 100644
--- a/htdocs/commande/card.php
+++ b/htdocs/commande/card.php
@@ -922,8 +922,8 @@ else if ($action == 'confirm_validate' && $confirm == 'yes' && $user->rights->co
 					$outputlangs->setDefaultLang($newlang);
 				}
 				$model=$object->modelpdf;
-				if (empty($model)) { $tmp=getListOfModels($db, 'order'); $keys=array_keys($tmp); $model=$keys[0]; }
 				$ret = $object->fetch($id); // Reload to get new records
+
 				$object->generateDocument($model, $outputlangs, $hidedetails, $hidedesc, $hideref);
 			}
 		}
@@ -971,8 +971,8 @@ else if ($action == 'confirm_modif' && $user->rights->commande->creer) {
 					$outputlangs->setDefaultLang($newlang);
 				}
 				$model=$object->modelpdf;
-				if (empty($model)) { $tmp=getListOfModels($db, 'order'); $keys=array_keys($tmp); $model=$keys[0]; }
 				$ret = $object->fetch($id); // Reload to get new records
+
 				$object->generateDocument($model, $outputlangs, $hidedetails, $hidedesc, $hideref);
 			}
 		}
diff --git a/htdocs/compta/facture.php b/htdocs/compta/facture.php
index 4f8eb73a8db..000b1f7de90 100644
--- a/htdocs/compta/facture.php
+++ b/htdocs/compta/facture.php
@@ -417,8 +417,8 @@ else if ($action == 'confirm_valid' && $confirm == 'yes' && $user->rights->factu
 					$outputlangs->setDefaultLang($newlang);
 				}
 				$model=$object->modelpdf;
-				if (empty($model)) { $tmp=getListOfModels($db, 'invoice'); $keys=array_keys($tmp); $model=$keys[0]; }
 				$ret = $object->fetch($id); // Reload to get new records
+
 				$result = $object->generateDocument($model, $outputlangs, $hidedetails, $hidedesc, $hideref);
     			if ($result < 0) dol_print_error($db,$result);
 			}
@@ -500,8 +500,8 @@ else if ($action == 'confirm_modif' && ((empty($conf->global->MAIN_USE_ADVANCED_
 					$outputlangs->setDefaultLang($newlang);
 				}
 				$model=$object->modelpdf;
-				if (empty($model)) { $tmp=getListOfModels($db, 'invoice'); $keys=array_keys($tmp); $model=$keys[0]; }
 				$ret = $object->fetch($id); // Reload to get new records
+
 				$object->generateDocument($model, $outputlangs, $hidedetails, $hidedesc, $hideref);
 			}
 		}
@@ -1328,8 +1328,8 @@ else if ($action == 'addline' && $user->rights->facture->creer)
 						$outputlangs->setDefaultLang($newlang);
 					}
 					$model=$object->modelpdf;
-					if (empty($model)) { $tmp=getListOfModels($db, 'invoice'); $keys=array_keys($tmp); $model=$keys[0]; }
 					$ret = $object->fetch($id); // Reload to get new records
+
 					$object->generateDocument($model, $outputlangs, $hidedetails, $hidedesc, $hideref);
 				}
 
diff --git a/htdocs/expedition/card.php b/htdocs/expedition/card.php
index 6ee45778d18..423d1565f8c 100644
--- a/htdocs/expedition/card.php
+++ b/htdocs/expedition/card.php
@@ -279,10 +279,8 @@ else if ($action == 'confirm_valid' && $confirm == 'yes' && $user->rights->exped
     			$outputlangs->setDefaultLang($newlang);
     		}
     		$model=$object->modelpdf;
-    		if (empty($model)) {
-    			$tmp=getListOfModels($db, 'shipping'); $keys=array_keys($tmp); $model=$keys[0];
-    		}
     		$ret = $object->fetch($id); // Reload to get new records
+
     		$result=$object->generateDocument($model, $outputlangs, $hidedetails, $hidedesc, $hideref);
     		if ($result < 0) dol_print_error($db,$result);
     	}
diff --git a/htdocs/fourn/commande/card.php b/htdocs/fourn/commande/card.php
index 753f91fbdda..09556bd9125 100644
--- a/htdocs/fourn/commande/card.php
+++ b/htdocs/fourn/commande/card.php
@@ -357,10 +357,8 @@ else if ($action == 'addline' && $user->rights->fournisseur->commande->creer)
     			$outputlangs->setDefaultLang($newlang);
     		}
     		$model=$object->modelpdf;
-    		if (empty($model)) {
-    			$tmp=getListOfModels($db, 'order_supplier'); $keys=array_keys($tmp); $model=$keys[0];
-    		}
     		$ret = $object->fetch($id); // Reload to get new records
+
     		$result=$object->generateDocument($model, $outputlangs, $hidedetails, $hidedesc, $hideref);
     		if ($result < 0) dol_print_error($db,$result);
     	}
@@ -462,10 +460,8 @@ else if ($action == 'update_line' && $user->rights->fournisseur->commande->creer
     			$outputlangs->setDefaultLang($newlang);
     		}
     		$model=$object->modelpdf;
-    		if (empty($model)) {
-    			$tmp=getListOfModels($db, 'order_supplier'); $keys=array_keys($tmp); $model=$keys[0];
-    		}
     		$ret = $object->fetch($id); // Reload to get new records
+
     		$result=$object->generateDocument($model, $outputlangs, $hidedetails, $hidedesc, $hideref);
     		if ($result < 0) dol_print_error($db,$result);
     	}
@@ -526,10 +522,8 @@ else if ($action == 'confirm_valid' && $confirm == 'yes' && $user->rights->fourn
     			$outputlangs->setDefaultLang($newlang);
     		}
     		$model=$object->modelpdf;
-    		if (empty($model)) {
-    			$tmp=getListOfModels($db, 'order_supplier'); $keys=array_keys($tmp); $model=$keys[0];
-    		}
     		$ret = $object->fetch($id); // Reload to get new records
+
     		$result=$object->generateDocument($model, $outputlangs, $hidedetails, $hidedesc, $hideref);
     		if ($result < 0) dol_print_error($db,$result);
     	}
diff --git a/htdocs/fourn/facture/card.php b/htdocs/fourn/facture/card.php
index 38a0f79a6ea..9542fc062e7 100644
--- a/htdocs/fourn/facture/card.php
+++ b/htdocs/fourn/facture/card.php
@@ -711,10 +711,8 @@ elseif ($action == 'addline' && $user->rights->fournisseur->facture->creer)
     			$outputlangs->setDefaultLang($newlang);
     		}
     		$model=$object->modelpdf;
-    		if (empty($model)) {
-    			$tmp=getListOfModels($db, 'invoice_supplier'); $keys=array_keys($tmp); $model=$keys[0];
-    		}
     		$ret = $object->fetch($id); // Reload to get new records
+
     		$result=$object->generateDocument($model, $outputlangs, $hidedetails, $hidedesc, $hideref);
     		if ($result < 0) dol_print_error($db,$result);
     	}
@@ -793,10 +791,8 @@ elseif ($action == 'edit' && $user->rights->fournisseur->facture->creer)
     			$outputlangs->setDefaultLang($newlang);
     		}
     		$model=$object->modelpdf;
-    		if (empty($model)) {
-    			$tmp=getListOfModels($db, 'invoice_supplier'); $keys=array_keys($tmp); $model=$keys[0];
-    		}
     		$ret = $object->fetch($id); // Reload to get new records
+
     		$result=$object->generateDocument($model, $outputlangs, $hidedetails, $hidedesc, $hideref);
     		if ($result < 0) dol_print_error($db,$result);
     	}
diff --git a/htdocs/livraison/card.php b/htdocs/livraison/card.php
index 2b6a74a519e..1a89a377fef 100644
--- a/htdocs/livraison/card.php
+++ b/htdocs/livraison/card.php
@@ -135,10 +135,8 @@ else if ($action == 'confirm_valid' && $confirm == 'yes' && $user->rights->exped
 			$outputlangs->setDefaultLang($newlang);
 		}
 		$model=$object->modelpdf;
-		if (empty($model)) {
-			$tmp=getListOfModels($db, 'delivery'); $keys=array_keys($tmp); $model=$keys[0];
-		}
 		$ret = $object->fetch($id); // Reload to get new records
+
 		$result=$object->generateDocument($model, $outputlangs, $hidedetails, $hidedesc, $hideref);
 		if ($result < 0) dol_print_error($db,$result);
 	}

From f4def9ea288c0677117087f883e1625a01b1f358 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marcos=20Garci=CC=81a=20de=20La=20Fuente?=
 <marcosgdf@gmail.com>
Date: Fri, 26 Dec 2014 00:07:24 +0100
Subject: [PATCH 29/34] Fix: [ bug #1769 ] Error when installing to a
 PostgreSQL DB that contains numbers

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

diff --git a/ChangeLog b/ChangeLog
index 949492346b2..48cc3247cb5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -4,6 +4,7 @@ English Dolibarr ChangeLog
 
 ***** ChangeLog for 3.5.7 compared to 3.5.6 *****
 Fix: Paypal link were broken dur to SSL v3 closed.
+Fix: [ bug #1769 ] Error when installing to a PostgreSQL DB that contains numbers
 
 ***** ChangeLog for 3.5.6 compared to 3.5.5 *****
 Fix: Avoid missing class error for fetch_thirdparty method #1973
diff --git a/htdocs/core/db/pgsql.class.php b/htdocs/core/db/pgsql.class.php
index efb9888f8b3..3af1c4bef83 100644
--- a/htdocs/core/db/pgsql.class.php
+++ b/htdocs/core/db/pgsql.class.php
@@ -1021,7 +1021,7 @@ class DoliDBPgsql extends DoliDB
 		// Test charset match LC_TYPE (pgsql error otherwise)
 		//print $charset.' '.setlocale(LC_CTYPE,'0'); exit;
 
-		$sql='CREATE DATABASE '.$database.' OWNER '.$owner.' ENCODING \''.$charset.'\'';
+		$sql='CREATE DATABASE "'.$database.'" OWNER "'.$owner.'" ENCODING \''.$charset.'\'';
 		dol_syslog($sql,LOG_DEBUG);
 		$ret=$this->query($sql);
 		return $ret;

From 1d39c1acc22fdd7d2767fea7061b24b3242477d6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marcos=20Garci=CC=81a=20de=20La=20Fuente?=
 <marcosgdf@gmail.com>
Date: Fri, 26 Dec 2014 00:12:16 +0100
Subject: [PATCH 30/34] Fix: [ bug #1768 ] PHP Warning when error connecting to
 a PostgreSQL server in install script

---
 htdocs/core/db/pgsql.class.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/core/db/pgsql.class.php b/htdocs/core/db/pgsql.class.php
index efb9888f8b3..f0f1f0333c8 100644
--- a/htdocs/core/db/pgsql.class.php
+++ b/htdocs/core/db/pgsql.class.php
@@ -402,7 +402,7 @@ class DoliDBPgsql extends DoliDB
 		if ((! empty($host) && $host == "socket") && ! defined('NOLOCALSOCKETPGCONNECT'))
 		{
 			$con_string = "dbname='".$name."' user='".$login."' password='".$passwd."'";    // $name may be empty
-			$this->db = pg_connect($con_string);
+			$this->db = @pg_connect($con_string);
 		}
 
 		// if local connection failed or not requested, use TCP/IP
@@ -412,7 +412,7 @@ class DoliDBPgsql extends DoliDB
 			if (! $port) $port = 5432;
 
 			$con_string = "host='".$host."' port='".$port."' dbname='".$name."' user='".$login."' password='".$passwd."'";
-			$this->db = pg_connect($con_string);
+			$this->db = @pg_connect($con_string);
 		}
 
 		// now we test if at least one connect method was a success

From 8e47fe9e1c0d6983fdffcab77d927c3528dda030 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marcos=20Garci=CC=81a=20de=20La=20Fuente?=
 <marcosgdf@gmail.com>
Date: Fri, 26 Dec 2014 00:19:09 +0100
Subject: [PATCH 31/34] Fix: [ bug #1757 ] Sorting breaks product/service
 statistics

---
 ChangeLog                   |  1 +
 htdocs/product/popuprop.php | 20 ++++++++++++++------
 2 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 949492346b2..624f4ca15a8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -4,6 +4,7 @@ English Dolibarr ChangeLog
 
 ***** ChangeLog for 3.5.7 compared to 3.5.6 *****
 Fix: Paypal link were broken dur to SSL v3 closed.
+Fix: [ bug #1757 ] Sorting breaks product/service statistics
 
 ***** ChangeLog for 3.5.6 compared to 3.5.5 *****
 Fix: Avoid missing class error for fetch_thirdparty method #1973
diff --git a/htdocs/product/popuprop.php b/htdocs/product/popuprop.php
index 5404dd1848a..b89fbc3b911 100644
--- a/htdocs/product/popuprop.php
+++ b/htdocs/product/popuprop.php
@@ -3,6 +3,7 @@
  * Copyright (C) 2004-2005 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2004      Eric Seigne          <eric.seigne@ryxeo.com>
  * Copyright (C) 2005-2012 Regis Houssin        <regis.houssin@capnetworks.com>
+ * Copyright (C) 2014      Marcos García        <marcosgdf@gmail.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -71,7 +72,9 @@ llxHeader('','',$helpurl);
 $sql = "SELECT count(*) as c";
 $sql.= " FROM ".MAIN_DB_PREFIX."product";
 $sql.= ' WHERE entity IN ('.getEntity('product', 1).')';
-if (isset($type)) $sql.= " AND fk_product_type = ".$type;
+if ($type !== '') {
+	$sql.= " AND fk_product_type = ".$type;
+}
 
 $result=$db->query($sql);
 if ($result)
@@ -82,11 +85,14 @@ if ($result)
 
 $param = '';
 $title = $langs->trans("ListProductServiceByPopularity");
-if (isset($type))
-{
+if ($type !== '') {
 	$param = '&amp;type='.$type;
-	$title = $langs->trans("ListProductByPopularity");
-	if ($type == 1) $title = $langs->trans("ListServiceByPopularity");
+
+	if ($type == 1) {
+		$title = $langs->trans("ListServiceByPopularity");
+	} else {
+		$title = $langs->trans("ListProductByPopularity");
+	}
 }
 
 print_barre_liste($title, $page, "popuprop.php",$param,"","","",$num);
@@ -106,7 +112,9 @@ $sql.= " FROM ".MAIN_DB_PREFIX."propaldet as pd";
 $sql.= ", ".MAIN_DB_PREFIX."product as p";
 $sql.= ' WHERE p.entity IN ('.getEntity('product', 1).')';
 $sql.= " AND p.rowid = pd.fk_product";
-if (isset($type)) $sql.= " AND fk_product_type = ".$type;
+if ($type !== '') {
+	$sql.= " AND fk_product_type = ".$type;
+}
 $sql.= " GROUP BY (p.rowid)";
 $sql.= $db->order($sortfield,$sortorder);
 $sql.= $db->plimit($limit, $offset);

From 745eece5fed0d9fbdb7bcd6a72c5efb189a3d438 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marcos=20Garci=CC=81a=20de=20La=20Fuente?=
 <marcosgdf@gmail.com>
Date: Fri, 26 Dec 2014 00:34:57 +0100
Subject: [PATCH 32/34] Fix: [ bug #1761 ] SQL error when installing 3.7 with
 PostgreSQL

---
 htdocs/install/mysql/tables/llx_usergroup_extrafields.sql | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/install/mysql/tables/llx_usergroup_extrafields.sql b/htdocs/install/mysql/tables/llx_usergroup_extrafields.sql
index 333eb41ad08..0a89810dce5 100644
--- a/htdocs/install/mysql/tables/llx_usergroup_extrafields.sql
+++ b/htdocs/install/mysql/tables/llx_usergroup_extrafields.sql
@@ -21,6 +21,6 @@ CREATE TABLE IF NOT EXISTS llx_usergroup_extrafields (
   tms                       timestamp,
   fk_object                 integer NOT NULL,
   import_key                varchar(14)                          		-- import key
-) ENGINE=InnoDB ;
+)ENGINE=innodb;
 
 

From 420ebe0be914511eb6d303581a18f5cdf233a47b Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 26 Dec 2014 04:04:16 +0100
Subject: [PATCH 33/34] Fix: Change order to create fields

---
 htdocs/install/mysql/migration/3.6.0-3.7.0.sql | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/install/mysql/migration/3.6.0-3.7.0.sql b/htdocs/install/mysql/migration/3.6.0-3.7.0.sql
index 2281793929f..0b71a2fe6fe 100755
--- a/htdocs/install/mysql/migration/3.6.0-3.7.0.sql
+++ b/htdocs/install/mysql/migration/3.6.0-3.7.0.sql
@@ -220,8 +220,8 @@ create table llx_accounting_fiscalyear
 	fk_user_modif	integer NULL
 )ENGINE=innodb;
 
-ALTER TABLE llx_contrat ADD COLUMN ref_ext varchar(30) after ref;
-ALTER TABLE llx_contrat ADD COLUMN ref_supplier varchar(30) after ref_ext;
+ALTER TABLE llx_contrat ADD COLUMN ref_supplier varchar(30) after ref;
+ALTER TABLE llx_contrat ADD COLUMN ref_ext varchar(30) after ref_supplier;
 
 ALTER TABLE llx_propal ADD COLUMN fk_shipping_method integer AFTER date_livraison;
 ALTER TABLE llx_commande ADD COLUMN fk_shipping_method integer AFTER date_livraison;

From bdf5f5726f7af2f85a14eff9a64f417bf11ca95f Mon Sep 17 00:00:00 2001
From: Juanjo Menent <jmenent@2byte.es>
Date: Fri, 26 Dec 2014 09:29:27 +0100
Subject: [PATCH 34/34] Fix: Bad order field value

---
 htdocs/product/stats/facture.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/htdocs/product/stats/facture.php b/htdocs/product/stats/facture.php
index 39768262f10..49e5651b065 100644
--- a/htdocs/product/stats/facture.php
+++ b/htdocs/product/stats/facture.php
@@ -2,6 +2,7 @@
 /* Copyright (C) 2003-2007 Rodolphe Quiedeville <rodolphe@quiedeville.org>
  * Copyright (C) 2004-2010 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2005-2012 Regis Houssin        <regis.houssin@capnetworks.com>
+ * Copyright (C) 2014	   Juanjo Menent        <jmenent@2byte.es>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -155,7 +156,7 @@ if ($id > 0 || ! empty($ref))
                 print_liste_field_titre($langs->trans("CustomerCode"),$_SERVER["PHP_SELF"],"s.code_client","","&amp;id=".$product->id,'',$sortfield,$sortorder);
                 print_liste_field_titre($langs->trans("DateInvoice"),$_SERVER["PHP_SELF"],"f.datef","","&amp;id=".$product->id,'align="center"',$sortfield,$sortorder);
                 print_liste_field_titre($langs->trans("Qty"),$_SERVER["PHP_SELF"],"d.qty","","&amp;id=".$product->id,'align="center"',$sortfield,$sortorder);
-                print_liste_field_titre($langs->trans("AmountHT"),$_SERVER["PHP_SELF"],"f.total_ht","","&amp;id=".$product->id,'align="right"',$sortfield,$sortorder);
+                print_liste_field_titre($langs->trans("AmountHT"),$_SERVER["PHP_SELF"],"f.total","","&amp;id=".$product->id,'align="right"',$sortfield,$sortorder);
                 print_liste_field_titre($langs->trans("Status"),$_SERVER["PHP_SELF"],"f.paye,f.fk_statut","","&amp;id=".$product->id,'align="right"',$sortfield,$sortorder);
                 print "</tr>\n";