From f6057bd7943e46722513795f63f33448b4ab836a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marcos=20Garci=CC=81a?= <marcosgdf@gmail.com>
Date: Thu, 30 May 2013 16:48:04 +0200
Subject: [PATCH 01/43] Reverting PR #1002 Incorrect translation that shouldn't
 have been accepted

---
 htdocs/langs/es_MX/banks.lang | 2 --
 htdocs/langs/es_MX/bills.lang | 2 --
 2 files changed, 4 deletions(-)

diff --git a/htdocs/langs/es_MX/banks.lang b/htdocs/langs/es_MX/banks.lang
index 4e7fd2d1080..58ef3a65d00 100644
--- a/htdocs/langs/es_MX/banks.lang
+++ b/htdocs/langs/es_MX/banks.lang
@@ -1,5 +1,3 @@
 # Dolibarr language file - es_MX - banks
 CHARSET=UTF-8
-IBAN=CLAVE Interbancaria
-BIC=Sucursal
 BankAccountDomiciliation=Tarjeta
\ No newline at end of file
diff --git a/htdocs/langs/es_MX/bills.lang b/htdocs/langs/es_MX/bills.lang
index 26c1a6583d1..e5ae5cc1336 100644
--- a/htdocs/langs/es_MX/bills.lang
+++ b/htdocs/langs/es_MX/bills.lang
@@ -23,6 +23,4 @@ TerreNumRefModelDesc1=Devuelve el número bajo el formato %syymm-nnnn para las f
 AddCreditNote=Crear nota de crédito
 BillTo=Receptor
 Residence=Tarjeta
-IBANNumber=CLAVE Interbancaria
-BICNumber=Sucursal
 PaymentByTransferOnThisBankAccount=Cuenta para depositos y transferencias
\ No newline at end of file

From 8ae0939ae57e18e29cdcec59106bbeb3d6a78dc1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marcos=20Garci=CC=81a?= <marcosgdf@gmail.com>
Date: Sat, 1 Jun 2013 15:39:45 +0200
Subject: [PATCH 02/43] Fixed bug #903: Fatal error: Call to undefined function
 dol_get_first_day() in htdocs/commande/liste.php

---
 ChangeLog                 | 3 +++
 htdocs/commande/liste.php | 1 +
 2 files changed, 4 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index 9f8e4697296..ddafb08d110 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,7 +2,9 @@
 English Dolibarr ChangeLog
 --------------------------------------------------------------
 
+***** ChangeLog for 3.3.3 compared to 3.3.2 *****
 
+- Fix: [ bug #903 ] Fatal error: Call to undefined function dol_get_first_day() in htdocs/commande/liste.php
 
 ***** ChangeLog for 3.3.2 compared to 3.3.1 *****
 
@@ -34,6 +36,7 @@ English Dolibarr ChangeLog
 - Fix: [ bug #788 ] Date of linked interventions are not shown
 - Fix: external users should not see costprice and margin infos
 - Fix: [ bug #806 ] Tasks are ordered alphabetically instead of chronological order
+
 ***** ChangeLog for 3.3.1 compared to 3.3 *****
 
 - Fix: [ bug #733 ] Mass emailing tools do not support <style HTML tag
diff --git a/htdocs/commande/liste.php b/htdocs/commande/liste.php
index 3bc807476e8..568bf26a160 100644
--- a/htdocs/commande/liste.php
+++ b/htdocs/commande/liste.php
@@ -27,6 +27,7 @@
 
 
 require '../main.inc.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php';
 require_once DOL_DOCUMENT_ROOT.'/commande/class/commande.class.php';

From cf1d269f15e10a84c24f14e6991b7b37d333b2db Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marcos=20Garci=CC=81a?= <marcosgdf@gmail.com>
Date: Sat, 1 Jun 2013 16:11:45 +0200
Subject: [PATCH 03/43] Avoid warnings

---
 htdocs/product/class/product.class.php | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/htdocs/product/class/product.class.php b/htdocs/product/class/product.class.php
index b9ad2991738..6bb6f41e172 100644
--- a/htdocs/product/class/product.class.php
+++ b/htdocs/product/class/product.class.php
@@ -2157,13 +2157,13 @@ class Product extends CommonObject
 					'fullpath' => $compl_path.$label,			// Label
 					'type'=>$type				// Nb of units that compose parent product
 				);
-			}
 
-			// Recursive call if child is an array
-			if (is_array($desc_pere['childs']))
-			{
-				//print 'YYY We go down for '.$desc_pere[3]." -> \n";
-				$this ->fetch_prod_arbo($desc_pere['childs'], $compl_path.$desc_pere[3]." -> ", $desc_pere[1]*$multiply, $level+1);
+				// Recursive call if child is an array
+				if (is_array($desc_pere['childs']))
+				{
+					//print 'YYY We go down for '.$desc_pere[3]." -> \n";
+					$this ->fetch_prod_arbo($desc_pere['childs'], $compl_path.$desc_pere[3]." -> ", $desc_pere[1]*$multiply, $level+1);
+				}
 			}
 		}
 	}

From 6856ca39937205d06a675a8855510d1fa0b6f683 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rapha=C3=ABl=20Doursenaud?= <rdoursenaud@gpcsolutions.fr>
Date: Mon, 3 Jun 2013 11:58:35 +0200
Subject: [PATCH 04/43] Added a gitattribute file to let git deal with line
 ending issues

---
 .gitattributes | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)
 create mode 100644 .gitattributes

diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 00000000000..e3eee740938
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1,21 @@
+# Set default behaviour, in case users don't have core.autocrlf set.
+* text=auto
+
+# Explicitly declare text files we want to always be normalized and converted 
+# to native line endings on checkout.
+*.php text
+*.sql text
+*.htm text
+*.html text
+*.js text
+*.css text
+*.lang text
+*.txt text
+*.md text
+
+# Denote all files that are truly binary and should not be modified.
+*.ico binary
+*.png binary
+*.jpg binary
+*.odt binary
+*.odf binary

From 4b3413c84c3712e4de42d14aa70d6375f946f5b3 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 3 Jun 2013 11:33:13 +0200
Subject: [PATCH 05/43] Fix: Loading of boxes from external modules

---
 htdocs/core/class/infobox.class.php | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/htdocs/core/class/infobox.class.php b/htdocs/core/class/infobox.class.php
index 07ca9026482..1fa38d5c2b8 100644
--- a/htdocs/core/class/infobox.class.php
+++ b/htdocs/core/class/infobox.class.php
@@ -87,7 +87,7 @@ class InfoBox
                 {
                     if (preg_match('/^([^@]+)@([^@]+)$/i',$obj->file,$regs))
                     {
-                        $boxname = $regs[1];
+                        $boxname = preg_replace('/.php$/i','',$regs[1]);
                         $module = $regs[2];
                         $relsourcefile = "/".$module."/core/boxes/".$boxname.".php";
                     }
@@ -95,9 +95,9 @@ class InfoBox
                     {
                         $boxname=preg_replace('/.php$/i','',$obj->file);
                         $relsourcefile = "/core/boxes/".$boxname.".php";
-                    }
+					}
 
-                    // TODO PERF Do not make "dol_include_once" here, nor "new" later. This means, we must store a 'depends' field to store modules list, then
+					// TODO PERF Do not make "dol_include_once" here, nor "new" later. This means, we must store a 'depends' field to store modules list, then
                     // the "enabled" condition for modules forbidden for external users and the depends condition can be done.
                     // Goal is to avoid making a new instance for each boxes returned by select.
 
@@ -106,7 +106,7 @@ class InfoBox
                     {
                         $box=new $boxname($db,$obj->note);		// Constructor may set properties like box->enabled. obj->note is note into box def, not user params.
                         //$box=new stdClass();
-
+                        
                         // box properties
                         $box->rowid		= (empty($obj->rowid) ? '' : $obj->rowid);
                         $box->id		= (empty($obj->box_id) ? '' : $obj->box_id);
@@ -126,7 +126,7 @@ class InfoBox
                         // box_def properties
                         $box->box_id	= (empty($obj->box_id) ? '' : $obj->box_id);
                         $box->note		= (empty($obj->note) ? '' : $obj->note);
-
+                        
                         // Filter on box->enabled (fused for example by box_comptes) and box->depends
                         //$enabled=1;
                         $enabled=$box->enabled;
@@ -135,14 +135,15 @@ class InfoBox
                             foreach($box->depends as $module)
                             {
                                 //print $boxname.'-'.$module.'<br>';
-                                if (empty($conf->$module->enabled)) $enabled=0;
+                                $tmpmodule=preg_replace('/@[^@]+/','',$module);
+                                if (empty($conf->$tmpmodule->enabled)) $enabled=0;
                             }
                         }
 
                         //print 'xx module='.$module.' enabled='.$enabled;
                         if ($enabled) $boxes[]=$box;
                         else unset($box);
-                    }
+                        }
                 }
                 $j++;
             }

From 1ff175f14e35b5060c76ebf758e2be58fdcc6b58 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 3 Jun 2013 12:46:25 +0200
Subject: [PATCH 06/43] Fix: Bad regex

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

diff --git a/htdocs/core/class/infobox.class.php b/htdocs/core/class/infobox.class.php
index 1fa38d5c2b8..131ece58aee 100644
--- a/htdocs/core/class/infobox.class.php
+++ b/htdocs/core/class/infobox.class.php
@@ -87,13 +87,13 @@ class InfoBox
                 {
                     if (preg_match('/^([^@]+)@([^@]+)$/i',$obj->file,$regs))
                     {
-                        $boxname = preg_replace('/.php$/i','',$regs[1]);
+                        $boxname = preg_replace('/\.php$/i','',$regs[1]);
                         $module = $regs[2];
                         $relsourcefile = "/".$module."/core/boxes/".$boxname.".php";
                     }
                     else
                     {
-                        $boxname=preg_replace('/.php$/i','',$obj->file);
+                        $boxname=preg_replace('/\.php$/i','',$obj->file);
                         $relsourcefile = "/core/boxes/".$boxname.".php";
 					}
 

From 1ccde6ad04b30e7ceb73fdbc7b00367c2cd40158 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 3 Jun 2013 19:25:12 +0200
Subject: [PATCH 07/43] Fix: syntax error

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

diff --git a/htdocs/install/mysql/migration/repair.sql b/htdocs/install/mysql/migration/repair.sql
index f27fb8cf95f..9b70e075e7c 100644
--- a/htdocs/install/mysql/migration/repair.sql
+++ b/htdocs/install/mysql/migration/repair.sql
@@ -80,8 +80,8 @@ insert into llx_c_actioncomm (id, code, type, libelle, module, position) values
 UPDATE llx_product p SET p.stock= (SELECT SUM(ps.reel) FROM llx_product_stock ps WHERE ps.fk_product = p.rowid);
 
 
--- VMYSQL4.1 DELETE T1 FROM llx_boxes_def as T1, llx_boxes_def as T2 where T1.entity = T2.entity AND T1.file = T2.file AND T1.note = T2.note and T1.rowid > T2.rowid
--- VPGSQL8.2 DELETE FROM llx_boxes_def as T1 WHERE rowid NOT IN (SELECT min(rowid) FROM llx_boxes_def GROUP BY file, entity, note)
+-- VMYSQL4.1 DELETE T1 FROM llx_boxes_def as T1, llx_boxes_def as T2 where T1.entity = T2.entity AND T1.file = T2.file AND T1.note = T2.note and T1.rowid > T2.rowid;
+-- VPGSQL8.2 DELETE FROM llx_boxes_def as T1 WHERE rowid NOT IN (SELECT min(rowid) FROM llx_boxes_def GROUP BY file, entity, note);
 
 
 -- Requests to clean old tables or fields

From 3127d66b17585da9dede01efb2074ad22573914a Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 3 Jun 2013 19:46:43 +0200
Subject: [PATCH 08/43] Fix: Regression

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

diff --git a/htdocs/core/class/html.formmail.class.php b/htdocs/core/class/html.formmail.class.php
index f00843f9af1..37ad8a6384c 100644
--- a/htdocs/core/class/html.formmail.class.php
+++ b/htdocs/core/class/html.formmail.class.php
@@ -596,7 +596,7 @@ class FormMail
         			if (!empty($conf->global->FCKEDITOR_ENABLE_MAIL)) {
         				$this->withfckeditor=1;
         			}
-        			$doleditor=new DolEditor('message',nl2br($defaultmessage),'',280,$this->ckeditortoolbar,'In',true,true,$this->withfckeditor,8,72);
+        			$doleditor=new DolEditor('message',$defaultmessage,'',280,$this->ckeditortoolbar,'In',true,true,$this->withfckeditor,8,72);
         			$out.= $doleditor->Create(1);
         		}
         		$out.= "</td></tr>\n";

From e871ea64eb6d65486fb5fcafdf820909198191c9 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 3 Jun 2013 19:52:34 +0200
Subject: [PATCH 09/43] Fix: Regression

---
 htdocs/admin/mails.php                    | 2 +-
 htdocs/core/class/html.formmail.class.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/admin/mails.php b/htdocs/admin/mails.php
index f96528648af..de0f9f6ed08 100644
--- a/htdocs/admin/mails.php
+++ b/htdocs/admin/mails.php
@@ -686,7 +686,7 @@ else
 		$formmail->withtopic=(isset($_POST['subject'])?$_POST['subject']:$langs->trans("Test"));
 		$formmail->withtopicreadonly=0;
 		$formmail->withfile=2;
-		$formmail->withbody=(isset($_POST['message'])?$_POST['message']:($action == 'testhtml'?$langs->trans("PredefinedMailTestHtml"):$langs->trans("PredefinedMailTest")));
+		$formmail->withbody=(isset($_POST['message'])?$_POST['message']:($action == 'testhtml'?$langs->transnoentities("PredefinedMailTestHtml"):$langs->transnoentities("PredefinedMailTest")));
 		$formmail->withbodyreadonly=0;
 		$formmail->withcancel=1;
 		$formmail->withdeliveryreceipt=1;
diff --git a/htdocs/core/class/html.formmail.class.php b/htdocs/core/class/html.formmail.class.php
index f00843f9af1..37ad8a6384c 100644
--- a/htdocs/core/class/html.formmail.class.php
+++ b/htdocs/core/class/html.formmail.class.php
@@ -596,7 +596,7 @@ class FormMail
         			if (!empty($conf->global->FCKEDITOR_ENABLE_MAIL)) {
         				$this->withfckeditor=1;
         			}
-        			$doleditor=new DolEditor('message',nl2br($defaultmessage),'',280,$this->ckeditortoolbar,'In',true,true,$this->withfckeditor,8,72);
+        			$doleditor=new DolEditor('message',$defaultmessage,'',280,$this->ckeditortoolbar,'In',true,true,$this->withfckeditor,8,72);
         			$out.= $doleditor->Create(1);
         		}
         		$out.= "</td></tr>\n";

From 205335f3478e92aed3aa74672b861a762b60a966 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 3 Jun 2013 20:16:07 +0200
Subject: [PATCH 10/43] Fix: Readonly mode for email was ok for eldy only.

---
 htdocs/comm/mailing/fiche.php               | 2 +-
 htdocs/theme/amarok/ckeditor/config.js      | 8 ++++++++
 htdocs/theme/auguria/ckeditor/config.js     | 8 ++++++++
 htdocs/theme/bureau2crea/ckeditor/config.js | 8 ++++++++
 htdocs/theme/cameleo/ckeditor/config.js     | 7 +++++++
 5 files changed, 32 insertions(+), 1 deletion(-)

diff --git a/htdocs/comm/mailing/fiche.php b/htdocs/comm/mailing/fiche.php
index a58e7d6ad4f..88ee011bf8f 100644
--- a/htdocs/comm/mailing/fiche.php
+++ b/htdocs/comm/mailing/fiche.php
@@ -668,7 +668,7 @@ if ($action == 'create')
 	print '<tr><td width="25%">'.$langs->trans("BackgroundColorByDefault").'</td><td colspan="3">';
 	print $htmlother->selectColor($_POST['bgcolor'],'bgcolor','new_mailing',0);
 	print '</td></tr>';
-	print '<tr><td width="25%" class="fieldrequired" valign="top">'.$langs->trans("MailMessage").'<br>';
+	print '<tr><td width="25%" valign="top"><span class="fieldrequired">'.$langs->trans("MailMessage").'</span><br>';
 	print '<br><i>'.$langs->trans("CommonSubstitutions").':<br>';
 	foreach($object->substitutionarray as $key => $val)
 	{
diff --git a/htdocs/theme/amarok/ckeditor/config.js b/htdocs/theme/amarok/ckeditor/config.js
index 0f3a3eb60d3..0f2dbb3fc6f 100755
--- a/htdocs/theme/amarok/ckeditor/config.js
+++ b/htdocs/theme/amarok/ckeditor/config.js
@@ -79,4 +79,12 @@ CKEDITOR.editorConfig = function( config )
 	 	['JustifyLeft','JustifyCenter','JustifyRight','JustifyBlock'],
 	    ['SpecialChar']
 	];
+	
+	// Used for mailing fields
+	config.toolbar_dolibarr_readonly =
+	[
+	 	['Source','Maximize'],
+	 	['Find']
+	];	
+	
 };
diff --git a/htdocs/theme/auguria/ckeditor/config.js b/htdocs/theme/auguria/ckeditor/config.js
index 45e65240f25..ed3e3d462b9 100644
--- a/htdocs/theme/auguria/ckeditor/config.js
+++ b/htdocs/theme/auguria/ckeditor/config.js
@@ -79,4 +79,12 @@ CKEDITOR.editorConfig = function( config )
 	 	['JustifyLeft','JustifyCenter','JustifyRight','JustifyBlock'],
 	    ['Link','Unlink','SpecialChar']
 	];
+	
+	// Used for mailing fields
+	config.toolbar_dolibarr_readonly =
+	[
+	 	['Source','Maximize'],
+	 	['Find']
+	];	
+	
 };
diff --git a/htdocs/theme/bureau2crea/ckeditor/config.js b/htdocs/theme/bureau2crea/ckeditor/config.js
index 45e65240f25..ed3e3d462b9 100644
--- a/htdocs/theme/bureau2crea/ckeditor/config.js
+++ b/htdocs/theme/bureau2crea/ckeditor/config.js
@@ -79,4 +79,12 @@ CKEDITOR.editorConfig = function( config )
 	 	['JustifyLeft','JustifyCenter','JustifyRight','JustifyBlock'],
 	    ['Link','Unlink','SpecialChar']
 	];
+	
+	// Used for mailing fields
+	config.toolbar_dolibarr_readonly =
+	[
+	 	['Source','Maximize'],
+	 	['Find']
+	];	
+	
 };
diff --git a/htdocs/theme/cameleo/ckeditor/config.js b/htdocs/theme/cameleo/ckeditor/config.js
index 85dd8c7429f..99d5d33fc5d 100644
--- a/htdocs/theme/cameleo/ckeditor/config.js
+++ b/htdocs/theme/cameleo/ckeditor/config.js
@@ -79,4 +79,11 @@ CKEDITOR.editorConfig = function( config )
 	 	['JustifyLeft','JustifyCenter','JustifyRight','JustifyBlock'],
 	    ['Link','Unlink','SpecialChar']
 	];
+	
+	// Used for mailing fields
+	config.toolbar_dolibarr_readonly =
+	[
+	 	['Source','Maximize'],
+	 	['Find']
+	];	
 };

From 12973dbdb4cc501ccaf8eb595c241f5cbfcc1289 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 3 Jun 2013 22:06:28 +0200
Subject: [PATCH 11/43] Look: Minor enhancement Fix: Option to fix bug to send
 email on by default.

---
 htdocs/admin/mails.php                  |  2 +-
 htdocs/admin/sms.php                    |  2 +-
 htdocs/install/mysql/data/llx_const.sql | 10 ++------
 htdocs/theme/eldy/style.css.php         | 33 ++++++++++++++-----------
 4 files changed, 22 insertions(+), 25 deletions(-)

diff --git a/htdocs/admin/mails.php b/htdocs/admin/mails.php
index de0f9f6ed08..fc47a6b607e 100644
--- a/htdocs/admin/mails.php
+++ b/htdocs/admin/mails.php
@@ -599,7 +599,7 @@ else
 
 	print '</table>';
 
-    if ($conf->global->MAIN_MAIL_SENDMODE == 'mail')
+    if ($conf->global->MAIN_MAIL_SENDMODE == 'mail' && empty($conf->global->MAIN_FIX_FOR_BUGGED_MTA))
     {
         print '<br>';
         /*
diff --git a/htdocs/admin/sms.php b/htdocs/admin/sms.php
index fc7f4e25c68..a91b8aa2ebd 100755
--- a/htdocs/admin/sms.php
+++ b/htdocs/admin/sms.php
@@ -217,7 +217,7 @@ else
 {
 	$var=true;
 
-	if (! count($listofmethods)) print '<div class="warning">'.$langs->trans("NoSmsEngine",'<a href="http://www.dolistore.com/search.php?orderby=position&orderway=desc&search_query=smsmanager">DoliStore</a>').'</div>';
+	if (! count($listofmethods)) print '<div class="warning">'.$langs->trans("NoSmsEngine",'<a target="_blank" href="http://www.dolistore.com/search.php?orderby=position&orderway=desc&search_query=smsmanager">DoliStore</a>').'</div>';
 
 	print '<table class="noborder" width="100%">';
 	print '<tr class="liste_titre"><td>'.$langs->trans("Parameter").'</td><td>'.$langs->trans("Value").'</td></tr>';
diff --git a/htdocs/install/mysql/data/llx_const.sql b/htdocs/install/mysql/data/llx_const.sql
index e7ac32687cf..1669d49c216 100644
--- a/htdocs/install/mysql/data/llx_const.sql
+++ b/htdocs/install/mysql/data/llx_const.sql
@@ -51,7 +51,6 @@ insert into llx_const (name, value, type, note, visible, entity) values ('MAIN_M
 --
 -- IHM
 --
-
 insert into llx_const (name, value, type, note, visible, entity) values ('MAIN_SIZE_LISTE_LIMIT','25','chaine','Longueur maximum des listes',0,0);
 insert into llx_const (name, value, type, note, visible, entity) values ('MAIN_SHOW_WORKBOARD','1','yesno','Affichage tableau de bord de travail Dolibarr',0,0);
 
@@ -62,7 +61,7 @@ insert into llx_const (name, value, type, note, visible) values ('MAIN_MENUFRONT
 
 
 --
--- Delai tolerance
+-- Warning delays
 --
 insert into llx_const (name, value, type, note, visible) values ('MAIN_DELAY_ACTIONS_TODO','7','chaine','Tolérance de retard avant alerte (en jours) sur actions planifiées non réalisées',0);
 insert into llx_const (name, value, type, note, visible) values ('MAIN_DELAY_ORDERS_TO_PROCESS','2','chaine','Tolérance de retard avant alerte (en jours) sur commandes clients non traitées',0);
@@ -77,13 +76,8 @@ insert into llx_const (name, value, type, note, visible) values ('MAIN_DELAY_MEM
 insert into llx_const (name, value, type, note, visible) values ('MAIN_DELAY_TRANSACTIONS_TO_CONCILIATE','62','chaine','Tolérance de retard avant alerte (en jours) sur rapprochements bancaires à faire',0);
 
 
---
--- Tiers
---
-insert into llx_const (name, value, type, note, visible, entity) values ('SOCIETE_NOLIST_COURRIER','1','yesno','Liste les fichiers du repertoire courrier',0,0);
-
-
 --
 -- Mail Mailing
 --
+insert into llx_const (name, value, type, note, visible) values ('MAIN_FIX_FOR_BUGGED_MTA','1','chaine','Set constant to fix email ending from PHP with some linux ike system',1);
 insert into llx_const (name, value, type, note, visible) values ('MAILING_EMAIL_FROM','dolibarr@domain.com','chaine','EMail emmetteur pour les envois d emailings',0);
diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php
index 02e871c20f6..a311080a73d 100644
--- a/htdocs/theme/eldy/style.css.php
+++ b/htdocs/theme/eldy/style.css.php
@@ -919,19 +919,20 @@ div.blockvmenupair, div.blockvmenuimpair, div.blockvmenubookmarks
     margin: 1px 0px 8px 2px;
 
 <?php if ($usecss3) { ?>
-    background-image: -o-linear-gradient(bottom, rgb(<?php echo $colorbacktab2; ?>) 0px, rgb(<?php echo $colorbacktab1; ?>) 8px);
-    background-image: -moz-linear-gradient(bottom, rgb(<?php echo $colorbacktab2; ?>) 0px, rgb(<?php echo $colorbacktab1; ?>) 8px);
-/*    background-image: -webkit-linear-gradient(bottom, rgb(<?php echo $colorbacktab1; ?>) 90%, rgb(<?php echo $colorbacktab2; ?>) 100%); */
-    background-image: -webkit-linear-gradient(right, rgb(<?php echo $colorbacktab2; ?>) 0px, rgb(<?php echo $colorbacktab1; ?>) 8px);
-    background-image: -ms-linear-gradient(bottom, rgb(<?php echo $colorbacktab2; ?>) 0px, rgb(<?php echo $colorbacktab1; ?>) 8px);
-    background-image: linear-gradient(bottom, rgb(<?php echo $colorbacktab2; ?>) 0px, rgb(<?php echo $colorbacktab1; ?>) 8px);
+
+    background-image: -o-linear-gradient(bottom, rgb(<?php echo $colorbacktab2; ?>) 0px, rgb(<?php echo $colorbacktab1; ?>) 3px);
+    background-image: -moz-linear-gradient(bottom, rgb(<?php echo $colorbacktab2; ?>) 0px, rgb(<?php echo $colorbacktab1; ?>) 3px);
+    background-image: -webkit-linear-gradient(right, rgb(<?php echo $colorbacktab2; ?>) 0px, rgb(<?php echo $colorbacktab1; ?>) 3px);
+    background-image: -ms-linear-gradient(bottom, rgb(<?php echo $colorbacktab2; ?>) 0px, rgb(<?php echo $colorbacktab1; ?>) 3px);
+    background-image: linear-gradient(bottom, rgb(<?php echo $colorbacktab2; ?>) 0px, rgb(<?php echo $colorbacktab1; ?>) 3px);
+
 <?php } else { ?>
 	background-image: url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/tmenu.jpg',1); ?>);
     background-position:top;
     background-repeat:repeat-x;
 <?php } ?>
     border-left: 1px solid #CCCCCC;
-    border-right: 1px solid #DDDDDD;
+    border-right: 1px solid #D0D0D0;
     border-bottom: 1px solid #DDDDDD;
     border-top: 1px solid #DDDDDD;
     border-radius: 5px;
@@ -1874,19 +1875,20 @@ div.ok {
 }
 
 div.warning {
-  color: #997711;
-  padding: 0.2em 0.2em 0.2em 0.2em;
+  color: #504020;
+  padding: 0.3em 0.3em 0.3em 0.3em;
   margin: 0.5em 0em 0.5em 0em;
-  border: 1px solid #e0e0d0;
+  border: 1px solid #e0d0b0;
   -moz-border-radius:6px;
   -webkit-border-radius: 6px;
   border-radius: 6px;
-  background: #efefd4;
+  background: #FFEF9A;
+  text-shadow: 0 1px 0 rgba(255, 255, 255, 0.5);
 }
 
 div.error {
   color: #550000; font-weight: bold;
-  padding: 0.2em 0.2em 0.2em 0.2em;
+  padding: 0.3em 0.3em 0.3em 0.3em;
   margin: 0.5em 0em 0.5em 0em;
   border: 1px solid #DC9CAB;
   -moz-border-radius:6px;
@@ -1897,14 +1899,15 @@ div.error {
 
 /* Info admin */
 div.info {
-  color: #807050;
+  color: #302010;
   padding: 0.4em 0.4em 0.4em 0.4em;
   margin: 0.5em 0em 0.5em 0em;
-  border: 1px solid #DFDFA0;
+  border: 1px solid #DFBF9A;
   -moz-border-radius:6px;
   -webkit-border-radius: 6px;
   border-radius:6px;
-  background: #EFEFBA;
+  background: #EFCFAA;
+  text-shadow: 0 1px 0 rgba(255, 255, 255, 0.5);
 }
 
 

From 26ac8f9f2828f1d3865e19593c959411b198278d Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 3 Jun 2013 22:17:03 +0200
Subject: [PATCH 12/43] Fix: Missing translation

---
 htdocs/adherents/stats/byproperties.php | 1 +
 htdocs/adherents/stats/geo.php          | 1 +
 htdocs/adherents/stats/index.php        | 1 +
 3 files changed, 3 insertions(+)

diff --git a/htdocs/adherents/stats/byproperties.php b/htdocs/adherents/stats/byproperties.php
index 675ad501a5e..7c1cc07ad69 100755
--- a/htdocs/adherents/stats/byproperties.php
+++ b/htdocs/adherents/stats/byproperties.php
@@ -45,6 +45,7 @@ $startyear=$year-2;
 $endyear=$year;
 
 $langs->load("members");
+$langs->load("companies");
 
 
 /*
diff --git a/htdocs/adherents/stats/geo.php b/htdocs/adherents/stats/geo.php
index 083d323520d..38a47555706 100755
--- a/htdocs/adherents/stats/geo.php
+++ b/htdocs/adherents/stats/geo.php
@@ -45,6 +45,7 @@ $startyear=$year-2;
 $endyear=$year;
 
 $langs->load("members");
+$langs->load("companies");
 
 
 /*
diff --git a/htdocs/adherents/stats/index.php b/htdocs/adherents/stats/index.php
index fff9167a790..7ca24d5bd4f 100644
--- a/htdocs/adherents/stats/index.php
+++ b/htdocs/adherents/stats/index.php
@@ -47,6 +47,7 @@ $startyear=$year-2;
 $endyear=$year;
 
 $langs->load("members");
+$langs->load("companies");
 
 
 /*

From 22bde298de5b009e0431fb96ceb5b78cd62cb3af Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 3 Jun 2013 23:06:15 +0200
Subject: [PATCH 13/43] Fix: First permission must start with 1

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

diff --git a/htdocs/core/modules/modOpenSurvey.class.php b/htdocs/core/modules/modOpenSurvey.class.php
index 6c49a1c2143..2d4b267a8e3 100755
--- a/htdocs/core/modules/modOpenSurvey.class.php
+++ b/htdocs/core/modules/modOpenSurvey.class.php
@@ -106,7 +106,7 @@ class modOpenSurvey extends DolibarrModules
 
 		// Add here list of permission defined by an id, a label, a boolean and two constant strings.
 		// Example:
-		$this->rights[$r][0] = 55000; 				// Permission id (must not be already used)
+		$this->rights[$r][0] = 55001; 				// Permission id (must not be already used)
 		$this->rights[$r][1] = 'Read surveys';	// Permission label
 		$this->rights[$r][2] = 'r'; 					// Permission by default for new user (0/1)
 		$this->rights[$r][3] = 0; 					// Permission by default for new user (0/1)
@@ -116,7 +116,7 @@ class modOpenSurvey extends DolibarrModules
 
 		// Add here list of permission defined by an id, a label, a boolean and two constant strings.
 		// Example:
-		$this->rights[$r][0] = 55001; 				// Permission id (must not be already used)
+		$this->rights[$r][0] = 55002; 				// Permission id (must not be already used)
 		$this->rights[$r][1] = 'Create/modify surveys';	// Permission label
 		$this->rights[$r][2] = 'w'; 					// Permission by default for new user (0/1)
 		$this->rights[$r][3] = 0; 					// Permission by default for new user (0/1)

From b1a280de325a1b68b5c1d97909932d53c88e56b8 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 3 Jun 2013 23:11:36 +0200
Subject: [PATCH 14/43] Fix: error message

---
 htdocs/public/members/new.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/public/members/new.php b/htdocs/public/members/new.php
index 358201aa4a7..d2de44e3beb 100644
--- a/htdocs/public/members/new.php
+++ b/htdocs/public/members/new.php
@@ -71,7 +71,7 @@ if (empty($conf->adherent->enabled)) accessforbidden('',1,1,1);
 
 if (empty($conf->global->MEMBER_ENABLE_PUBLIC))
 {
-    print $langs->trans("Auto subscription form for public visitors has no been enabled");
+    print $langs->trans("Auto subscription form for public visitors has not been enabled");
     exit;
 }
 

From 3cb6e196b6edef9e00c29a3f27a4cf4861b27ac6 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 4 Jun 2013 00:30:38 +0200
Subject: [PATCH 15/43] Fix: [ bug #919 ] SQL error in
 product/stock/product.php

---
 htdocs/product/stock/class/mouvementstock.class.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/htdocs/product/stock/class/mouvementstock.class.php b/htdocs/product/stock/class/mouvementstock.class.php
index 10d908111fd..3297b078fea 100644
--- a/htdocs/product/stock/class/mouvementstock.class.php
+++ b/htdocs/product/stock/class/mouvementstock.class.php
@@ -64,6 +64,9 @@ class MouvementStock
 		$error = 0;
 		dol_syslog(get_class($this)."::_create start userid=$user->id, fk_product=$fk_product, warehouse=$entrepot_id, qty=$qty, type=$type, price=$price label=$label");
 
+		// Clean parameters
+		if (empty($price)) $price=0;
+		
 		if (empty($fk_product)) return 0;
 
 		$now=(! empty($datem) ? $datem : dol_now());

From 39e467afbced4e4a9e83129f963b8004da2d3fe2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rapha=C3=ABl=20Doursenaud?= <rdoursenaud@gpcsolutions.fr>
Date: Tue, 4 Jun 2013 12:32:36 +0200
Subject: [PATCH 16/43] Force git to use LF line endings for PHP files

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

diff --git a/.gitattributes b/.gitattributes
index e3eee740938..73e27e445d3 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -3,7 +3,7 @@
 
 # Explicitly declare text files we want to always be normalized and converted 
 # to native line endings on checkout.
-*.php text
+*.php text eol=lf
 *.sql text
 *.htm text
 *.html text

From d30ece9f3603b1e12be7a7659f4f4c42231b4f23 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 4 Jun 2013 19:33:32 +0200
Subject: [PATCH 17/43] For eol also into extension definition. Let's see if
 this works.

---
 .gitattributes | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/.gitattributes b/.gitattributes
index 73e27e445d3..4d86664e43f 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1,17 +1,18 @@
 # Set default behaviour, in case users don't have core.autocrlf set.
 * text=auto
 
+
 # Explicitly declare text files we want to always be normalized and converted 
 # to native line endings on checkout.
 *.php text eol=lf
-*.sql text
-*.htm text
-*.html text
-*.js text
-*.css text
-*.lang text
-*.txt text
-*.md text
+*.sql text eol=lf
+*.htm text eol=lf
+*.html text eol=lf
+*.js text eol=lf
+*.css text eol=lf
+*.lang text eol=lf
+*.txt text eol=lf
+*.md text eol=lf
 
 # Denote all files that are truly binary and should not be modified.
 *.ico binary

From d3cf8479e3ddba5815e7e6195babf5d724e79712 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 4 Jun 2013 19:36:41 +0200
Subject: [PATCH 18/43] Try to commit a file with a line with CRLF and see...

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

diff --git a/htdocs/document.php b/htdocs/document.php
index 86920e91e35..da87b339ac3 100644
--- a/htdocs/document.php
+++ b/htdocs/document.php
@@ -1,6 +1,6 @@
 <?php
 /* Copyright (C) 2004-2007 Rodolphe Quiedeville <rodolphe@quiedeville.org>
- * Copyright (C) 2004-2012 Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) 2004-2013 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2005      Simon Tosser         <simon@kornog-computing.com>
  * Copyright (C) 2005-2012 Regis Houssin        <regis.houssin@capnetworks.com>
  * Copyright (C) 2010	   Pierre Morin         <pierre.morin@auguria.net>

From 7b0897a6698b5d2af9856f4b885a500cf8bf91d0 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 4 Jun 2013 22:03:11 +0200
Subject: [PATCH 19/43] fix: LF

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

diff --git a/htdocs/document.php b/htdocs/document.php
index da87b339ac3..88e90ca46bf 100644
--- a/htdocs/document.php
+++ b/htdocs/document.php
@@ -100,7 +100,7 @@ if (empty($modulepart)) accessforbidden('Bad value for parameter modulepart');
 $check_access = dol_check_secure_access_document($modulepart,$original_file,$entity,$refname);
 $accessallowed              = $check_access['accessallowed'];
 $sqlprotectagainstexternals = $check_access['sqlprotectagainstexternals'];
-$original_file              = $check_access['original_file'];
+$original_file              = $check_access['original_file'];
 
 // Basic protection (against external users only)
 if ($user->societe_id > 0)

From 67758c963bb6f316c8b1709510180e644155c54b Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 4 Jun 2013 22:52:58 +0200
Subject: [PATCH 20/43] Fix: PHPUnit tests

---
 test/phpunit/AdherentTest.php            | 34 ++++++++++++++++++++++--
 test/phpunit/CommandeFournisseurTest.php |  6 ++---
 test/phpunit/FunctionsTest.php           |  2 +-
 test/phpunit/PdfDocTest.php              |  7 ++++-
 4 files changed, 42 insertions(+), 7 deletions(-)

diff --git a/test/phpunit/AdherentTest.php b/test/phpunit/AdherentTest.php
index f7a932250b2..d61b3fc6cf2 100644
--- a/test/phpunit/AdherentTest.php
+++ b/test/phpunit/AdherentTest.php
@@ -29,6 +29,7 @@ global $conf,$user,$langs,$db;
 require_once 'PHPUnit/Autoload.php';
 require_once dirname(__FILE__).'/../../htdocs/master.inc.php';
 require_once dirname(__FILE__).'/../../htdocs/adherents/class/adherent.class.php';
+require_once dirname(__FILE__).'/../../htdocs/adherents/class/adherent_type.class.php';
 
 if (empty($user->id))
 {
@@ -115,11 +116,39 @@ class AdherentTest extends PHPUnit_Framework_TestCase
     }
 
     /**
-     * testAdherentCreate
+     * testAdherentTypeCreate
      *
      * @return void
      */
-    public function testAdherentCreate()
+    public function testAdherentTypeCreate()
+    {
+    	global $conf,$user,$langs,$db;
+		$conf=$this->savconf;
+		$user=$this->savuser;
+		$langs=$this->savlangs;
+		$db=$this->savdb;
+
+		$localobject=new AdherentType($this->savdb);
+    	$localobject->statut=1;
+    	$localobject->libelle='Adherent type test';
+    	$localobject->cotisation=1;
+    	$localobject->vote=1;
+     	$result=$localobject->create($user);
+        print __METHOD__." result=".$result."\n";
+    	$this->assertLessThan($result, 0);
+
+    	return $localobject->id;
+    }
+    
+    /**
+     * testAdherentCreate
+     *
+     * @return void
+     * 
+     * @depends	testAdherentTypeCreate
+     * The depends says test is run only if previous is ok
+     */
+    public function testAdherentCreate($fk_adherent_type)
     {
     	global $conf,$user,$langs,$db;
 		$conf=$this->savconf;
@@ -129,6 +158,7 @@ class AdherentTest extends PHPUnit_Framework_TestCase
 
 		$localobject=new Adherent($this->savdb);
     	$localobject->initAsSpecimen();
+    	$localobject->typeid=$fk_adherent_type;
      	$result=$localobject->create($user);
         print __METHOD__." result=".$result."\n";
     	$this->assertLessThan($result, 0);
diff --git a/test/phpunit/CommandeFournisseurTest.php b/test/phpunit/CommandeFournisseurTest.php
index 10435972924..ffc1776d559 100644
--- a/test/phpunit/CommandeFournisseurTest.php
+++ b/test/phpunit/CommandeFournisseurTest.php
@@ -131,12 +131,12 @@ class CommandeFournisseurTest extends PHPUnit_Framework_TestCase
 
 		// Set supplier and product to use
 		$socid=1;
-		$prodid=1;
 		$societe=new Societe($db);
 		$societe->fetch($socid);
 		$product=new ProductFournisseur($db);
-		$product->fetch($prodid);
-
+		$product->fetch(0,'PIDRESS');
+		if ($product->id <= 0) { print "\n".__METHOD__." A product with ref PIDRESS must exists into database"; die(); }
+		
 		$quantity=10;
 		$ref_fourn='SUPPLIER_REF_PHPUNIT';
 		$tva_tx=19.6;
diff --git a/test/phpunit/FunctionsTest.php b/test/phpunit/FunctionsTest.php
index 34276ce5892..1fa41f0c460 100755
--- a/test/phpunit/FunctionsTest.php
+++ b/test/phpunit/FunctionsTest.php
@@ -613,7 +613,7 @@ class FunctionsTest extends PHPUnit_Framework_TestCase
     	$vat1=get_default_localtax($companyes,$companyes,1,0);
     	$vat2=get_default_localtax($companyes,$companyes,2,0);
     	$this->assertEquals(5.2,$vat1);
-    	$this->assertEquals(-15,$vat2);
+    	$this->assertEquals(-21,$vat2);
 
     	// Test RULE ES-IT
     	$vat1=get_default_localtax($companyes,$companyit,1,0);
diff --git a/test/phpunit/PdfDocTest.php b/test/phpunit/PdfDocTest.php
index c119f1a4ec6..6823b60e314 100755
--- a/test/phpunit/PdfDocTest.php
+++ b/test/phpunit/PdfDocTest.php
@@ -129,11 +129,16 @@ class PdfDocTest extends PHPUnit_Framework_TestCase
 		$langs=$this->savlangs;
 		$db=$this->savdb;
 
+		$localproduct=new Product($this->savdb);	
+		$localproduct->fetch(0,'PIDRESS');
+		$product_id=$localproduct->id;
+		if ($product_id <= 0) { print "\n".__METHOD__." A product with ref PIDRESS must exists into database"; die(); }
+		
 		$localobject=new Facture($this->savdb);
 		$localobject->initAsSpecimen();
 		$localobject->lines=array();
 		$localobject->lines[0]=new FactureLigne($this->savdb);
-		$localobject->lines[0]->fk_product=1;
+		$localobject->lines[0]->fk_product=$product_id;
 		$localobject->lines[0]->label='Label 1';
 		$localobject->lines[0]->desc="This is a description with a é accent\n(Country of origin: France)";
 

From a34ab5a13fcd2d54724758c578071451e58b1dbe Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 4 Jun 2013 23:19:04 +0200
Subject: [PATCH 21/43] Look: Email at a better place

---
 htdocs/adherents/card_subscriptions.php |  5 ++++-
 htdocs/adherents/fiche.php              | 20 ++++++++++----------
 2 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/htdocs/adherents/card_subscriptions.php b/htdocs/adherents/card_subscriptions.php
index cf5ed660a32..ba2a80cfa7d 100644
--- a/htdocs/adherents/card_subscriptions.php
+++ b/htdocs/adherents/card_subscriptions.php
@@ -528,7 +528,7 @@ if ($rowid)
     print '<tr><td>'.$langs->trans("UserTitle").'</td><td class="valeur">'.$object->getCivilityLabel().'&nbsp;</td>';
     print '</tr>';
 
-    // Name
+    // Lastname
     print '<tr><td>'.$langs->trans("Lastname").'</td><td class="valeur">'.$object->lastname.'&nbsp;</td>';
     print '</tr>';
 
@@ -536,6 +536,9 @@ if ($rowid)
     print '<tr><td>'.$langs->trans("Firstname").'</td><td class="valeur">'.$object->firstname.'&nbsp;</td>';
     print '</tr>';
 
+    // EMail
+    print '<tr><td>'.$langs->trans("EMail").'</td><td class="valeur">'.dol_print_email($object->email,0,$object->fk_soc,1).'</td></tr>';
+    
     // Status
     print '<tr><td>'.$langs->trans("Status").'</td><td class="valeur">'.$object->getLibStatut(4).'</td></tr>';
 
diff --git a/htdocs/adherents/fiche.php b/htdocs/adherents/fiche.php
index 8c714ab7c67..c4c62d8285f 100644
--- a/htdocs/adherents/fiche.php
+++ b/htdocs/adherents/fiche.php
@@ -829,6 +829,9 @@ else
 		print '<tr><td id="tdfirstname">'.$langs->trans("Firstname").'</td><td><input type="text" name="firstname" size="40" value="'.(GETPOST('firstname','alpha')?GETPOST('firstname','alpha'):$object->firstname).'"></td>';
 		print '</tr>';
 
+		// EMail
+		print '<tr><td>'.($conf->global->ADHERENT_MAIL_REQUIRED?'<span class="fieldrequired">':'').$langs->trans("EMail").($conf->global->ADHERENT_MAIL_REQUIRED?'</span>':'').'</td><td><input type="text" name="member_email" size="40" value="'.(GETPOST('member_email','alpha')?GETPOST('member_email','alpha'):$object->email).'"></td></tr>';
+
 		// Password
 		if (empty($conf->global->ADHERENT_LOGIN_NOT_REQUIRED))
 		{
@@ -882,9 +885,6 @@ else
 		// Tel mobile
 		print '<tr><td>'.$langs->trans("PhoneMobile").'</td><td><input type="text" name="phone_mobile" size="20" value="'.(GETPOST('phone_mobile','alpha')?GETPOST('phone_mobile','alpha'):$object->phone_mobile).'"></td></tr>';
 
-		// EMail
-		print '<tr><td>'.($conf->global->ADHERENT_MAIL_REQUIRED?'<span class="fieldrequired">':'').$langs->trans("EMail").($conf->global->ADHERENT_MAIL_REQUIRED?'</span>':'').'</td><td><input type="text" name="member_email" size="40" value="'.(GETPOST('member_email','alpha')?GETPOST('member_email','alpha'):$object->email).'"></td></tr>';
-
 		// Birthday
 		print "<tr><td>".$langs->trans("Birthday")."</td><td>\n";
 		$form->select_date(($object->naiss ? $object->naiss : -1),'naiss','','',1,'formsoc');
@@ -1076,6 +1076,9 @@ else
 		print '<tr><td id="tdfirstname">'.$langs->trans("Firstname").'</td><td><input type="text" name="firstname" size="40" value="'.(isset($_POST["firstname"])?$_POST["firstname"]:$object->firstname).'"></td>';
 		print '</tr>';
 
+		// EMail
+		print '<tr><td>'.($conf->global->ADHERENT_MAIL_REQUIRED?'<span class="fieldrequired">':'').$langs->trans("EMail").($conf->global->ADHERENT_MAIL_REQUIRED?'</span>':'').'</td><td><input type="text" name="email" size="40" value="'.(isset($_POST["email"])?$_POST["email"]:$object->email).'"></td></tr>';
+
 		// Password
 		if (empty($conf->global->ADHERENT_LOGIN_NOT_REQUIRED))
 		{
@@ -1118,9 +1121,6 @@ else
 		// Tel mobile
 		print '<tr><td>'.$langs->trans("PhoneMobile").'</td><td><input type="text" name="phone_mobile" size="20" value="'.(isset($_POST["phone_mobile"])?$_POST["phone_mobile"]:$object->phone_mobile).'"></td></tr>';
 
-		// EMail
-		print '<tr><td>'.($conf->global->ADHERENT_MAIL_REQUIRED?'<span class="fieldrequired">':'').$langs->trans("EMail").($conf->global->ADHERENT_MAIL_REQUIRED?'</span>':'').'</td><td><input type="text" name="email" size="40" value="'.(isset($_POST["email"])?$_POST["email"]:$object->email).'"></td></tr>';
-
 		// Birthday
 		print "<tr><td>".$langs->trans("Birthday")."</td><td>\n";
 		$form->select_date(($object->birth ? $object->birth : -1),'birth','','',1,'formsoc');
@@ -1402,13 +1402,16 @@ else
 		print '<tr><td>'.$langs->trans("UserTitle").'</td><td class="valeur">'.$object->getCivilityLabel().'&nbsp;</td>';
 		print '</tr>';
 
-		// Name
+		// Lastname
 		print '<tr><td>'.$langs->trans("Lastname").'</td><td class="valeur">'.$object->lastname.'&nbsp;</td>';
 		print '</tr>';
 
 		// Firstname
 		print '<tr><td>'.$langs->trans("Firstname").'</td><td class="valeur">'.$object->firstname.'&nbsp;</td></tr>';
 
+		// EMail
+		print '<tr><td>'.$langs->trans("EMail").'</td><td class="valeur">'.dol_print_email($object->email,0,$object->fk_soc,1).'</td></tr>';
+		
 		// Password
 		if (empty($conf->global->ADHERENT_LOGIN_NOT_REQUIRED))
 		{
@@ -1442,9 +1445,6 @@ else
 		// Tel mobile
 		print '<tr><td>'.$langs->trans("PhoneMobile").'</td><td class="valeur">'.dol_print_phone($object->phone_mobile,$object->country_code,0,$object->fk_soc,1).'</td></tr>';
 
-		// EMail
-		print '<tr><td>'.$langs->trans("EMail").'</td><td class="valeur">'.dol_print_email($object->email,0,$object->fk_soc,1).'</td></tr>';
-
 		// Birthday
 		print '<tr><td>'.$langs->trans("Birthday").'</td><td class="valeur">'.dol_print_date($object->birth,'day').'</td></tr>';
 

From f83ab0de703fd7063d76dd9bdb52fa5e255eed69 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 5 Jun 2013 10:49:12 +0200
Subject: [PATCH 22/43] Fix: ModelDoc Activation bug

---
 htdocs/admin/commande.php | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/htdocs/admin/commande.php b/htdocs/admin/commande.php
index 898d20648ec..1aa6a1be028 100644
--- a/htdocs/admin/commande.php
+++ b/htdocs/admin/commande.php
@@ -1,6 +1,6 @@
 <?php
 /* Copyright (C) 2003-2006 Rodolphe Quiedeville	        <rodolphe@quiedeville.org>
- * Copyright (C) 2004-2011 Laurent Destailleur          <eldy@users.sourceforge.net>
+ * Copyright (C) 2004-2013 Laurent Destailleur          <eldy@users.sourceforge.net>
  * Copyright (C) 2004      Sebastien Di Cintio          <sdicintio@ressource-toi.org>
  * Copyright (C) 2004      Benoit Mortier               <benoit.mortier@opensides.be>
  * Copyright (C) 2004      Andre Cianfarani             <acianfa@free.fr>
@@ -45,6 +45,9 @@ if (! $user->admin) accessforbidden();
 $action = GETPOST('action','alpha');
 $value = GETPOST('value','alpha');
 
+$type = 'order';
+
+
 /*
  * Actions
  */
@@ -267,7 +270,7 @@ foreach ($dirmodels as $reldir)
 						// Show modules according to features level
 						if ($module->version == 'development'  && $conf->global->MAIN_FEATURES_LEVEL < 2) continue;
 						if ($module->version == 'experimental' && $conf->global->MAIN_FEATURES_LEVEL < 1) continue;
-					
+
 						$var=!$var;
 						print '<tr '.$bc[$var].'><td>'.$module->nom."</td><td>\n";
 						print $module->info();

From 7aa145ae6a5900774f8fcfbc1f1d80be296b734e Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 5 Jun 2013 11:09:54 +0200
Subject: [PATCH 23/43] Fix: Previous fix was not complete

---
 htdocs/admin/commande.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/htdocs/admin/commande.php b/htdocs/admin/commande.php
index 1aa6a1be028..fc5c4ec68b2 100644
--- a/htdocs/admin/commande.php
+++ b/htdocs/admin/commande.php
@@ -44,7 +44,8 @@ if (! $user->admin) accessforbidden();
 
 $action = GETPOST('action','alpha');
 $value = GETPOST('value','alpha');
-
+$label = GETPOST('label','alpha');
+$scandir = GETPOST('scandir','alpha');
 $type = 'order';
 
 

From 3e1d2c3e636ebd1453190e6473ec007d9b64131e Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 5 Jun 2013 11:21:45 +0200
Subject: [PATCH 24/43] Qual: Mutualized and uniformize code

---
 htdocs/admin/commande.php | 19 ++++-----
 htdocs/admin/facture.php  | 89 ++++++++++++---------------------------
 htdocs/admin/propal.php   | 11 +++--
 3 files changed, 41 insertions(+), 78 deletions(-)

diff --git a/htdocs/admin/commande.php b/htdocs/admin/commande.php
index 4908e7a0eea..391b399ceaa 100644
--- a/htdocs/admin/commande.php
+++ b/htdocs/admin/commande.php
@@ -118,7 +118,7 @@ else if ($action == 'specimen')
 }
 
 // Activate a model
-else if ($action == 'set')
+if ($action == 'set')
 {
 	$ret = addDocumentModel($value, $type, $label, $scandir);
 }
@@ -264,14 +264,14 @@ foreach ($dirmodels as $reldir)
 
 					require_once $dir.$file.'.php';
 
-					$module = new $file;
+					$module = new $file($db);
+
+					// Show modules according to features level
+					if ($module->version == 'development'  && $conf->global->MAIN_FEATURES_LEVEL < 2) continue;
+					if ($module->version == 'experimental' && $conf->global->MAIN_FEATURES_LEVEL < 1) continue;
 
 					if ($module->isEnabled())
 					{
-						// Show modules according to features level
-						if ($module->version == 'development'  && $conf->global->MAIN_FEATURES_LEVEL < 2) continue;
-						if ($module->version == 'experimental' && $conf->global->MAIN_FEATURES_LEVEL < 1) continue;
-
 						$var=!$var;
 						print '<tr '.$bc[$var].'><td>'.$module->nom."</td><td>\n";
 						print $module->info();
@@ -323,7 +323,7 @@ foreach ($dirmodels as $reldir)
 						print $form->textwithpicto('',$htmltooltip,1,0);
 						print '</td>';
 
-						print '</tr>';
+						print "</tr>\n";
 					}
 				}
 			}
@@ -331,17 +331,16 @@ foreach ($dirmodels as $reldir)
 		}
 	}
 }
-
-print '</table><br>';
+print "</table><br>\n";
 
 
 /*
  * Document templates generators
  */
+
 print_titre($langs->trans("OrdersModelModule"));
 
 // Load array def with activated templates
-$type='order';
 $def = array();
 $sql = "SELECT nom";
 $sql.= " FROM ".MAIN_DB_PREFIX."document_model";
diff --git a/htdocs/admin/facture.php b/htdocs/admin/facture.php
index ffef57c9d66..4f7f0729472 100644
--- a/htdocs/admin/facture.php
+++ b/htdocs/admin/facture.php
@@ -40,6 +40,9 @@ if (! $user->admin) accessforbidden();
 
 $action = GETPOST('action','alpha');
 $value = GETPOST('value','alpha');
+$label = GETPOST('label','alpha');
+$scandir = GETPOST('scandir','alpha');
+$type='invoice';
 
 
 /*
@@ -137,78 +140,40 @@ if ($action == 'setModuleOptions')
     }
 }
 
-if ($action == 'set')
+// Activate a model
+else if ($action == 'set')
 {
-	$label = GETPOST('label','alpha');
-	$scandir = GETPOST('scandir','alpha');
-
-    $type='invoice';
-    $sql = "INSERT INTO ".MAIN_DB_PREFIX."document_model (nom, type, entity, libelle, description)";
-    $sql.= " VALUES ('".$db->escape($value)."','".$type."',".$conf->entity.", ";
-    $sql.= ($label?"'".$db->escape($label)."'":'null').", ";
-    $sql.= (! empty($scandir)?"'".$db->escape($scandir)."'":"null");
-    $sql.= ")";
-    if ($db->query($sql))
-    {
-
-    }
+	$ret = addDocumentModel($value, $type, $label, $scandir);
 }
 
-if ($action == 'del')
+else if ($action == 'del')
 {
-    $type='invoice';
-    $sql = "DELETE FROM ".MAIN_DB_PREFIX."document_model";
-    $sql.= " WHERE nom = '".$db->escape($value)."'";
-    $sql.= " AND type = '".$type."'";
-    $sql.= " AND entity = ".$conf->entity;
-
-    if ($db->query($sql))
-    {
+	$ret = delDocumentModel($value, $type);
+	if ($ret > 0)
+	{
         if ($conf->global->FACTURE_ADDON_PDF == "$value") dolibarr_del_const($db, 'FACTURE_ADDON_PDF',$conf->entity);
-    }
+	}
 }
 
-if ($action == 'setdoc')
+// Set default model
+else if ($action == 'setdoc')
 {
-	$label = GETPOST('label','alpha');
-	$scandir = GETPOST('scandir','alpha');
-
-    $db->begin();
-
-    if (dolibarr_set_const($db, "FACTURE_ADDON_PDF",$value,'chaine',0,'',$conf->entity))
-    {
-        $conf->global->FACTURE_ADDON_PDF = $value;
-    }
-
-    // On active le modele
-    $type='invoice';
-
-    $sql_del = "DELETE FROM ".MAIN_DB_PREFIX."document_model";
-    $sql_del.= " WHERE nom = '".$db->escape($value)."'";
-    $sql_del.= " AND type = '".$type."'";
-    $sql_del.= " AND entity = ".$conf->entity;
-    dol_syslog("Delete from model table ".$sql_del);
-    $result1=$db->query($sql_del);
-
-    $sql = "INSERT INTO ".MAIN_DB_PREFIX."document_model (nom, type, entity, libelle, description)";
-    $sql.= " VALUES ('".$value."', '".$type."', ".$conf->entity.", ";
-    $sql.= ($label?"'".$db->escape($label)."'":'null').", ";
-    $sql.= (! empty($scandir)?"'".$scandir."'":"null");
-    $sql.= ")";
-    dol_syslog("Insert into model table ".$sql);
-    $result2=$db->query($sql);
-    if ($result1 && $result2)
-    {
-        $db->commit();
-    }
-    else
-    {
-        dol_syslog("Error ".$db->lasterror(), LOG_ERR);
-        $db->rollback();
-    }
+	if (dolibarr_set_const($db, "FACTURE_ADDON_PDF",$value,'chaine',0,'',$conf->entity))
+	{
+		// La constante qui a ete lue en avant du nouveau set
+		// on passe donc par une variable pour avoir un affichage coherent
+		$conf->global->FACTURE_ADDON_PDF = $value;
+	}
+	
+	// On active le modele
+	$ret = delDocumentModel($value, $type);
+	if ($ret > 0)
+	{
+		$ret = addDocumentModel($value, $type, $label, $scandir);
+	}
 }
 
-if ($action == 'setmod')
+else if ($action == 'setmod')
 {
     // TODO Verifier si module numerotation choisi peut etre active
     // par appel methode canBeActivated
diff --git a/htdocs/admin/propal.php b/htdocs/admin/propal.php
index 150a86fc752..954ec82a9c2 100644
--- a/htdocs/admin/propal.php
+++ b/htdocs/admin/propal.php
@@ -193,8 +193,7 @@ if ($action == 'setModuleOptions')
 }
 
 
-
-
+// Activate a model
 if ($action == 'set')
 {
 	$ret = addDocumentModel($value, $type, $label, $scandir);
@@ -359,16 +358,16 @@ print "</table><br>\n";
 
 
 /*
- * Modeles de documents
+ * Document templates generators
  */
 
 print_titre($langs->trans("ProposalsPDFModules"));
 
-// Defini tableau def de modele propal
+// Load array def with activated templates
 $def = array();
 $sql = "SELECT nom";
 $sql.= " FROM ".MAIN_DB_PREFIX."document_model";
-$sql.= " WHERE type = 'propal'";
+$sql.= " WHERE type = '".$type."'";
 $sql.= " AND entity = ".$conf->entity;
 $resql=$db->query($sql);
 if ($resql)
@@ -390,7 +389,7 @@ else
 
 print "<table class=\"noborder\" width=\"100%\">\n";
 print "<tr class=\"liste_titre\">\n";
-print "  <td width=\"140\">".$langs->trans("Name")."</td>\n";
+print "  <td>".$langs->trans("Name")."</td>\n";
 print "  <td>".$langs->trans("Description")."</td>\n";
 print '<td align="center" width="40">'.$langs->trans("Status")."</td>\n";
 print '<td align="center" width="40">'.$langs->trans("Default")."</td>\n";

From e4d51c82c07f5dc45780338c47e6f892ca738a38 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 5 Jun 2013 13:54:38 +0200
Subject: [PATCH 25/43] Fix: bad format of email content

---
 scripts/contracts/email_expire_services_to_customers.php       | 2 +-
 scripts/contracts/email_expire_services_to_representatives.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/scripts/contracts/email_expire_services_to_customers.php b/scripts/contracts/email_expire_services_to_customers.php
index ee7512405a3..946d7fac724 100755
--- a/scripts/contracts/email_expire_services_to_customers.php
+++ b/scripts/contracts/email_expire_services_to_customers.php
@@ -197,7 +197,7 @@ function envoi_mail($mode,$oldemail,$message,$total,$userlang,$oldcustomer,$dura
     $sendto = $oldemail;
     $from = $conf->global->MAIN_MAIL_EMAIL_FROM;
     $errorsto = $conf->global->MAIN_MAIL_ERRORS_TO;
-	$msgishtml = 0;
+	$msgishtml = -1;
 
     print "- Send email for ".$oldcustomer."(".$oldemail."), total: ".$total."\n";
     dol_syslog("email_expire_services_to_customers.php: send mail to ".$oldemail);
diff --git a/scripts/contracts/email_expire_services_to_representatives.php b/scripts/contracts/email_expire_services_to_representatives.php
index 8b995f31773..8363bbf2277 100755
--- a/scripts/contracts/email_expire_services_to_representatives.php
+++ b/scripts/contracts/email_expire_services_to_representatives.php
@@ -197,7 +197,7 @@ function envoi_mail($mode,$oldemail,$message,$total,$userlang,$oldsalerepresenta
     $sendto = $oldemail;
     $from = $conf->global->MAIN_MAIL_EMAIL_FROM;
     $errorsto = $conf->global->MAIN_MAIL_ERRORS_TO;
-	$msgishtml = 0;
+	$msgishtml = -1;
 
     print "- Send email for ".$oldsalerepresentative." (".$oldemail."), total: ".$total."\n";
     dol_syslog("email_expire_services_to_representatives.php: send mail to ".$oldemail);

From e4a3929a5c2aec0730e957235db2ce1077ae979a Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 5 Jun 2013 14:23:49 +0200
Subject: [PATCH 26/43] Fix: Minor fixes into style.

---
 .../theme/bureau2crea/img/object_project.png  | Bin 1495 -> 690 bytes
 htdocs/theme/bureau2crea/style.css.php        |  27 +++---------------
 2 files changed, 4 insertions(+), 23 deletions(-)

diff --git a/htdocs/theme/bureau2crea/img/object_project.png b/htdocs/theme/bureau2crea/img/object_project.png
index ae1d7deadb7544e7053269f68314591a55449ca3..47029fed03d23a091a24abf56d2e3db16ef3300e 100644
GIT binary patch
delta 666
zcmV;L0%iTz3$g`}B!2;OQb$4nuFf3k00006VoOIv0RI600RN!9r;`8x010qNS#tmY
z3ljhU3ljkVnw%H_000McNliru-3A2=774brRMY?f0y0TNK~y-)rISraRACf`pF1;m
z#+e))N2kyXLyKULeh8D=C_zMvsHql3tqK=G`@o=;(Yjqhi+>i@CW6`<iVK4Xq0o>d
zNgEx;2EBUkeD`m@`?VPH2hA3q?R$85&&zu>r4)Oa$Zq1-iJ}@BnIaa`dC+%G+i6Gp
zmxE_7MpZgh%aQgBiFlN;&%d~Tw|g5zyEHJV8dEW(R7lSQ;AGmRt0PHUYnuH{wKz_N
z?>`p#I64i$z<;9)>!1*OoJdD&g5EP3tYw>sumQ-nWN2$nB2|cYV<l`?Vyya1n~Cj!
zWz(lnu#hWdTGBNDl<W|t8NuXinR2)WJyB0N2#7aV0qs{u)Xe){4Iok%3v;w7icE!x
z#&rOM5353<HzWy%>c}s{+?+*z!UUi}&Tcq3*r;<nn}1?qrGn{JBN0Z3-)2C*=<{=S
zmExR%kuTx9)sPRwH=Q7r!ju|CJIs7B0AR@oC@fZ3D0md+1=f<l^C}3ps<Q<k;oFyS
zQio5GT&q=}ODg*$LA^vZN-R~O998&1bwOF108teE_imHBag$dspEEu+Pgw+5mc%?1
zV6=m<Vt+Wc!f|~7-VSBh(t{Pl;BxLd$z(k}U0HG$yE%QVj=nqR|KEc!ifg$XPai)d
z5{ALS*K~HCARgBl9va57Y=j*_2pwBU08+IZjn;1UkEknWGh3(?sc;<++i?+P8^?9A
z9S?7<>I+_mH&1%B^>6&}>CY}ELu;|ecU1oZsuTYG&;Z621ONa407*qoM6N<$f}?dH
AC;$Ke

literal 1495
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`k|nMYCBgY=CFO}lsSJ)O`AMk?
zp1FzXsX?iUDV2pMQ*9U+n3Xa^B1$5BeXNr6bM+EIYV;~{3xK*A7;Nk-3KEmEQ%e+*
zQqwc@Y?a>c-mj#PnPRIHZt82`Ti~3Uk?B!Ylp0*+7m{3+ootz+WN)WnQ(*-(AUCxn
zQK2F?C$HG5!d3}vt`(3C64qBz04piUwpD^SD#ABF!8yMuRl!uxKsVXI%s|1+P|wiV
z#N6CmN5ROz&_Lh7NZ-&%*U;R`*vQJjKmiJrfVLH-q*(>IxIyg#@@$ndN=gc>^!3Zj
z%k|2Q_413-^$jg8EkR}&8R-I5=oVMzl_XZ^<`pZ$OmImpPA<wUD9OyvQvjKmn3P{y
zVygsnDZ~r81#n~YilM;-3^4tQ!~%UoJp+)JU<!SG@hi>Eg{v+u2}(t{7puX=A(aKG
z`a!A1`K3k4z=%sz23b{L<y@4SSdw29lAoUg3&ntp{F40QjQj!x=U`I>-^Aq1JP;qO
z-q+X4Gq1QLF)umQ)5TT^Xo6m5W{Q=Og{iZdg{7Ifv$>_Ap^KZ7ql=NVqlKlDk)^YR
zp|LqkuS<S%X>Mv>2~2MaSg#vUo0$nty`ZF!TL84#CABECEH%ZgC_h&L>}9J=+-|{b
z9#n4%R=0rtVT#i&`as9%gCZ6wqG3Y7)B|F|lP!<~Pxz^Mz|>v@OxBt!&c9_~VDk2K
zaSW-rwInz?Ti8*;cK6IBnV0hPa)mZ7Tk7bz;l?%gzx;NZKdS#o{<7Y)M^t}-zNRkQ
znh^P#6}^s~JKyAen>6=s<oTRHmX#c_KW^lwowK|@Ge51z#J6ywzs-)+KiPZNiCFbW
zYaKN6zN;w`V8(Oj=`97}AFWF!diP|r<QtZ8+!A66?><^{d6SOGEMAi+U72_C2TJ$e
zUe@V+iAnc^fnULSlMOpV^g^`5B(JV&^*ZWQyR@zBH&>SSY7PDC6Qo#cEUb=YJh9ah
z+vxMIv#?(J+u7H;t2bYCm?Ocl^qpsyi<gCC*WA0YXZB18P5+Rlw~yCvV}OBSDO1f$
ze>?75Ww)m5uHLz;<=#cjYf-99EG~Wyb#otH{;l`P@?EHe#xtLsb>R~<n491C-TM}N
zuqseSyJxxGG%u#FUYx~}!YpgnM|#XC@R)FDj-oQ_^~oD#<=-4OcHABm=z3d6{~2eP
zWMrX{U&)F$@<(}2&bfMASUzZ#Fjt9hUPKmqqD10Erdb7U$Ksz@{uaJ)Fy+<D=G)0X
zq7=BCJSREDJ&E`$v*};4&1Y4cT~7_|FKVgfdK~8sJTd#i-~W?!O4m)e$rpLE@VNxv
z@{Y$xmL0hLM#*quu)0h7;$v+~Eq32f^W^+3l$g`L<;~%_tQ^mcJSTryocPGl@v=|D
zIpx@mF;NZjCwdHIe*Q50=rL<^r04wOThBY`zxc*`^7yS6@3$XdjS79S?{%`pw+F13
z(mu*PkDvUZ>!R{GyYGgAA8L}?-(Ix1ll;%fTB`Bi|9x(c7oGpPoPn7kye(&|`<Bu=
PP*LmY>gTe~DWM4f#%M1W

diff --git a/htdocs/theme/bureau2crea/style.css.php b/htdocs/theme/bureau2crea/style.css.php
index 46abe55ecae..73873699280 100644
--- a/htdocs/theme/bureau2crea/style.css.php
+++ b/htdocs/theme/bureau2crea/style.css.php
@@ -1143,20 +1143,6 @@ div.tabs a.tab#active {
 
 }
 
-div.tabs a.tab span {
-	padding: 0px 10px 0px 10px;
-    background-image: url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/bg_ssmenu_btnG.jpg',1); ?>);
-    background-position: left;
-    background-repeat: no-repeat;
-    display: block;
-    height: 18px;
-    width: auto;
-}
-
-div.tabs a.tab#active span {
-    background-image: url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/bg_ssmenusel_btnG.jpg',1); ?>);
-}
-
 div.tabs a.tab:hover {
 	color: #FFFFFF;
     background-color: #505050;
@@ -1174,6 +1160,7 @@ div.tabBar {
     margin: 0px 0px 10px 0px;
     background: #dee7ec url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/tab_background.png',1); ?>) repeat-x;
 }
+*/
 
 div.tabsAction {
     margin: 20px 0em 1px 0em;
@@ -1181,7 +1168,7 @@ div.tabsAction {
     text-align: right;
 }
 
-
+/*
 a.tabTitle {
     background: #5088A9;
     color: white;
@@ -1299,8 +1286,7 @@ div.divButAction { margin-bottom: 1.4em; }
 	margin: 0px 10px 0px 10px;
 	text-decoration: none;
 	white-space: nowrap;
-    float: right;
-    font-size: 10px;
+    font-size: 12px;
     height: 18px;
     line-height: 18px;
     cursor: pointer;
@@ -1330,8 +1316,7 @@ div.divButAction { margin-bottom: 1.4em; }
 	margin: 0px 10px 0px 10px;
 	text-decoration: none;
 	white-space: nowrap;
-    float: right;
-    font-size: 10px;
+    font-size: 12px;
     height: 18px;
     line-height: 18px;
     margin-bottom: 10px;
@@ -2119,10 +2104,6 @@ A.none, A.none:active, A.none:visited, A.none:hover {
     font-size:1em;
 }
 
-div.tabsAction {
-	margin-top: 10px;
-}
-
 table.noborder {
 	margin-bottom: 10px;
     position: relative;

From 9a5000dd3d933782d8112a2ae94d58a87c8149bc Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 5 Jun 2013 14:29:05 +0200
Subject: [PATCH 27/43] Fix: email format

---
 scripts/invoices/email_unpaid_invoices_to_customers.php       | 2 +-
 scripts/invoices/email_unpaid_invoices_to_representatives.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/scripts/invoices/email_unpaid_invoices_to_customers.php b/scripts/invoices/email_unpaid_invoices_to_customers.php
index f616ac837ef..c92a51d85db 100755
--- a/scripts/invoices/email_unpaid_invoices_to_customers.php
+++ b/scripts/invoices/email_unpaid_invoices_to_customers.php
@@ -176,7 +176,7 @@ function envoi_mail($mode,$oldemail,$message,$total,$userlang,$oldcustomer)
     $sendto = $oldemail;
     $from = $conf->global->MAIN_MAIL_EMAIL_FROM;
     $errorsto = $conf->global->MAIN_MAIL_ERRORS_TO;
-	$msgishtml = 0;
+	$msgishtml = -1;
 
     print "- Send email for ".$oldcustomer."(".$oldemail."), total: ".$total."\n";
     dol_syslog("email_unpaid_invoices_to_customers.php: send mail to ".$oldemail);
diff --git a/scripts/invoices/email_unpaid_invoices_to_representatives.php b/scripts/invoices/email_unpaid_invoices_to_representatives.php
index 3f4eac8e819..6b050ec7f71 100755
--- a/scripts/invoices/email_unpaid_invoices_to_representatives.php
+++ b/scripts/invoices/email_unpaid_invoices_to_representatives.php
@@ -179,7 +179,7 @@ function envoi_mail($mode,$oldemail,$message,$total,$userlang,$oldsalerepresenta
     $sendto = $oldemail;
     $from = $conf->global->MAIN_MAIL_EMAIL_FROM;
     $errorsto = $conf->global->MAIN_MAIL_ERRORS_TO;
-	$msgishtml = 0;
+	$msgishtml = -1;
 
     print "- Send email for ".$oldsalerepresentative." (".$oldemail."), total: ".$total."\n";
     dol_syslog("email_unpaid_invoices_to_representatives.php: send mail to ".$oldemail);

From 7bae0644151337dbee88977aafb4645c62fce055 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 5 Jun 2013 14:33:07 +0200
Subject: [PATCH 28/43] Fix: Several fixes into scripts

---
 .../invoices/email_unpaid_invoices_to_customers.php  | 12 ++++++------
 .../email_unpaid_invoices_to_representatives.php     | 10 +++++-----
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/scripts/invoices/email_unpaid_invoices_to_customers.php b/scripts/invoices/email_unpaid_invoices_to_customers.php
index d518d41ab39..951079e57e7 100755
--- a/scripts/invoices/email_unpaid_invoices_to_customers.php
+++ b/scripts/invoices/email_unpaid_invoices_to_customers.php
@@ -216,19 +216,19 @@ function envoi_mail($mode,$oldemail,$message,$total,$userlang,$oldtarget)
     $sendto = $oldemail;
     $from = $conf->global->MAIN_MAIL_EMAIL_FROM;
     $errorsto = $conf->global->MAIN_MAIL_ERRORS_TO;
-	$msgishtml = 0;
+	$msgishtml = -1;
 
     print "- Send email for '".$oldtarget."' (".$oldemail."), total: ".$total."\n";
     dol_syslog("email_unpaid_invoices_to_customers.php: send mail to ".$oldemail);
 
     $usehtml=0;
-    if (dol_textishtml($conf->global->SCRIPT_EMAIL_UNPAID_INVOICES_FOOTER)) $usehtml+=1;
-    if (dol_textishtml($conf->global->SCRIPT_EMAIL_UNPAID_INVOICES_HEADER)) $usehtml+=1;
-
+    if (dol_textishtml($conf->global->SCRIPT_EMAIL_UNPAID_INVOICES_CUSTOMERS_FOOTER)) $usehtml+=1;
+    if (dol_textishtml($conf->global->SCRIPT_EMAIL_UNPAID_INVOICES_CUSTOMERS_HEADER)) $usehtml+=1;
+    
     $allmessage='';
-    if (! empty($conf->global->SCRIPT_EMAIL_UNPAID_INVOICES_HEADER))
+    if (! empty($conf->global->SCRIPT_EMAIL_UNPAID_INVOICES_CUSTOMERS_HEADER))
     {
-    	$allmessage.=$conf->global->SCRIPT_EMAIL_UNPAID_INVOICES_HEADER;
+    	$allmessage.=$conf->global->SCRIPT_EMAIL_UNPAID_INVOICES_CUSTOMERS_HEADER;
     }
     else
     {
diff --git a/scripts/invoices/email_unpaid_invoices_to_representatives.php b/scripts/invoices/email_unpaid_invoices_to_representatives.php
index 1ab5e15c2ec..a88f2996b3f 100755
--- a/scripts/invoices/email_unpaid_invoices_to_representatives.php
+++ b/scripts/invoices/email_unpaid_invoices_to_representatives.php
@@ -192,19 +192,19 @@ function envoi_mail($mode,$oldemail,$message,$total,$userlang,$oldsalerepresenta
     $sendto = $oldemail;
     $from = $conf->global->MAIN_MAIL_EMAIL_FROM;
     $errorsto = $conf->global->MAIN_MAIL_ERRORS_TO;
-	$msgishtml = 0;
+	$msgishtml = -1;
 
     print "- Send email for ".$oldsalerepresentative." (".$oldemail."), total: ".$total."\n";
     dol_syslog("email_unpaid_invoices_to_representatives.php: send mail to ".$oldemail);
 
     $usehtml=0;
-    if (dol_textishtml($conf->global->SCRIPT_EMAIL_UNPAID_INVOICES_FOOTER)) $usehtml+=1;
-    if (dol_textishtml($conf->global->SCRIPT_EMAIL_UNPAID_INVOICES_HEADER)) $usehtml+=1;
+    if (dol_textishtml($conf->global->SCRIPT_EMAIL_UNPAID_INVOICES_SALESREPRESENTATIVES_FOOTER)) $usehtml+=1;
+    if (dol_textishtml($conf->global->SCRIPT_EMAIL_UNPAID_INVOICES_SALESREPRESENTATIVES_HEADER)) $usehtml+=1;
 
     $allmessage='';
-    if (! empty($conf->global->SCRIPT_EMAIL_UNPAID_INVOICES_HEADER))
+    if (! empty($conf->global->SCRIPT_EMAIL_UNPAID_INVOICES_SALESREPRESENTATIVES_HEADER))
     {
-    	$allmessage.=$conf->global->SCRIPT_EMAIL_UNPAID_INVOICES_HEADER;
+    	$allmessage.=$conf->global->SCRIPT_EMAIL_UNPAID_INVOICES_SALESREPRESENTATIVES_HEADER;
     }
     else
     {

From 097fbaacd03d6682eaea61414b8bc171b232ae3a Mon Sep 17 00:00:00 2001
From: simnandez <jmenent@2byte.es>
Date: Wed, 5 Jun 2013 15:09:30 +0200
Subject: [PATCH 29/43] Fix: Warning missing argument 2 into withdrawals

---
 htdocs/compta/prelevement/rejets.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/compta/prelevement/rejets.php b/htdocs/compta/prelevement/rejets.php
index 27a2ab59f38..b33a5fd2455 100644
--- a/htdocs/compta/prelevement/rejets.php
+++ b/htdocs/compta/prelevement/rejets.php
@@ -1,7 +1,7 @@
 <?php
 /* Copyright (C) 2005      Rodolphe Quiedeville <rodolphe@quiedeville.org>
  * Copyright (C) 2005-2009 Regis Houssin        <regis.houssin@capnetworks.com>
- * Copyright (C) 2010-2012 Juanjo Menent 		<jmenent@2byte.es>
+ * Copyright (C) 2010-2013 Juanjo Menent 		<jmenent@2byte.es>
  * Copyright (C) 2005-2012 Laurent Destailleur  <eldy@users.sourceforge.net>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -59,7 +59,7 @@ if ($sortorder == "") $sortorder="DESC";
 if ($sortfield == "") $sortfield="p.datec";
 
 $rej = new RejetPrelevement($db, $user);
-$ligne = new LignePrelevement($db);
+$ligne = new LignePrelevement($db, $user);
 
 /*
  * Liste des factures

From 26b36f3a4e25f7527ee6bd604a2aa0d0cce65569 Mon Sep 17 00:00:00 2001
From: simnandez <jmenent@2byte.es>
Date: Wed, 5 Jun 2013 15:09:30 +0200
Subject: [PATCH 30/43] Fix: Warning missing argument 2 into withdrawals

---
 htdocs/compta/prelevement/rejets.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/compta/prelevement/rejets.php b/htdocs/compta/prelevement/rejets.php
index 27a2ab59f38..b33a5fd2455 100644
--- a/htdocs/compta/prelevement/rejets.php
+++ b/htdocs/compta/prelevement/rejets.php
@@ -1,7 +1,7 @@
 <?php
 /* Copyright (C) 2005      Rodolphe Quiedeville <rodolphe@quiedeville.org>
  * Copyright (C) 2005-2009 Regis Houssin        <regis.houssin@capnetworks.com>
- * Copyright (C) 2010-2012 Juanjo Menent 		<jmenent@2byte.es>
+ * Copyright (C) 2010-2013 Juanjo Menent 		<jmenent@2byte.es>
  * Copyright (C) 2005-2012 Laurent Destailleur  <eldy@users.sourceforge.net>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -59,7 +59,7 @@ if ($sortorder == "") $sortorder="DESC";
 if ($sortfield == "") $sortfield="p.datec";
 
 $rej = new RejetPrelevement($db, $user);
-$ligne = new LignePrelevement($db);
+$ligne = new LignePrelevement($db, $user);
 
 /*
  * Liste des factures

From eac4aa7e2835deaf8370ba509adb9a9d45e33e69 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 5 Jun 2013 15:44:42 +0200
Subject: [PATCH 31/43] New: Module mailman can subscribe/unsubscribe to ML
 according to categories of member.

---
 ChangeLog                                     |  16 +-
 htdocs/{adherents => }/admin/mailman.php      |  17 +-
 htdocs/{adherents => }/admin/spip.php         |   4 +-
 htdocs/categories/class/categorie.class.php   |  57 ++++---
 htdocs/core/lib/admin.lib.php                 |  16 +-
 htdocs/core/lib/mailmanspip.lib.php           |   4 +-
 htdocs/core/modules/modMailmanSpip.class.php  |   4 +-
 .../mailmanspip/class/mailmanspip.class.php   | 151 +++++++++---------
 htdocs/product/class/product.class.php        |  16 +-
 test/phpunit/CategorieTest.php                |  15 +-
 10 files changed, 161 insertions(+), 139 deletions(-)
 rename htdocs/{adherents => }/admin/mailman.php (96%)
 rename htdocs/{adherents => }/admin/spip.php (98%)

diff --git a/ChangeLog b/ChangeLog
index c0305ee0a1d..1a1e738da68 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -4,16 +4,18 @@ English Dolibarr ChangeLog
 
 ***** ChangeLog for 3.5 compared to 3.4 *****
 For users:
-- New: [ task #877 ] Reorganize menus
-- New: [ task #858 ] Holiday module: note on manual holiday assignation
-- New: [ task #892 ] Add option in thridparty customer/supplier admin to hide non active in select_company method
-- New: [ task #531 ] Add a workload on tasks
+- New: [ task #877 ] Reorganize menus.
+- New: [ task #858 ] Holiday module: note on manual holiday assignation.
+- New: [ task #892 ] Add option in thridparty customer/supplier admin to hide non active in select_company method.
+- New: [ task #531 ] Add a workload on tasks.
 - New: Add graph of bank account input/output into input-output report page.
 - New: Add script export-bank-receipts.
-- New: Add option "filter=bank" onto script rebuild_merge_pdf.php to merge
+- New: Add option "filter=bank" onto script rebuild_merge_pdf.php to merge.
   PDF that has one payment on a specific bank account.*
-- New: [ task #901 ] Add Extrafeild on Fiche Inter
-- New: Show process id in all command line scripts
+- New: [ task #901 ] Add Extrafeild on Fiche Inter.
+- New: Show process id in all command line scripts.
+- New: Module mailman can subscribe/unsubscribe to ML according to categories of member.
+
 For developers:
 - New: DolGraph can build graph with three lines.
 
diff --git a/htdocs/adherents/admin/mailman.php b/htdocs/admin/mailman.php
similarity index 96%
rename from htdocs/adherents/admin/mailman.php
rename to htdocs/admin/mailman.php
index 9e0b859db67..34d0fae56e5 100644
--- a/htdocs/adherents/admin/mailman.php
+++ b/htdocs/admin/mailman.php
@@ -22,12 +22,12 @@
  */
 
 /**
- *   	\file       htdocs/adherents/admin/mailman.php
+ *   	\file       htdocs/admin/mailman.php
  *		\ingroup    mailmanspip
  *		\brief      Page to setup the module MailmanSpip (Mailman)
  */
 
-require '../../main.inc.php';
+require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/mailmanspip.lib.php';
 
@@ -58,10 +58,10 @@ if ($action == 'update' || $action == 'add')
 		$consttype=$_POST["consttype"][$key];
 		$constnote=$_POST["constnote"][$key];
 		$res=dolibarr_set_const($db,$constname,$constvalue,$type[$consttype],0,$constnote,$conf->entity);
-	
+
 		if (! $res > 0) $error++;
 	}
-	
+
 	if (! $error)
 	{
 		$mesg = '<div class="ok">'.$langs->trans("SetupSaved").'</div>';
@@ -181,11 +181,12 @@ if (! empty($conf->global->ADHERENT_USE_MAILMAN))
     print_fiche_titre($langs->trans('MailmanTitle'), $lien,'');
 
     print '<br>';
-    
+
     // JQuery activity
     print '<script type="text/javascript">
     var i1=0;
     var i2=0;
+    var i3=0;
     jQuery(document).ready(function(){
         jQuery("#exampleclick1").click(function(event){
             if (i1 == 0) { jQuery("#example1").show(); i1=1; }
@@ -195,7 +196,11 @@ if (! empty($conf->global->ADHERENT_USE_MAILMAN))
             if (i2 == 0) { jQuery("#example2").show(); i2=1; }
             else if (i2 == 1)  { jQuery("#example2").hide(); i2=0; }
             });
-    });
+        jQuery("#exampleclick3").click(function(){
+            if (i3 == 0) { jQuery("#example3").show(); i3=1; }
+            else if (i3 == 1)  { jQuery("#example3").hide(); i3=0; }
+            });
+	});
     </script>';
 
     form_constantes($constantes,1);
diff --git a/htdocs/adherents/admin/spip.php b/htdocs/admin/spip.php
similarity index 98%
rename from htdocs/adherents/admin/spip.php
rename to htdocs/admin/spip.php
index 9bbb95c2697..ae7601fb611 100644
--- a/htdocs/adherents/admin/spip.php
+++ b/htdocs/admin/spip.php
@@ -22,12 +22,12 @@
  */
 
 /**
- *   	\file       htdocs/adherents/admin/spip.php
+ *   	\file       htdocs/admin/spip.php
  *		\ingroup    mailmanspip
  *		\brief      Page to setup the module MailmanSpip (SPIP)
  */
 
-require '../../main.inc.php';
+require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/mailmanspip.lib.php';
 
diff --git a/htdocs/categories/class/categorie.class.php b/htdocs/categories/class/categorie.class.php
index f8091fa8fa6..19e8b1a9f5d 100644
--- a/htdocs/categories/class/categorie.class.php
+++ b/htdocs/categories/class/categorie.class.php
@@ -372,19 +372,19 @@ class Categorie
 	 * 	Link an object to the category
 	 *
 	 *	@param		Object	$obj	Object to link to category
-	 * 	@param		string	$type	Type of category
-	 * 	@return		int				1 : OK, -1 : erreur SQL, -2 : id non renseign, -3 : Already linked
+	 * 	@param		string	$type	Type of category (member, supplier, product, customer)
+	 * 	@return		int				1 : OK, -1 : erreur SQL, -2 : id not defined, -3 : Already linked
 	 */
 	function add_type($obj,$type)
 	{
-		if ($this->id == -1)
-		{
-			return -2;
-		}
+		if ($this->id == -1) return -2;
+		if ($type == 'company')     $type='societe';
+		if ($type == 'fournisseur') $type='societe';
 
-		$sql  = "INSERT INTO ".MAIN_DB_PREFIX."categorie_".$type." (fk_categorie, fk_".($type=='fournisseur'?'societe':$type).")";
+		$sql  = "INSERT INTO ".MAIN_DB_PREFIX."categorie_".$type." (fk_categorie, fk_".$type.")";
 		$sql .= " VALUES (".$this->id.", ".$obj->id.")";
 
+		dol_syslog(get_class($this).'::add_type sql='.$sql);
 		if ($this->db->query($sql))
 		{
 			return 1;
@@ -956,36 +956,43 @@ class Categorie
 	}
 
 	/**
-	 * 		Return list of categories linked to element of type $type with id $typeid
+	 * 	Return list of categories linked to element of id $id and type $typeid
 	 *
-	 * 		@param		int		$id			Id of element
-	 * 		@param		int		$typeid		Type id of link (0,1,2,3...)
-	 * 		@return		array				List of category objects
+	 * 	@param		int		$id			Id of element
+	 * 	@param		int		$typeid		Type of link (0 or 'product', 1 or 'supplier', 2 or 'customer', 3 or 'member', ...)
+	 * 	@param		string	$mode		'object'=Get array of categories, 'label'=Get array of category labels
+	 * 	@return		mixed				Array of category objects or < 0 if KO
 	 */
-	function containing($id,$typeid)
+	function containing($id,$typeid,$mode='object')
 	{
-		$cats = array ();
+		$cats = array();
 
 		$table=''; $type='';
-		if ($typeid == 0)  { $table='product'; $type='product'; }
-		if ($typeid == 1)  { $table='societe'; $type='fournisseur'; }
-		if ($typeid == 2)  { $table='societe'; $type='societe'; }
-		if ($typeid == 3)  { $table='member'; $type='member'; }
+		if ($typeid == 0 || $typeid == 'product')         { $typeid=0; $table='product'; $type='product'; }
+		else if ($typeid == 1 || $typeid == 'supplier')  { $typeid=1; $table='societe'; $type='fournisseur'; }
+		else if ($typeid == 2 || $typeid == 'customer')  { $typeid=2; $table='societe'; $type='societe'; }
+		else if ($typeid == 3 || $typeid == 'member')    { $typeid=3; $table='member';  $type='member'; }
 
-		$sql = "SELECT ct.fk_categorie";
-		$sql.= " FROM ".MAIN_DB_PREFIX."categorie_".$type." as ct";
-		$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."categorie as c ON ct.fk_categorie = c.rowid";
-		$sql.= " WHERE ct.fk_".$table." = ".$id." AND c.type = ".$typeid;
+		$sql = "SELECT ct.fk_categorie, c.label";
+		$sql.= " FROM ".MAIN_DB_PREFIX."categorie_".$type." as ct, ".MAIN_DB_PREFIX."categorie as c";
+		$sql.= " WHERE ct.fk_categorie = c.rowid AND ct.fk_".$table." = ".$id." AND c.type = ".$typeid;
 		$sql.= " AND c.entity IN (".getEntity('category',1).")";
 
+		dol_syslog(get_class($this).'::containing sql='.$sql);
 		$res = $this->db->query($sql);
 		if ($res)
 		{
-			while ($rec = $this->db->fetch_array($res))
+			while ($obj = $this->db->fetch_object($res))
 			{
-				$cat = new Categorie($this->db);
-				$cat->fetch($rec['fk_categorie']);
-				$cats[] = $cat;
+				if ($mode == 'label')
+				{
+					$cats[] = $obj->label;
+				}
+				else {
+					$cat = new Categorie($this->db);
+					$cat->fetch($obj->fk_categorie);
+					$cats[] = $cat;
+				}
 			}
 
 			return $cats;
diff --git a/htdocs/core/lib/admin.lib.php b/htdocs/core/lib/admin.lib.php
index 434ffc7d7fb..6e302fa9806 100644
--- a/htdocs/core/lib/admin.lib.php
+++ b/htdocs/core/lib/admin.lib.php
@@ -1011,7 +1011,7 @@ function form_constantes($tableau,$strictw3c=0)
     $form = new Form($db);
 
     if (! empty($strictw3c)) print "\n".'<form action="'.$_SERVER["PHP_SELF"].'" method="POST">';
-    	
+
     print '<table class="noborder" width="100%">';
     print '<tr class="liste_titre">';
     print '<td>'.$langs->trans("Description").'</td>';
@@ -1076,6 +1076,16 @@ function form_constantes($tableau,$strictw3c=0)
                 print '</div>';
                 //print 'http://lists.domain.com/cgi-bin/mailman/admin/%LISTE%/members/remove?adminpw=%MAILMAN_ADMINPW%&unsubscribees=%EMAIL%';
             }
+            if ($const == 'ADHERENT_MAILMAN_LISTS')
+            {
+            	print '. '.$langs->trans("Example").': <a href="#" id="exampleclick3">'.img_down().'</a><br>';
+            	print '<div id="example3" class="hidden">';
+            	print 'mymailmanlist<br>';
+            	print 'mymailmanlist1,mymailmanlist2<br>';
+            	if ($conf->categorie->enabled) print 'CATEG:Categ1:mymailmanlist1,CATEG:Categ2:mymailmanlist2<br>';
+            	print '</div>';
+            	//print 'http://lists.domain.com/cgi-bin/mailman/admin/%LISTE%/members/remove?adminpw=%MAILMAN_ADMINPW%&unsubscribees=%EMAIL%';
+            }
 
             print "</td>\n";
 
@@ -1129,14 +1139,14 @@ function form_constantes($tableau,$strictw3c=0)
             	print '<td align="center">';
             	print '<input type="submit" class="button" value="'.$langs->trans("Update").'" name="Button">';
 	            print "</td>";
-            }    
+            }
     	    print "</tr>\n";
             if (empty($strictw3c)) print "</form>\n";
         }
     }
     print '</table>';
 
-    if (! empty($strictw3c)) 
+    if (! empty($strictw3c))
     {
     	print '<div align="center"><input type="submit" class="button" value="'.$langs->trans("Update").'" name="update"></div>';
     	print "</form>\n";
diff --git a/htdocs/core/lib/mailmanspip.lib.php b/htdocs/core/lib/mailmanspip.lib.php
index 47caced472c..eb57f4b6163 100644
--- a/htdocs/core/lib/mailmanspip.lib.php
+++ b/htdocs/core/lib/mailmanspip.lib.php
@@ -32,12 +32,12 @@ function mailmanspip_admin_prepare_head()
 
     return array(
         array(
-            DOL_URL_ROOT.'/adherents/admin/mailman.php',
+            DOL_URL_ROOT.'/admin/mailman.php',
             $langs->trans('Mailman'),
             'mailman'
         ),
         array(
-            DOL_URL_ROOT.'/adherents/admin/spip.php',
+            DOL_URL_ROOT.'/admin/spip.php',
             $langs->trans('SPIP'),
             'spip'
         )
diff --git a/htdocs/core/modules/modMailmanSpip.class.php b/htdocs/core/modules/modMailmanSpip.class.php
index 6877b230fca..4a4c39f3c02 100644
--- a/htdocs/core/modules/modMailmanSpip.class.php
+++ b/htdocs/core/modules/modMailmanSpip.class.php
@@ -62,14 +62,14 @@ class modMailmanSpip extends DolibarrModules
 		$this->requiredby = array();
 
 		// Config pages
-		$this->config_page_url = array('mailman.php@adherents');
+		$this->config_page_url = array('mailman.php');
 
 		// Constants
 		$this->const = array();
 		$this->const[1] = array("ADHERENT_MAILMAN_UNSUB_URL","chaine","http://lists.domain.com/cgi-bin/mailman/admin/%LISTE%/members?adminpw=%MAILMAN_ADMINPW%&user=%EMAIL%","Url de désinscription aux listes mailman");
 		$this->const[2] = array("ADHERENT_MAILMAN_URL","chaine","http://lists.domain.com/cgi-bin/mailman/admin/%LISTE%/members?adminpw=%MAILMAN_ADMINPW%&send_welcome_msg_to_this_batch=1&subscribees=%EMAIL%","Url pour les inscriptions mailman");
 		$this->const[3] = array("ADHERENT_MAILMAN_LISTS","chaine","","Mailing-list to subscribe new members to");
-		
+
 		// Boxes
 		$this->boxes = array();
 
diff --git a/htdocs/mailmanspip/class/mailmanspip.class.php b/htdocs/mailmanspip/class/mailmanspip.class.php
index 5a015ba1c64..26c9cb3a24b 100644
--- a/htdocs/mailmanspip/class/mailmanspip.class.php
+++ b/htdocs/mailmanspip/class/mailmanspip.class.php
@@ -314,46 +314,51 @@ class MailmanSpip
             return -1;
         }
 
-        if (! empty($conf->global->ADHERENT_MAILMAN_URL))
+        if ($conf->adherent->enabled)	// Synchro for members
         {
-            if ($listes == '' && ! empty($conf->global->ADHERENT_MAILMAN_LISTS))
-            {
-                $lists=explode(',',$conf->global->ADHERENT_MAILMAN_LISTS);
-            }
-            else
-            {
-                $lists=explode(',',$listes);
-            }
-            foreach ($lists as $list)
-            {
-                // Filter on type something (ADHERENT_MAILMAN_LISTS = "filtervalue:mailinglist1,filtervalue2:mailinglist2,mailinglist3")
-                $tmp=explode(':',$list);
-                if (! empty($tmp[1]))
-                {
-                    $list=$tmp[1];
-                    if ($object->element == 'member' && $object->type != $tmp[0])    // Filter on member type label
-                    {
-                        dol_syslog("We ignore list ".$list." because object member type ".$object->type." does not match ".$tmp[0], LOG_DEBUG);
-                        continue;
-                    }
-                }
+	        if (! empty($conf->global->ADHERENT_MAILMAN_URL))
+	        {
+	            if ($listes == '' && ! empty($conf->global->ADHERENT_MAILMAN_LISTS)) $lists=explode(',',$conf->global->ADHERENT_MAILMAN_LISTS);
+	            else $lists=explode(',',$listes);
 
-                //We call Mailman to subscribe the user
-                $result = $this->callMailman($object, $conf->global->ADHERENT_MAILMAN_URL, $list);
+	            $categstatic=new Categorie($this->db);
 
-				if ($result === false)
-				{
-					$this->mladded_ko[$list]=$object->email;
-				    return -2;
-				}
-				else $this->mladded_ok[$list]=$object->email;
-            }
-            return count($lists);
-        }
-        else
-       {
-            $this->error="ADHERENT_MAILMAN_URL not defined";
-            return -1;
+	            foreach ($lists as $list)
+	            {
+	                // Filter on type something (ADHERENT_MAILMAN_LISTS = "mailinglist0,TYPE:typevalue:mailinglist1,CATEG:categvalue:mailinglist2")
+	                $tmp=explode(':',$list);
+	                if (! empty($tmp[2]))
+	                {
+	                    $list=$tmp[2];
+	                    if ($object->element == 'member' && $tmp[0] == 'TYPE' && $object->type != $tmp[1])    // Filter on member type label
+	                    {
+	                        dol_syslog("We ignore list ".$list." because object member type ".$object->type." does not match ".$tmp[1], LOG_DEBUG);
+	                        continue;
+	                    }
+	                    if ($object->element == 'member' && $tmp[0] == 'CATEG' && ! in_array($tmp[1], $categstatic->containing($object->id, 'member', 'label')))    // Filter on member category
+	                    {
+	                        dol_syslog("We ignore list ".$list." because object member is not into category ".$tmp[1], LOG_DEBUG);
+	                        continue;
+	                    }
+	                }
+
+	                //We call Mailman to subscribe the user
+	                $result = $this->callMailman($object, $conf->global->ADHERENT_MAILMAN_URL, $list);
+
+					if ($result === false)
+					{
+						$this->mladded_ko[$list]=$object->email;
+					    return -2;
+					}
+					else $this->mladded_ok[$list]=$object->email;
+	            }
+	            return count($lists);
+	        }
+	        else
+	       {
+	            $this->error="ADHERENT_MAILMAN_URL not defined";
+	            return -1;
+	        }
         }
     }
 
@@ -381,46 +386,44 @@ class MailmanSpip
             return -1;
         }
 
-        if (! empty($conf->global->ADHERENT_MAILMAN_UNSUB_URL))
+        if ($conf->adherent->enabled)	// Synchro for members
         {
-            if ($listes=='' && ! empty($conf->global->ADHERENT_MAILMAN_LISTS))
-            {
-                $lists=explode(',',$conf->global->ADHERENT_MAILMAN_LISTS);
-            }
-            else
-            {
-                $lists=explode(',',$listes);
-            }
-            foreach ($lists as $list)
-            {
-                // Filter on type something (ADHERENT_MAILMAN_LISTS = "filtervalue:mailinglist1,filtervalue2:mailinglist2,mailinglist3")
-                $tmp=explode(':',$list);
-                if (! empty($tmp[1]))
-                {
-                    $list=$tmp[1];
-                	if ($object->element == 'member' && $object->type != $tmp[1])    // Filter on member type label
-                    {
-                        dol_syslog("We ignore list ".$list." because object member type ".$object->type." does not match ".$tmp[0], LOG_DEBUG);
-                    	continue;
-                    }
-                }
+	        if (! empty($conf->global->ADHERENT_MAILMAN_UNSUB_URL))
+	        {
+	            if ($listes=='' && ! empty($conf->global->ADHERENT_MAILMAN_LISTS)) $lists=explode(',',$conf->global->ADHERENT_MAILMAN_LISTS);
+	            else $lists=explode(',',$listes);
 
-                //We call Mailman to unsubscribe the user
-                $result = $this->callMailman($object, $conf->global->ADHERENT_MAILMAN_UNSUB_URL, $list);
+	            foreach ($lists as $list)
+	            {
+	                // Filter on type something (ADHERENT_MAILMAN_LISTS = "filtervalue:mailinglist1,filtervalue2:mailinglist2,mailinglist3")
+	                $tmp=explode(':',$list);
+	                if (! empty($tmp[1]))
+	                {
+	                    $list=$tmp[1];
+	                	if ($object->element == 'member' && $object->type != $tmp[1])    // Filter on member type label
+	                    {
+	                        dol_syslog("We ignore list ".$list." because object member type ".$object->type." does not match ".$tmp[0], LOG_DEBUG);
+	                    	continue;
+	                    }
+	                }
 
-				if ($result === false)
-				{
-					$this->mlremoved_ko[$list]=$object->email;
-				    return -2;
-				}
-				else $this->mlremoved_ok[$list]=$object->email;
-            }
-            return count($lists);
-        }
-        else
-        {
-            $this->error="ADHERENT_MAILMAN_UNSUB_URL not defined";
-            return -1;
+	                //We call Mailman to unsubscribe the user
+	                $result = $this->callMailman($object, $conf->global->ADHERENT_MAILMAN_UNSUB_URL, $list);
+
+					if ($result === false)
+					{
+						$this->mlremoved_ko[$list]=$object->email;
+					    return -2;
+					}
+					else $this->mlremoved_ok[$list]=$object->email;
+	            }
+	            return count($lists);
+	        }
+	        else
+			{
+	            $this->error="ADHERENT_MAILMAN_UNSUB_URL not defined";
+	            return -1;
+	        }
         }
     }
 
diff --git a/htdocs/product/class/product.class.php b/htdocs/product/class/product.class.php
index e628b097fe5..c44b8907be5 100644
--- a/htdocs/product/class/product.class.php
+++ b/htdocs/product/class/product.class.php
@@ -336,19 +336,7 @@ class Product extends CommonObject
 						$result = $this->_log_price($user);
 						if ($result > 0)
 						{
-							if ($this->update($id, $user, true, 'add') > 0)
-							{
-								// FIXME: not use here
-								/*
-								if ($this->catid > 0)
-								{
-									require_once DOL_DOCUMENT_ROOT .'/categories/class/categorie.class.php';
-									$cat = new Categorie($this->db, $this->catid);
-									$cat->add_type($this,"product");
-								}
-								*/
-							}
-							else
+							if ($this->update($id, $user, true, 'add') <= 0)
 							{
 							    $error++;
 					            $this->error='ErrorFailedToUpdateRecord';
@@ -673,7 +661,7 @@ class Product extends CommonObject
                 		}
                 	}
                 }
-                
+
                 // Remove extrafields
                 if ((! $error) && (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED))) // For avoid conflicts if trigger used
                 {
diff --git a/test/phpunit/CategorieTest.php b/test/phpunit/CategorieTest.php
index 501781b309d..e48fa7739ff 100755
--- a/test/phpunit/CategorieTest.php
+++ b/test/phpunit/CategorieTest.php
@@ -184,16 +184,23 @@ class CategorieTest extends PHPUnit_Framework_TestCase
         print __METHOD__." catid=".$catid."\n";
         $this->assertGreaterThan(0, $catid);
 
-        // Category
+        // Try to create product linked to category
 		$localobject2=new Product($this->savdb);
     	$localobject2->initAsSpecimen();
     	$localobject2->ref.='-CATEG';
     	$localobject2->tva_npr=1;
-    	$localobject2->catid=$catid;
     	$result=$localobject2->create($user);
+    	$cat = new Categorie($this->savdb);
+    	$cat->id = $catid;
+    	$result=$cat->add_type($localobject2,"product");
 
-        print __METHOD__." result=".$result."\n";
-    	$this->assertGreaterThan(0, $result);
+    	print __METHOD__." result=".$result."\n";
+    	$this->assertGreaterThan(0, $result);
+
+    	// Get list of categories for product
+    	$localcateg=new Categorie($this->savdb);
+    	$listofcateg=$localcateg->containing($localobject2->id, 'product', 'label');
+    	$this->assertTrue(in_array('Specimen Category for product',$listofcateg), 'Categ not found linked to product when it should');
 
     	return $id;
     }

From ebb8f05f0996ce3822c865c9388b9e3f0599604f Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 5 Jun 2013 15:53:27 +0200
Subject: [PATCH 32/43] Subscription to ML can also be done according to member
 type

---
 htdocs/admin/mailman.php                      |  1 +
 htdocs/admin/spip.php                         |  1 +
 htdocs/core/lib/admin.lib.php                 |  1 +
 .../mailmanspip/class/mailmanspip.class.php   | 27 +++++++++++--------
 4 files changed, 19 insertions(+), 11 deletions(-)

diff --git a/htdocs/admin/mailman.php b/htdocs/admin/mailman.php
index 34d0fae56e5..eaca2cb998a 100644
--- a/htdocs/admin/mailman.php
+++ b/htdocs/admin/mailman.php
@@ -30,6 +30,7 @@
 require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/mailmanspip.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
 
 $langs->load("admin");
 $langs->load("members");
diff --git a/htdocs/admin/spip.php b/htdocs/admin/spip.php
index ae7601fb611..755ab8670e1 100644
--- a/htdocs/admin/spip.php
+++ b/htdocs/admin/spip.php
@@ -30,6 +30,7 @@
 require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/mailmanspip.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
 
 $langs->load("admin");
 $langs->load("members");
diff --git a/htdocs/core/lib/admin.lib.php b/htdocs/core/lib/admin.lib.php
index 6e302fa9806..d399256dc0e 100644
--- a/htdocs/core/lib/admin.lib.php
+++ b/htdocs/core/lib/admin.lib.php
@@ -1082,6 +1082,7 @@ function form_constantes($tableau,$strictw3c=0)
             	print '<div id="example3" class="hidden">';
             	print 'mymailmanlist<br>';
             	print 'mymailmanlist1,mymailmanlist2<br>';
+            	print 'TYPE:Type1:mymailmanlist1,TYPE:Type2:mymailmanlist2<br>';
             	if ($conf->categorie->enabled) print 'CATEG:Categ1:mymailmanlist1,CATEG:Categ2:mymailmanlist2<br>';
             	print '</div>';
             	//print 'http://lists.domain.com/cgi-bin/mailman/admin/%LISTE%/members/remove?adminpw=%MAILMAN_ADMINPW%&unsubscribees=%EMAIL%';
diff --git a/htdocs/mailmanspip/class/mailmanspip.class.php b/htdocs/mailmanspip/class/mailmanspip.class.php
index 26c9cb3a24b..e0add082e71 100644
--- a/htdocs/mailmanspip/class/mailmanspip.class.php
+++ b/htdocs/mailmanspip/class/mailmanspip.class.php
@@ -395,17 +395,22 @@ class MailmanSpip
 
 	            foreach ($lists as $list)
 	            {
-	                // Filter on type something (ADHERENT_MAILMAN_LISTS = "filtervalue:mailinglist1,filtervalue2:mailinglist2,mailinglist3")
-	                $tmp=explode(':',$list);
-	                if (! empty($tmp[1]))
-	                {
-	                    $list=$tmp[1];
-	                	if ($object->element == 'member' && $object->type != $tmp[1])    // Filter on member type label
-	                    {
-	                        dol_syslog("We ignore list ".$list." because object member type ".$object->type." does not match ".$tmp[0], LOG_DEBUG);
-	                    	continue;
-	                    }
-	                }
+	            	// Filter on type something (ADHERENT_MAILMAN_LISTS = "mailinglist0,TYPE:typevalue:mailinglist1,CATEG:categvalue:mailinglist2")
+	            	$tmp=explode(':',$list);
+	            	if (! empty($tmp[2]))
+	            	{
+	            		$list=$tmp[2];
+	            		if ($object->element == 'member' && $tmp[0] == 'TYPE' && $object->type != $tmp[1])    // Filter on member type label
+	            		{
+	            			dol_syslog("We ignore list ".$list." because object member type ".$object->type." does not match ".$tmp[1], LOG_DEBUG);
+	            			continue;
+	            		}
+	            		if ($object->element == 'member' && $tmp[0] == 'CATEG' && ! in_array($tmp[1], $categstatic->containing($object->id, 'member', 'label')))    // Filter on member category
+	            		{
+	            			dol_syslog("We ignore list ".$list." because object member is not into category ".$tmp[1], LOG_DEBUG);
+	            			continue;
+	            		}
+	            	}
 
 	                //We call Mailman to unsubscribe the user
 	                $result = $this->callMailman($object, $conf->global->ADHERENT_MAILMAN_UNSUB_URL, $list);

From 95e657c171fd21024114e12260a528504d51c089 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rapha=C3=ABl=20Doursenaud?= <rdoursenaud@gpcsolutions.fr>
Date: Wed, 5 Jun 2013 16:00:13 +0200
Subject: [PATCH 33/43] Ignore IntelliJIDEA module files

---
 .gitignore | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitignore b/.gitignore
index 3748a6ef1b8..3ec764dec5b 100755
--- a/.gitignore
+++ b/.gitignore
@@ -14,3 +14,4 @@ doxygen_warnings.log
 /.project
 .DS_Store
 .idea
+*.iml

From 686f5add8263bbdda073a0ff5cf1681682c7e772 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rapha=C3=ABl=20Doursenaud?= <rdoursenaud@gpcsolutions.fr>
Date: Wed, 5 Jun 2013 16:12:07 +0200
Subject: [PATCH 34/43] Normalized line endings to LF

---
 htdocs/theme/bureau2crea/style.css.php        |   8 +-
 htdocs/theme/cameleo/style.css.php            |   8 +-
 htdocs/theme/eldy/style.css.php               |  12 +-
 htdocs/user/class/user.class.php              |   6 +-
 htdocs/user/clicktodial.php                   |  10 +-
 htdocs/user/logout.php                        |  10 +-
 htdocs/user/param_ihm.php                     |   8 +-
 htdocs/user/passwordforgotten.php             |  10 +-
 htdocs/user/perms.php                         |   4 +-
 htdocs/viewimage.php                          |  18 +-
 htdocs/webservices/README                     |  28 +-
 .../webservices/server_supplier_invoice.php   |   2 +-
 scripts/bank/export-bank-receipts.php         | 436 +++++++++---------
 .../company/export-contacts-xls-example.php   |   8 +-
 .../email_expire_services_to_customers.php    |  34 +-
 ...ail_expire_services_to_representatives.php |  32 +-
 scripts/cron/cron_run_jobs.php                |  18 +-
 scripts/emailings/mailing-send.php            |  26 +-
 .../email_unpaid_invoices_to_customers.php    |  66 +--
 ...ail_unpaid_invoices_to_representatives.php |  12 +-
 scripts/invoices/rebuild_merge_pdf.php        |  28 +-
 .../members/sync_members_ldap2dolibarr.php    |  24 +-
 scripts/user/sync_groups_ldap2dolibarr.php    |  40 +-
 scripts/user/sync_users_ldap2dolibarr.php     |  16 +-
 test/phpunit/AdherentTest.php                 |   2 +-
 test/phpunit/CategorieTest.php                |   8 +-
 test/phpunit/NumberingModulesTest.php         |  24 +-
 test/phpunit/UserTest.php                     |  94 ++--
 28 files changed, 496 insertions(+), 496 deletions(-)

diff --git a/htdocs/theme/bureau2crea/style.css.php b/htdocs/theme/bureau2crea/style.css.php
index 46abe55ecae..d1789ddef07 100644
--- a/htdocs/theme/bureau2crea/style.css.php
+++ b/htdocs/theme/bureau2crea/style.css.php
@@ -60,10 +60,10 @@ $fontsizesmaller=empty($conf->dol_optimize_smallscreen)?'11':'11';
 $fontlist='arial,tahoma,verdana,helvetica';
 //$fontlist='Verdana,Helvetica,Arial,sans-serif';
 
-$dol_hide_topmenu=$conf->dol_hide_topmenu;
-$dol_hide_leftmenu=$conf->dol_hide_leftmenu;
-$dol_optimize_smallscreen=$conf->dol_optimize_smallscreen;
-$dol_no_mouse_hover=$conf->dol_no_mouse_hover;
+$dol_hide_topmenu=$conf->dol_hide_topmenu;
+$dol_hide_leftmenu=$conf->dol_hide_leftmenu;
+$dol_optimize_smallscreen=$conf->dol_optimize_smallscreen;
+$dol_no_mouse_hover=$conf->dol_no_mouse_hover;
 $dol_use_jmobile=$conf->dol_use_jmobile;
 
 $path='';    			// This value may be used in future for external module to overwrite theme
diff --git a/htdocs/theme/cameleo/style.css.php b/htdocs/theme/cameleo/style.css.php
index be7c6532f44..2f58829b422 100644
--- a/htdocs/theme/cameleo/style.css.php
+++ b/htdocs/theme/cameleo/style.css.php
@@ -60,10 +60,10 @@ $fontsizesmaller=empty($conf->dol_optimize_smallscreen)?'11':'11';
 $fontlist='arial,tahoma,verdana,helvetica';
 //$fontlist='Verdana,Helvetica,Arial,sans-serif';
 
-$dol_hide_topmenu=$conf->dol_hide_topmenu;
-$dol_hide_leftmenu=$conf->dol_hide_leftmenu;
-$dol_optimize_smallscreen=$conf->dol_optimize_smallscreen;
-$dol_no_mouse_hover=$conf->dol_no_mouse_hover;
+$dol_hide_topmenu=$conf->dol_hide_topmenu;
+$dol_hide_leftmenu=$conf->dol_hide_leftmenu;
+$dol_optimize_smallscreen=$conf->dol_optimize_smallscreen;
+$dol_no_mouse_hover=$conf->dol_no_mouse_hover;
 $dol_use_jmobile=$conf->dol_use_jmobile;
 
 $path='';    		// This value may be used in future for external module to overwrite theme
diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php
index a311080a73d..a98b2f72df2 100644
--- a/htdocs/theme/eldy/style.css.php
+++ b/htdocs/theme/eldy/style.css.php
@@ -58,8 +58,8 @@ if (GETPOST('theme')) $conf->theme=GETPOST('theme');  // If theme was forced on
 $langs->load("main",0,1);
 $right=($langs->trans("DIRECTION")=='rtl'?'left':'right');
 $left=($langs->trans("DIRECTION")=='rtl'?'right':'left');
-$fontsize=empty($conf->dol_optimize_smallscreen)?'12':'12';
-$fontsizesmaller=empty($conf->dol_optimize_smallscreen)?'11':'11';
+$fontsize=empty($conf->dol_optimize_smallscreen)?'12':'12';
+$fontsizesmaller=empty($conf->dol_optimize_smallscreen)?'11':'11';
 
 $path='';    	// This value may be used in future for external module to overwrite theme
 $theme='eldy';	// Value of theme
@@ -70,10 +70,10 @@ $fontlist='arial,tahoma,verdana,helvetica';    //$fontlist='Verdana,Helvetica,Ar
 $img_head=dol_buildpath($path.'/theme/'.$theme.'/img/headbg2.jpg',1);
 $img_button=dol_buildpath($path.'/theme/'.$theme.'/img/button_bg.png',1);
 $dol_hide_topmenu=$conf->dol_hide_topmenu;
-$dol_hide_leftmenu=$conf->dol_hide_leftmenu;
-$dol_optimize_smallscreen=$conf->dol_optimize_smallscreen;
-$dol_no_mouse_hover=$conf->dol_no_mouse_hover;
-$dol_use_jmobile=$conf->dol_use_jmobile;
+$dol_hide_leftmenu=$conf->dol_hide_leftmenu;
+$dol_optimize_smallscreen=$conf->dol_optimize_smallscreen;
+$dol_no_mouse_hover=$conf->dol_no_mouse_hover;
+$dol_use_jmobile=$conf->dol_use_jmobile;
 
 
 // Define reference colors
diff --git a/htdocs/user/class/user.class.php b/htdocs/user/class/user.class.php
index 7e884a5c10a..aa6fb883a1d 100644
--- a/htdocs/user/class/user.class.php
+++ b/htdocs/user/class/user.class.php
@@ -1113,9 +1113,9 @@ class User extends CommonObject
 		$this->note         = trim($this->note);
 		$this->openid       = trim(empty($this->openid)?'':$this->openid);    // Avoid warning
 		$this->admin        = $this->admin?$this->admin:0;
-		$this->address		= empty($this->address)?'':$this->address;
-		$this->zip			= empty($this->zip)?'':$this->zip;
-		$this->town			= empty($this->town)?'':$this->town;
+		$this->address		= empty($this->address)?'':$this->address;
+		$this->zip			= empty($this->zip)?'':$this->zip;
+		$this->town			= empty($this->town)?'':$this->town;
 		
 		// Check parameters
 		if (! empty($conf->global->USER_MAIL_REQUIRED) && ! isValidEMail($this->email))
diff --git a/htdocs/user/clicktodial.php b/htdocs/user/clicktodial.php
index 48f02ca5603..b95374d800b 100644
--- a/htdocs/user/clicktodial.php
+++ b/htdocs/user/clicktodial.php
@@ -54,7 +54,7 @@ if ($action == 'update' && ! $_POST['cancel'])
 	$edituser->clicktodial_url      = GETPOST("url");
 	$edituser->clicktodial_login    = GETPOST("login");
 	$edituser->clicktodial_password = GETPOST("password");
-	$edituser->clicktodial_poste    = GETPOST("poste");
+	$edituser->clicktodial_poste    = GETPOST("poste");
 
 	$result=$edituser->update_clicktodial();
 	if ($result < 0) setEventMessage($edituser->error,'errors');
@@ -155,10 +155,10 @@ if ($id > 0)
 
         print '</table>';
 
-        print '<br><center><input class="button" type="submit" value="'.$langs->trans("Save").'">';
-        print ' &nbsp; &nbsp; ';
-        print '<input class="button" type="submit" name="cancel" value="'.$langs->trans("Cancel").'">';
-        print '</center>';
+        print '<br><center><input class="button" type="submit" value="'.$langs->trans("Save").'">';
+        print ' &nbsp; &nbsp; ';
+        print '<input class="button" type="submit" name="cancel" value="'.$langs->trans("Cancel").'">';
+        print '</center>';
 
         print '</form>';
     }
diff --git a/htdocs/user/logout.php b/htdocs/user/logout.php
index 3dcd1eae8ff..edd860426aa 100644
--- a/htdocs/user/logout.php
+++ b/htdocs/user/logout.php
@@ -63,9 +63,9 @@ if (! empty($conf->global->MAIN_LOGOUT_GOTO_URL)) $url=$conf->global->MAIN_LOGOU
 
 if (GETPOST('dol_hide_topmenu'))         $url.=(preg_match('/\?/',$url)?'&':'?').'dol_hide_topmenu=1';
 if (GETPOST('dol_hide_leftmenu'))        $url.=(preg_match('/\?/',$url)?'&':'?').'dol_hide_leftmenu=1';
-if (GETPOST('dol_optimize_smallscreen')) $url.=(preg_match('/\?/',$url)?'&':'?').'dol_optimize_smallscreen=1';
-if (GETPOST('dol_no_mouse_hover'))       $url.=(preg_match('/\?/',$url)?'&':'?').'dol_no_mouse_hover=1';
-if (GETPOST('dol_use_jmobile'))          $url.=(preg_match('/\?/',$url)?'&':'?').'dol_use_jmobile=1';
+if (GETPOST('dol_optimize_smallscreen')) $url.=(preg_match('/\?/',$url)?'&':'?').'dol_optimize_smallscreen=1';
+if (GETPOST('dol_no_mouse_hover'))       $url.=(preg_match('/\?/',$url)?'&':'?').'dol_no_mouse_hover=1';
+if (GETPOST('dol_use_jmobile'))          $url.=(preg_match('/\?/',$url)?'&':'?').'dol_use_jmobile=1';
 
 // Destroy session
 $prefix=dol_getprefix();
@@ -77,8 +77,8 @@ session_destroy();
 dol_syslog("End of session ".$sessionname);
 
 // TODO Not sure this is required
-unset($_SESSION['dol_login']);
-unset($_SESSION['dol_entity']);
+unset($_SESSION['dol_login']);
+unset($_SESSION['dol_entity']);
 
 header("Location: ".$url);
 ?>
diff --git a/htdocs/user/param_ihm.php b/htdocs/user/param_ihm.php
index 568cebad27e..54a9093bd34 100644
--- a/htdocs/user/param_ihm.php
+++ b/htdocs/user/param_ihm.php
@@ -122,10 +122,10 @@ $title = $langs->trans("User");
 
 if ($action == 'edit')
 {
-	print '<form method="post" action="'.$_SERVER["PHP_SELF"].'">';
-	print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
-	print '<input type="hidden" name="action" value="update">';
-	print '<input type="hidden" name="id" value="'.$id.'">';
+	print '<form method="post" action="'.$_SERVER["PHP_SELF"].'">';
+	print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+	print '<input type="hidden" name="action" value="update">';
+	print '<input type="hidden" name="id" value="'.$id.'">';
 }
 
 
diff --git a/htdocs/user/passwordforgotten.php b/htdocs/user/passwordforgotten.php
index 112f38caded..d1512fea9ab 100644
--- a/htdocs/user/passwordforgotten.php
+++ b/htdocs/user/passwordforgotten.php
@@ -55,11 +55,11 @@ $conf->entity 	= (GETPOST('entity') ? GETPOST('entity') : 1);
 $hookmanager->initHooks(array('passwordforgottenpage'));
 
 
-if (GETPOST('dol_hide_leftmenu') || ! empty($_SESSION['dol_hide_leftmenu']))               $conf->dol_hide_leftmenu=1;
-if (GETPOST('dol_hide_topmenu') || ! empty($_SESSION['dol_hide_topmenu']))                 $conf->dol_hide_topmenu=1;
-if (GETPOST('dol_optimize_smallscreen') || ! empty($_SESSION['dol_optimize_smallscreen'])) $conf->dol_optimize_smallscreen=1;
-if (GETPOST('dol_no_mouse_hover') || ! empty($_SESSION['dol_no_mouse_hover']))             $conf->dol_no_mouse_hover=1;
-if (GETPOST('dol_use_jmobile') || ! empty($_SESSION['dol_use_jmobile']))                   $conf->dol_use_jmobile=1;
+if (GETPOST('dol_hide_leftmenu') || ! empty($_SESSION['dol_hide_leftmenu']))               $conf->dol_hide_leftmenu=1;
+if (GETPOST('dol_hide_topmenu') || ! empty($_SESSION['dol_hide_topmenu']))                 $conf->dol_hide_topmenu=1;
+if (GETPOST('dol_optimize_smallscreen') || ! empty($_SESSION['dol_optimize_smallscreen'])) $conf->dol_optimize_smallscreen=1;
+if (GETPOST('dol_no_mouse_hover') || ! empty($_SESSION['dol_no_mouse_hover']))             $conf->dol_no_mouse_hover=1;
+if (GETPOST('dol_use_jmobile') || ! empty($_SESSION['dol_use_jmobile']))                   $conf->dol_use_jmobile=1;
 
 
 /**
diff --git a/htdocs/user/perms.php b/htdocs/user/perms.php
index 616b0609f7a..0c2b17dcb1a 100644
--- a/htdocs/user/perms.php
+++ b/htdocs/user/perms.php
@@ -272,8 +272,8 @@ print '</tr>'."\n";
 print '</table><br>';
 
 if ($user->admin) print info_admin($langs->trans("WarningOnlyPermissionOfActivatedModules"), 0, 1).'<br>';
-// Show warning about external users
-if (empty($user->societe_id)) print showModulesExludedForExternal($modules).'<br><br>'."\n";
+// Show warning about external users
+if (empty($user->societe_id)) print showModulesExludedForExternal($modules).'<br><br>'."\n";
 
 // For multicompany transversal mode
 if (! empty($conf->multicompany->enabled) && ! empty($conf->multicompany->transverse_mode))
diff --git a/htdocs/viewimage.php b/htdocs/viewimage.php
index efa2dbe576d..b12a38000a7 100644
--- a/htdocs/viewimage.php
+++ b/htdocs/viewimage.php
@@ -47,7 +47,7 @@ function llxHeader() { }
  *
  * @return	void
  */
-function llxFooter() { }
+function llxFooter() { }
 
 require 'main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
@@ -97,15 +97,15 @@ else $type=dol_mimetype($original_file);
 // Suppression de la chaine de caractere ../ dans $original_file
 $original_file = str_replace("../","/", $original_file);
 
-// Find the subdirectory name as the reference
-$refname=basename(dirname($original_file)."/");
-
-// Security check
+// Find the subdirectory name as the reference
+$refname=basename(dirname($original_file)."/");
+
+// Security check
 if (empty($modulepart)) accessforbidden('Bad value for parameter modulepart');
-$check_access = dol_check_secure_access_document($modulepart,$original_file,$entity,$refname);
-$accessallowed              = $check_access['accessallowed'];
-$sqlprotectagainstexternals = $check_access['sqlprotectagainstexternals'];
-$original_file              = $check_access['original_file'];
+$check_access = dol_check_secure_access_document($modulepart,$original_file,$entity,$refname);
+$accessallowed              = $check_access['accessallowed'];
+$sqlprotectagainstexternals = $check_access['sqlprotectagainstexternals'];
+$original_file              = $check_access['original_file'];
 
 // Security:
 // Limit access if permissions are wrong
diff --git a/htdocs/webservices/README b/htdocs/webservices/README
index 14535775c52..b4c1137bf67 100644
--- a/htdocs/webservices/README
+++ b/htdocs/webservices/README
@@ -1,14 +1,14 @@
-README (english)
----------------------------------------------------------
-This directory contains files to make Dolibarr a server
-of SOAP Web Services.
-
-* To see all Webservices provided by Dolibarr, just call following Url:
-http://mydomain.com/dolibarr/webservices/server.php
-
-* WSDL file of Web services provided by Dolibarr can be obtained at:
-http://mydomain.com/dolibarr/webservices/server.php?wsdl
-and is also saved in file:
-server.wsdl 
-
-Note, you can test this Webservices by calling the page client.php.
+README (english)
+---------------------------------------------------------
+This directory contains files to make Dolibarr a server
+of SOAP Web Services.
+
+* To see all Webservices provided by Dolibarr, just call following Url:
+http://mydomain.com/dolibarr/webservices/server.php
+
+* WSDL file of Web services provided by Dolibarr can be obtained at:
+http://mydomain.com/dolibarr/webservices/server.php?wsdl
+and is also saved in file:
+server.wsdl 
+
+Note, you can test this Webservices by calling the page client.php.
diff --git a/htdocs/webservices/server_supplier_invoice.php b/htdocs/webservices/server_supplier_invoice.php
index 0655b0cd729..57021f5f2b2 100755
--- a/htdocs/webservices/server_supplier_invoice.php
+++ b/htdocs/webservices/server_supplier_invoice.php
@@ -381,7 +381,7 @@ function getSupplierInvoicesForThirdParty($authentication,$idthirdparty)
 			    $result=$invoice->fetch($obj->facid);
 				if ($result < 0)
 				{
-					$error++;
+					$error++;
 					$errorcode=$result; $errorlabel=$invoice->error;
 					break;
 				}
diff --git a/scripts/bank/export-bank-receipts.php b/scripts/bank/export-bank-receipts.php
index 825d13a3afe..8ba7f665f60 100755
--- a/scripts/bank/export-bank-receipts.php
+++ b/scripts/bank/export-bank-receipts.php
@@ -33,33 +33,33 @@ if (substr($sapi_type, 0, 3) == 'cgi') {
 	exit;
 }
 
-require_once($path."../../htdocs/master.inc.php");
-require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
-require_once DOL_DOCUMENT_ROOT.'/core/lib/bank.lib.php';
-require_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php';
-require_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent.class.php';
-require_once DOL_DOCUMENT_ROOT.'/compta/sociales/class/chargesociales.class.php';
-require_once DOL_DOCUMENT_ROOT.'/compta/paiement/class/paiement.class.php';
-require_once DOL_DOCUMENT_ROOT.'/compta/tva/class/tva.class.php';
-require_once DOL_DOCUMENT_ROOT.'/fourn/class/paiementfourn.class.php';
-require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
-require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
-require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.facture.class.php';
-require_once DOL_DOCUMENT_ROOT.'/compta/tva/class/tva.class.php';
+require_once($path."../../htdocs/master.inc.php");
+require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/bank.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php';
+require_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent.class.php';
+require_once DOL_DOCUMENT_ROOT.'/compta/sociales/class/chargesociales.class.php';
+require_once DOL_DOCUMENT_ROOT.'/compta/paiement/class/paiement.class.php';
+require_once DOL_DOCUMENT_ROOT.'/compta/tva/class/tva.class.php';
+require_once DOL_DOCUMENT_ROOT.'/fourn/class/paiementfourn.class.php';
+require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
+require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
+require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.facture.class.php';
+require_once DOL_DOCUMENT_ROOT.'/compta/tva/class/tva.class.php';
 require_once DOL_DOCUMENT_ROOT.'/compta/sociales/class/paymentsocialcontribution.class.php';
 
 // Global variables
 $version=DOL_VERSION;
 $error=0;
-
-
+
+
 
 /*
  * Main
  */
 
-@set_time_limit(0);
-print "***** ".$script_file." (".$version.") pid=".getmypid()." *****\n";
+@set_time_limit(0);
+print "***** ".$script_file." (".$version.") pid=".getmypid()." *****\n";
 
 if (! isset($argv[3]) || ! $argv[3]) {
 	print "Usage: $script_file bank_ref bank_receipt_number (csv|tsv|excel|excel2007) [lang=xx_XX]\n";
@@ -68,52 +68,52 @@ if (! isset($argv[3]) || ! $argv[3]) {
 $bankref=$argv[1];
 $num=$argv[2];
 $model=$argv[3];
-$newlangid='en_EN';	// To force a new lang id
+$newlangid='en_EN';	// To force a new lang id
 
 
 $invoicestatic=new Facture($db);
 $invoicesupplierstatic=new FactureFournisseur($db);
-$societestatic=new Societe($db);
+$societestatic=new Societe($db);
 $chargestatic=new ChargeSociales($db);
-$memberstatic=new Adherent($db);
-$paymentstatic=new Paiement($db);
+$memberstatic=new Adherent($db);
+$paymentstatic=new Paiement($db);
 $paymentsupplierstatic=new PaiementFourn($db);
-$paymentsocialcontributionstatic=new PaymentSocialContribution($db);
-$paymentvatstatic=new Tva($db);
-$bankstatic=new Account($db);
+$paymentsocialcontributionstatic=new PaymentSocialContribution($db);
+$paymentvatstatic=new Tva($db);
+$bankstatic=new Account($db);
 $banklinestatic=new AccountLine($db);
 
 
 // Parse parameters
-foreach ($argv as $key => $value)
-{
-	$found=false;
-
-	// Define options
-	if (preg_match('/^lang=/i',$value))
-	{
-		$found=true;
-		$valarray=explode('=',$value);
-		$newlangid=$valarray[1];
-		print 'Use language '.$newlangid.".\n";
+foreach ($argv as $key => $value)
+{
+	$found=false;
+
+	// Define options
+	if (preg_match('/^lang=/i',$value))
+	{
+		$found=true;
+		$valarray=explode('=',$value);
+		$newlangid=$valarray[1];
+		print 'Use language '.$newlangid.".\n";
 	}
 }
-$outputlangs = $langs;
-if (! empty($newlangid))
-{
-	if ($outputlangs->defaultlang != $newlangid)
-	{
-		$outputlangs = new Translate("",$conf);
-		$outputlangs->setDefaultLang($newlangid);
-	}
+$outputlangs = $langs;
+if (! empty($newlangid))
+{
+	if ($outputlangs->defaultlang != $newlangid)
+	{
+		$outputlangs = new Translate("",$conf);
+		$outputlangs->setDefaultLang($newlangid);
+	}
 }
 $outputlangs->load("main");
 $outputlangs->load("bills");
-$outputlangs->load("companies");
-$outputlangs->load("banks");
-$outputlangs->load("members");
-$outputlangs->load("compta");
-
+$outputlangs->load("companies");
+$outputlangs->load("banks");
+$outputlangs->load("members");
+$outputlangs->load("compta");
+
 
 $acct=new Account($db);
 $result=$acct->fetch('',$bankref);
@@ -128,22 +128,22 @@ else
 }
 
 
-// Creation de la classe d'export du model ExportXXX
-$dir = DOL_DOCUMENT_ROOT . "/core/modules/export/";
-$file = "export_".$model.".modules.php";
-$classname = "Export".$model;
+// Creation de la classe d'export du model ExportXXX
+$dir = DOL_DOCUMENT_ROOT . "/core/modules/export/";
+$file = "export_".$model.".modules.php";
+$classname = "Export".$model;
 if (! dol_is_file($dir.$file))
 {
 	print "No driver to export with format ".$model."\n";
 	exit;
 }
-require_once $dir.$file;
-$objmodel = new $classname($db);
+require_once $dir.$file;
+$objmodel = new $classname($db);
 
 
 // Define target path
-$dirname = $conf->banque->dir_temp;
-$filename = 'export-bank-receipts-'.$bankref.'-'.$num.'.'.$objmodel->extension;
+$dirname = $conf->banque->dir_temp;
+$filename = 'export-bank-receipts-'.$bankref.'-'.$num.'.'.$objmodel->extension;
 
 
 $array_fields=array(
@@ -154,21 +154,21 @@ $array_fields=array(
 'soldbefore'=>$outputlangs->transnoentitiesnoconv("BankBalanceBefore"), 'soldafter'=>$outputlangs->transnoentitiesnoconv("BankBalanceAfter"),
 'comment'=>$outputlangs->transnoentitiesnoconv("Comment")
 );
-$array_selected=array(
-'bankreceipt'=>'bankreceipt', 'bankaccount'=>'bankaccount',
-'dateop'=>'dateop','dateval'=>'dateval','type'=>'type',
-'description'=>'description', 'thirdparty'=>'thirdparty', 'accountelem'=>'accountelem',
+$array_selected=array(
+'bankreceipt'=>'bankreceipt', 'bankaccount'=>'bankaccount',
+'dateop'=>'dateop','dateval'=>'dateval','type'=>'type',
+'description'=>'description', 'thirdparty'=>'thirdparty', 'accountelem'=>'accountelem',
 'debit'=>'debit', 'credit'=>'credit',
 'soldbefore'=>'soldbefore','soldafter'=>'soldafter',
-'comment'=>'comment'
-);
+'comment'=>'comment'
+);
 $array_export_TypeFields=array(
-'bankreceipt'=>'Text', 'bankaccount'=>'Text',
-'dateop'=>'Date','dateval'=>'Date','type'=>'Text',
-'description'=>'Text', 'thirdparty'=>'Text', 'accountelem'=>'Text',
+'bankreceipt'=>'Text', 'bankaccount'=>'Text',
+'dateop'=>'Date','dateval'=>'Date','type'=>'Text',
+'description'=>'Text', 'thirdparty'=>'Text', 'accountelem'=>'Text',
 'debit'=>'Number', 'credit'=>'Number',
 'soldbefore'=>'Number','soldafter'=>'Number',
-'comment'=>'Text'
+'comment'=>'Text'
 );
 
 
@@ -180,69 +180,69 @@ foreach($arraynum as $val)
 	if ($listofnum != "'") $listofnum.="','";
 	$listofnum.=$val;
 }
-$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.= " 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;
+$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.= " 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)
 {
-	$balancebefore=array();
+	$balancebefore=array();
 
 	$numrows = $db->num_rows($resql);
 
 	if ($numrows > 0)
 	{
-		// Open file
-		print 'Open file '.$filename.' into directory '.$dirname."\n";
-		dol_mkdir($dirname);
-		$result=$objmodel->open_file($dirname."/".$filename, $outputlangs);
-
-		if ($result < 0)
+		// Open file
+		print 'Open file '.$filename.' into directory '.$dirname."\n";
+		dol_mkdir($dirname);
+		$result=$objmodel->open_file($dirname."/".$filename, $outputlangs);
+
+		if ($result < 0)
 		{
-			print 'Failed to create file '.$filename.' into dir '.$dirname.'.'."\n";
+			print 'Failed to create file '.$filename.' into dir '.$dirname.'.'."\n";
 			return -1;
-		}
-
-		// Genere en-tete
-		$objmodel->write_header($outputlangs);
-
-		// Genere ligne de titre
-		$objmodel->write_title($array_fields,$array_selected,$outputlangs,$array_export_TypeFields);
-	}
+		}
+
+		// Genere en-tete
+		$objmodel->write_header($outputlangs);
+
+		// Genere ligne de titre
+		$objmodel->write_title($array_fields,$array_selected,$outputlangs,$array_export_TypeFields);
+	}
 
 	$i=0;
-	while ($i < $numrows)
+	while ($i < $numrows)
 	{
-		$thirdparty='';
+		$thirdparty='';
 		$accountelem='';
-		$comment='';
-
-		$objp = $db->fetch_object($resql);
+		$comment='';
+
+		$objp = $db->fetch_object($resql);
 
 		// Calculate start balance
 		if (! isset($balancebefore[$objp->num_releve]))
-		{
+		{
 			print 'Calculate start balance for receipt '.$objp->num_releve."\n";
 
-			$sql2 = "SELECT sum(b.amount) as amount";
-			$sql2.= " FROM ".MAIN_DB_PREFIX."bank as b";
-			$sql2.= " WHERE b.num_releve < '".$db->escape($objp->num_releve)."'";
-			$sql2.= " AND b.fk_account = ".$objp->bankid;
-			$resql2=$db->query($sql2);
-			if ($resql2)
-			{
-				$obj2=$db->fetch_object($resql2);
-				$balancebefore[$objp->num_releve] = ($obj2->amount?$obj2->amount:0);
-				$db->free($resql2);
+			$sql2 = "SELECT sum(b.amount) as amount";
+			$sql2.= " FROM ".MAIN_DB_PREFIX."bank as b";
+			$sql2.= " WHERE b.num_releve < '".$db->escape($objp->num_releve)."'";
+			$sql2.= " AND b.fk_account = ".$objp->bankid;
+			$resql2=$db->query($sql2);
+			if ($resql2)
+			{
+				$obj2=$db->fetch_object($resql2);
+				$balancebefore[$objp->num_releve] = ($obj2->amount?$obj2->amount:0);
+				$db->free($resql2);
 			}
 			else
 			{
@@ -254,44 +254,44 @@ if ($resql)
 		}
 
 		$totalbefore = $total;
-		$total = $total + $objp->amount;
-
-		$var=!$var;
-
-		// Date operation
-		$dateop=$db->jdate($objp->do);
-
-		// Date de valeur
-		$datevalue=$db->jdate($objp->dv);
-
-		// Num cheque
-		$numchq=($objp->num_chq?$objp->num_chq:'');
-
-		// Libelle
-		$reg=array();
-		preg_match('/\((.+)\)/i',$objp->label,$reg);	// Si texte entoure de parenthese on tente recherche de traduction
-		if ($reg[1] && $langs->transnoentitiesnoconv($reg[1])!=$reg[1]) $description=$langs->transnoentitiesnoconv($reg[1]);
-		else $description=$objp->label;
+		$total = $total + $objp->amount;
 
-		/*
-		 * Ajout les liens (societe, company...)
-		 */
-		$links = $acct->get_url($objp->rowid);
-		foreach($links as $key=>$val)
-		{
-			if ($links[$key]['type']=='payment')
-			{
+		$var=!$var;
+
+		// Date operation
+		$dateop=$db->jdate($objp->do);
+
+		// Date de valeur
+		$datevalue=$db->jdate($objp->dv);
+
+		// Num cheque
+		$numchq=($objp->num_chq?$objp->num_chq:'');
+
+		// Libelle
+		$reg=array();
+		preg_match('/\((.+)\)/i',$objp->label,$reg);	// Si texte entoure de parenthese on tente recherche de traduction
+		if ($reg[1] && $langs->transnoentitiesnoconv($reg[1])!=$reg[1]) $description=$langs->transnoentitiesnoconv($reg[1]);
+		else $description=$objp->label;
+
+		/*
+		 * Ajout les liens (societe, company...)
+		 */
+		$links = $acct->get_url($objp->rowid);
+		foreach($links as $key=>$val)
+		{
+			if ($links[$key]['type']=='payment')
+			{
 				$paymentstatic->fetch($links[$key]['url_id']);
-				$tmparray=$paymentstatic->getBillsArray('');
+				$tmparray=$paymentstatic->getBillsArray('');
 				foreach($tmparray as $key => $val)
 				{
 					$invoicestatic->fetch($val);
 					if ($accountelem) $accountelem.= ', ';
 					$accountelem.=$invoicestatic->ref;
 				}
-			}
-			elseif ($links[$key]['type']=='payment_supplier')
-			{
+			}
+			elseif ($links[$key]['type']=='payment_supplier')
+			{
 				$paymentsupplierstatic->fetch($links[$key]['url_id']);
 				$tmparray=$paymentsupplierstatic->getBillsArray('');
 				foreach($tmparray as $key => $val)
@@ -300,94 +300,94 @@ if ($resql)
 					if ($accountelem) $accountelem.= ', ';
 					$accountelem.=$invoicesupplierstatic->ref;
 				}
-			}
-			elseif ($links[$key]['type']=='payment_sc')
+			}
+			elseif ($links[$key]['type']=='payment_sc')
 			{
-				$paymentsocialcontributionstatic->fetch($links[$key]['url_id']);
+				$paymentsocialcontributionstatic->fetch($links[$key]['url_id']);
 				if ($accountelem) $accountelem.= ', ';
 				$accountelem.=$langs->transnoentitiesnoconv("SocialContribution").' '.$paymentsocialcontributionstatic->ref;
-			}
-			elseif ($links[$key]['type']=='payment_vat')
-			{
+			}
+			elseif ($links[$key]['type']=='payment_vat')
+			{
 				$paymentvatstatic->fetch($links[$key]['url_id']);
-				if ($accountelem) $accountelem.= ', ';
+				if ($accountelem) $accountelem.= ', ';
 				$accountelem.=$langs->transnoentitiesnoconv("VATPayments").' '.$paymentvatstatic->ref;
-			}
+			}
 			elseif ($links[$key]['type']=='banktransfert')
 			{
-				$comment=$outputlangs->transnoentitiesnoconv("Transfer");
-				if ($objp->amount > 0)
-				{
+				$comment=$outputlangs->transnoentitiesnoconv("Transfer");
+				if ($objp->amount > 0)
+				{
 					if ($comment) $comment.= ' ';
-					$banklinestatic->fetch($links[$key]['url_id']);
-					$bankstatic->id=$banklinestatic->fk_account;
-					$bankstatic->label=$banklinestatic->bank_account_label;
-					$comment.= ' ('.$langs->transnoentitiesnoconv("from").' ';
-					$comment.= $bankstatic->getNomUrl(1,'transactions');
-					$comment.= ' '.$langs->transnoentitiesnoconv("toward").' ';
-					$bankstatic->id=$objp->bankid;
-					$bankstatic->label=$objp->bankref;
-					$comment.= $bankstatic->getNomUrl(1,'');
-					$comment.= ')';
-				}
-				else
-				{
+					$banklinestatic->fetch($links[$key]['url_id']);
+					$bankstatic->id=$banklinestatic->fk_account;
+					$bankstatic->label=$banklinestatic->bank_account_label;
+					$comment.= ' ('.$langs->transnoentitiesnoconv("from").' ';
+					$comment.= $bankstatic->getNomUrl(1,'transactions');
+					$comment.= ' '.$langs->transnoentitiesnoconv("toward").' ';
+					$bankstatic->id=$objp->bankid;
+					$bankstatic->label=$objp->bankref;
+					$comment.= $bankstatic->getNomUrl(1,'');
+					$comment.= ')';
+				}
+				else
+				{
 					if ($comment) $comment.= ' ';
-					$bankstatic->id=$objp->bankid;
-					$bankstatic->label=$objp->bankref;
-					$comment.= ' ('.$langs->transnoentitiesnoconv("from").' ';
-					$comment.= $bankstatic->getNomUrl(1,'');
-					$comment.= ' '.$langs->transnoentitiesnoconv("toward").' ';
-					$banklinestatic->fetch($links[$key]['url_id']);
-					$bankstatic->id=$banklinestatic->fk_account;
-					$bankstatic->label=$banklinestatic->bank_account_label;
-					$comment.= $bankstatic->getNomUrl(1,'transactions');
-					$comment.= ')';
-				}
-			}
+					$bankstatic->id=$objp->bankid;
+					$bankstatic->label=$objp->bankref;
+					$comment.= ' ('.$langs->transnoentitiesnoconv("from").' ';
+					$comment.= $bankstatic->getNomUrl(1,'');
+					$comment.= ' '.$langs->transnoentitiesnoconv("toward").' ';
+					$banklinestatic->fetch($links[$key]['url_id']);
+					$bankstatic->id=$banklinestatic->fk_account;
+					$bankstatic->label=$banklinestatic->bank_account_label;
+					$comment.= $bankstatic->getNomUrl(1,'transactions');
+					$comment.= ')';
+				}
+			}
 			elseif ($links[$key]['type']=='company')
-			{
+			{
 				if ($thirdparty) $thirdparty.= ', ';
-				$thirdparty.= dol_trunc($links[$key]['label'],24);
-				$newline=0;
-			}
+				$thirdparty.= dol_trunc($links[$key]['label'],24);
+				$newline=0;
+			}
 			elseif ($links[$key]['type']=='member')
-			{
+			{
 				if ($thirdparty) $accountelem.= ', ';
-				$thirdparty.= $links[$key]['label'];
-				$newline=0;
-			}
+				$thirdparty.= $links[$key]['label'];
+				$newline=0;
+			}
 			/*elseif ($links[$key]['type']=='sc')
-				{
+				{
 			if ($accountelem) $accountelem.= ', ';
-			//$accountelem.= '<a href="'.DOL_URL_ROOT.'/compta/sociales/charges.php?id='.$links[$key]['url_id'].'">';
-			//$accountelem.= img_object($langs->transnoentitiesnoconv('ShowBill'),'bill').' ';
-			$accountelem.= $langs->transnoentitiesnoconv("SocialContribution");
-			//$accountelem.= '</a>';
-			$newline=0;
-			}
+			//$accountelem.= '<a href="'.DOL_URL_ROOT.'/compta/sociales/charges.php?id='.$links[$key]['url_id'].'">';
+			//$accountelem.= img_object($langs->transnoentitiesnoconv('ShowBill'),'bill').' ';
+			$accountelem.= $langs->transnoentitiesnoconv("SocialContribution");
+			//$accountelem.= '</a>';
+			$newline=0;
+			}
 			else
-			{
+			{
 			if ($accountelem) $accountelem.= ', ';
-			//$accountelem.= '<a href="'.$links[$key]['url'].$links[$key]['url_id'].'">';
-			$accountelem.= $links[$key]['label'];
-			//$accountelem.= '</a>';
-			$newline=0;
-			}*/
+			//$accountelem.= '<a href="'.$links[$key]['url'].$links[$key]['url_id'].'">';
+			$accountelem.= $links[$key]['label'];
+			//$accountelem.= '</a>';
+			$newline=0;
+			}*/
 		}
 
 		$debit=$credit='';
-		if ($objp->amount < 0)
-		{
-			$totald = $totald + abs($objp->amount);
-			$debit=price2num($objp->amount * -1);
-		}
-		else
-		{
-			$totalc = $totalc + abs($objp->amount);
-			$credit=price2num($objp->amount);
-		}
-
+		if ($objp->amount < 0)
+		{
+			$totald = $totald + abs($objp->amount);
+			$debit=price2num($objp->amount * -1);
+		}
+		else
+		{
+			$totalc = $totalc + abs($objp->amount);
+			$credit=price2num($objp->amount);
+		}
+
 		$i++;
 
 		$rec=new stdClass();
@@ -399,25 +399,25 @@ if ($resql)
 		$rec->description=$description;
 		$rec->thirdparty=$thirdparty;
 		$rec->accountelem=$accountelem;
-		$rec->debit=$debit;
-		$rec->credit=$credit;
+		$rec->debit=$debit;
+		$rec->credit=$credit;
 		$rec->sold=$sold;
 		$rec->comment=$comment;
 		$rec->soldbefore=price2num($totalbefore);
-		$rec->soldafter=price2num($total);
+		$rec->soldafter=price2num($total);
 
-		// end of special operation processing
+		// end of special operation processing
 		$objmodel->write_record($array_selected,$rec,$outputlangs,$array_export_TypeFields);
 	}
 
 	if ($numrows > 0)
 	{
-		print "Found ".$numrows." records for receipt ".$num."\n";
-
-		// Genere en-tete
-		$objmodel->write_footer($outputlangs);
-
-		// Close file
+		print "Found ".$numrows." records for receipt ".$num."\n";
+
+		// Genere en-tete
+		$objmodel->write_footer($outputlangs);
+
+		// Close file
 		$objmodel->close_file();
 
 		print 'File '.$filename.' was generated into dir '.$dirname.'.'."\n";
diff --git a/scripts/company/export-contacts-xls-example.php b/scripts/company/export-contacts-xls-example.php
index 589b1eb5014..e3b4830f180 100644
--- a/scripts/company/export-contacts-xls-example.php
+++ b/scripts/company/export-contacts-xls-example.php
@@ -49,8 +49,8 @@ require_once(PHPEXCEL_PATH."/PHPExcel.php");
 //require_once(PHPEXCEL_PATH."/PHPExcel/Writer/Excel2007.php");
 require_once(PHPEXCEL_PATH."/PHPExcel/Writer/Excel5.php");
 
-// Global variables
-$version=DOL_VERSION;
+// Global variables
+$version=DOL_VERSION;
 $error=0;
 
 
@@ -58,8 +58,8 @@ $error=0;
  * Main
  */
 
-@set_time_limit(0);
-print "***** ".$script_file." (".$version.") pid=".getmypid()." *****\n";
+@set_time_limit(0);
+print "***** ".$script_file." (".$version.") pid=".getmypid()." *****\n";
 
 $fname = DOL_DATA_ROOT.'/export-contacts.xls';
 
diff --git a/scripts/contracts/email_expire_services_to_customers.php b/scripts/contracts/email_expire_services_to_customers.php
index 946d7fac724..d60d5a86a5a 100755
--- a/scripts/contracts/email_expire_services_to_customers.php
+++ b/scripts/contracts/email_expire_services_to_customers.php
@@ -55,16 +55,16 @@ $langs->load('main');
 $langs->load('contracts');
 
 
-// Global variables
-$version=DOL_VERSION;
-$error=0;
-
-
+// Global variables
+$version=DOL_VERSION;
+$error=0;
+
+
 /*
  * Main
  */
 
-@set_time_limit(0);
+@set_time_limit(0);
 print "***** ".$script_file." (".$version.") pid=".getmypid()." *****\n";
 
 $now=dol_now('tzserver');
@@ -72,7 +72,7 @@ $duration_value=isset($argv[2])?$argv[2]:'none';
 
 print $script_file." launched with mode ".$mode.(is_numeric($duration_value)?" delay=".$duration_value:"")."\n";
 
-if ($mode != 'confirm') $conf->global->MAIN_DISABLE_ALL_MAILS=1;
+if ($mode != 'confirm') $conf->global->MAIN_DISABLE_ALL_MAILS=1;
 
 $sql  = "SELECT DISTINCT s.nom as name, c.ref, cd.date_fin_validite, cd.total_ttc, p.label label, s.email, s.default_lang";
 $sql .= " FROM ".MAIN_DB_PREFIX."societe AS s";
@@ -110,10 +110,10 @@ if ($resql)
                 {
                    	envoi_mail($mode,$oldemail,$message,$total,$oldlang,$oldcustomer,$duration_value);
                 }
-                else
-				{
-                	if ($oldemail != 'none') print "- No email sent for ".$oldcustomer.", total: ".$total."\n";
-                }
+                else
+				{
+                	if ($oldemail != 'none') print "- No email sent for ".$oldcustomer.", total: ".$total."\n";
+                }
                 $oldemail = $obj->email;
                 $oldlang = $obj->lang;
                 $oldcustomer=$obj->name;
@@ -133,9 +133,9 @@ if ($resql)
             print "Service to expire ".$obj->ref.", label ".$obj->label.", due date ".dol_print_date($db->jdate($obj->date_fin_validite),'day')." (linked to company ".$obj->nom.", sale representative ".dolGetFirstLastname($obj->firstname, $obj->lastname).", email ".$obj->email."): ";
             if (dol_strlen($obj->email)) print "qualified.";
             else print "disqualified (no email).";
-			print "\n";
+			print "\n";
 
-            $total += $obj->total_ttc;
+            $total += $obj->total_ttc;
 
             $i++;
         }
@@ -147,9 +147,9 @@ if ($resql)
             {
        			envoi_mail($mode,$oldemail,$message,$total,$oldlang,$oldcustomer,$duration_value);
             }
-            else
-			{
-            	if ($oldemail != 'none') print "- No email sent for ".$oldcustomer.", total: ".$total."\n";
+            else
+			{
+            	if ($oldemail != 'none') print "- No email sent for ".$oldcustomer.", total: ".$total."\n";
             }
         }
     }
@@ -181,7 +181,7 @@ function envoi_mail($mode,$oldemail,$message,$total,$userlang,$oldcustomer,$dura
 {
     global $conf,$langs;
 
-    if (getenv('DOL_FORCE_EMAIL_TO')) $oldemail=getenv('DOL_FORCE_EMAIL_TO');
+    if (getenv('DOL_FORCE_EMAIL_TO')) $oldemail=getenv('DOL_FORCE_EMAIL_TO');
 
     $newlangs=new Translate('',$conf);
     $newlangs->setDefaultLang(empty($userlang)?(empty($conf->global->MAIN_LANG_DEFAULT)?'auto':$conf->global->MAIN_LANG_DEFAULT):$userlang);
diff --git a/scripts/contracts/email_expire_services_to_representatives.php b/scripts/contracts/email_expire_services_to_representatives.php
index 8363bbf2277..e5701458152 100755
--- a/scripts/contracts/email_expire_services_to_representatives.php
+++ b/scripts/contracts/email_expire_services_to_representatives.php
@@ -55,16 +55,16 @@ $langs->load('main');
 $langs->load('contracts');
 
 
-// Global variables
-$version=DOL_VERSION;
-$error=0;
-
-
+// Global variables
+$version=DOL_VERSION;
+$error=0;
+
+
 /*
  * Main
  */
 
-@set_time_limit(0);
+@set_time_limit(0);
 print "***** ".$script_file." (".$version.") pid=".getmypid()." *****\n";
 
 $now=dol_now('tzserver');
@@ -72,7 +72,7 @@ $duration_value=isset($argv[2])?$argv[2]:'none';
 
 print $script_file." launched with mode ".$mode.(is_numeric($duration_value)?" delay=".$duration_value:"")."\n";
 
-if ($mode != 'confirm') $conf->global->MAIN_DISABLE_ALL_MAILS=1;
+if ($mode != 'confirm') $conf->global->MAIN_DISABLE_ALL_MAILS=1;
 
 $sql  = "SELECT DISTINCT s.nom, c.ref, cd.date_fin_validite, cd.total_ttc, p.label label, c.fk_soc,u.rowid AS uid, u.lastname, u.firstname, u.email, u.lang";
 $sql .= " FROM ".MAIN_DB_PREFIX."societe AS s, ".MAIN_DB_PREFIX."contrat AS c, ".MAIN_DB_PREFIX."contratdet AS cd";
@@ -147,10 +147,10 @@ if ($resql)
             {
        			envoi_mail($mode,$oldemail,$message,$total,$oldlang,$oldsalerepresentative,$duration_value);
             }
-            else
-			{
-            	if ($oldemail != 'none') print "- No email sent for ".$oldsalerepresentative.", total: ".$total."\n";
-            }
+            else
+			{
+            	if ($oldemail != 'none') print "- No email sent for ".$oldsalerepresentative.", total: ".$total."\n";
+            }
         }
     }
     else
@@ -244,11 +244,11 @@ function envoi_mail($mode,$oldemail,$message,$total,$userlang,$oldsalerepresenta
     if ($mode == 'confirm')
     {
     	$result=$mail->sendfile();
-    	if (! $result)
-    	{
-    		print "Error sending email ".$mail->error."\n";
-    		dol_syslog("Error sending email ".$mail->error."\n");
-    	}
+    	if (! $result)
+    	{
+    		print "Error sending email ".$mail->error."\n";
+    		dol_syslog("Error sending email ".$mail->error."\n");
+    	}
     }
     else
     {
diff --git a/scripts/cron/cron_run_jobs.php b/scripts/cron/cron_run_jobs.php
index 398a2d7f422..63836a979f4 100755
--- a/scripts/cron/cron_run_jobs.php
+++ b/scripts/cron/cron_run_jobs.php
@@ -59,16 +59,16 @@ require_once (DOL_DOCUMENT_ROOT."/cron/class/cronjob.class.php");
 require_once (DOL_DOCUMENT_ROOT.'/user/class/user.class.php');
 require_once (DOL_DOCUMENT_ROOT."/cron/class/cronjob.class.php");
 
-// Global variables
-$version=DOL_VERSION;
-$error=0;
-
-
-/*
- * Main
- */
+// Global variables
+$version=DOL_VERSION;
+$error=0;
 
-@set_time_limit(0);
+
+/*
+ * Main
+ */
+
+@set_time_limit(0);
 print "***** ".$script_file." (".$version.") pid=".getmypid()." *****\n";
 
 // Check security key
diff --git a/scripts/emailings/mailing-send.php b/scripts/emailings/mailing-send.php
index 786704299bf..33b1160ef7e 100755
--- a/scripts/emailings/mailing-send.php
+++ b/scripts/emailings/mailing-send.php
@@ -109,8 +109,8 @@ if ($resql)
 			if ($resql2)
 			{
 				$num2 = $db->num_rows($resql2);
-				dol_syslog("Nb of targets = ".$num2, LOG_DEBUG);
-				print "Nb of targets = ".$num2."\n";
+				dol_syslog("Nb of targets = ".$num2, LOG_DEBUG);
+				print "Nb of targets = ".$num2."\n";
 
 				if ($num2)
 				{
@@ -122,7 +122,7 @@ if ($resql)
 					if (! $resqlstartdate)
 					{
 						dol_print_error($db);
-						$error++;
+						$error++;
 					}
 
 					// Look on each email and sent message
@@ -210,7 +210,7 @@ if ($resql)
 							if (! $resqlok)
 							{
 								dol_print_error($db);
-								$error++;
+								$error++;
 							}
 							else
 							{
@@ -224,7 +224,7 @@ if ($resql)
 									if (! $resqlx)
 									{
 										dol_print_error($db);
-										$error++;
+										$error++;
 									}
 
 					    //Update status communication of contact prospect
@@ -260,11 +260,11 @@ if ($resql)
 						$i++;
 					}
 				}
-				else
-				{
-					$mesg="Emailing id ".$id." has no recipient to target";
-					print $mesg."\n";
-					dol_syslog($mesg,LOG_ERR);
+				else
+				{
+					$mesg="Emailing id ".$id." has no recipient to target";
+					print $mesg."\n";
+					dol_syslog($mesg,LOG_ERR);
 				}
 
 				// Loop finished, set global statut of mail
@@ -291,9 +291,9 @@ if ($resql)
 	}
 	else
 	{
-		$mesg="No validated emailing id to send found.";
-		print $mesg."\n";
-		dol_syslog($mesg,LOG_ERR);
+		$mesg="No validated emailing id to send found.";
+		print $mesg."\n";
+		dol_syslog($mesg,LOG_ERR);
 		$error++;
 	}
 }
diff --git a/scripts/invoices/email_unpaid_invoices_to_customers.php b/scripts/invoices/email_unpaid_invoices_to_customers.php
index 951079e57e7..9260d85cd91 100755
--- a/scripts/invoices/email_unpaid_invoices_to_customers.php
+++ b/scripts/invoices/email_unpaid_invoices_to_customers.php
@@ -54,18 +54,18 @@ require_once (DOL_DOCUMENT_ROOT."/core/class/CMailFile.class.php");
 
 $langs->load('main');
 
-// Global variables
-$version=DOL_VERSION;
-$error=0;
-
-
-
-/*
- * Main
- */
-
-@set_time_limit(0);
-print "***** ".$script_file." (".$version.") pid=".getmypid()." *****\n";
+// Global variables
+$version=DOL_VERSION;
+$error=0;
+
+
+
+/*
+ * Main
+ */
+
+@set_time_limit(0);
+print "***** ".$script_file." (".$version.") pid=".getmypid()." *****\n";
 
 $now=dol_now('tzserver');
 $duration_value=isset($argv[3])?$argv[3]:'none';
@@ -73,7 +73,7 @@ $duration_value=isset($argv[3])?$argv[3]:'none';
 $error = 0;
 print $script_file." launched with mode ".$mode.(is_numeric($duration_value)?" delay=".$duration_value:"")."\n";
 
-if ($mode != 'confirm') $conf->global->MAIN_DISABLE_ALL_MAILS=1;
+if ($mode != 'confirm') $conf->global->MAIN_DISABLE_ALL_MAILS=1;
 
 $sql = "SELECT f.facnumber, f.total_ttc, f.date_lim_reglement as due_date,";
 $sql.= " s.rowid as sid, s.nom as name, s.email, s.default_lang";
@@ -113,8 +113,8 @@ if ($resql)
             // Check if this record is a break after previous one
             $startbreak=false;
 			if ($newemail <> $oldemail || $oldemail == 'none') $startbreak=true;
-			if ($obj->sid && $obj->sid <> $oldsid) $startbreak=true;
-			if ($obj->cid && $obj->cid <> $oldcid) $startbreak=true;
+			if ($obj->sid && $obj->sid <> $oldsid) $startbreak=true;
+			if ($obj->cid && $obj->cid <> $oldcid) $startbreak=true;
 
             if ($startbreak)
             {
@@ -124,14 +124,14 @@ if ($resql)
                    	envoi_mail($mode,$oldemail,$message,$total,$oldlang,$oldtarget);
                    	$trackthirdpartiessent[$oldsid.'|'.$oldemail]='contact id '.$oldcid;
                 }
-                else
+                else
 				{
                 	if ($oldemail != 'none')
                 	{
                 		if (empty($trackthirdpartiessent[$oldsid.'|'.$oldemail])) print "- No email sent for '".$oldtarget."', total: ".$total."\n";
                 		else print "- No email sent for '".$oldtarget."', total: ".$total." (already sent to ".$trackthirdpartiessent[$oldsid.'|'.$oldemail].")\n";
-                	}
-                }
+                	}
+                }
                 $oldemail = $newemail;
                 $oldsid  = $obj->sid;
                 $oldcid  = $obj->cid;
@@ -150,12 +150,12 @@ if ($resql)
             	dol_syslog("email_unpaid_invoices_to_customers.php: ".$newemail." ".$message);
             	$foundtoprocess++;
             }
-            print "Unpaid invoice ".$obj->facnumber.", price ".price2num($obj->total_ttc).", due date ".dol_print_date($db->jdate($obj->due_date),'day')." customer id ".$obj->sid." ".$obj->name.", ".($obj->cid?"contact id ".$obj->cid." ".$obj->clastname." ".$obj->cfirstname.",":"")." email ".$newemail.": ";
-            if (dol_strlen($newemail)) print "qualified.";
-            else print "disqualified (no email).";
-            print "\n";
+            print "Unpaid invoice ".$obj->facnumber.", price ".price2num($obj->total_ttc).", due date ".dol_print_date($db->jdate($obj->due_date),'day')." customer id ".$obj->sid." ".$obj->name.", ".($obj->cid?"contact id ".$obj->cid." ".$obj->clastname." ".$obj->cfirstname.",":"")." email ".$newemail.": ";
+            if (dol_strlen($newemail)) print "qualified.";
+            else print "disqualified (no email).";
+            print "\n";
 
-            $total += $obj->total_ttc;
+            $total += $obj->total_ttc;
 
             $i++;
         }
@@ -168,13 +168,13 @@ if ($resql)
        			envoi_mail($mode,$oldemail,$message,$total,$oldlang,$oldtarget);
        			$trackthirdpartiessent[$oldsid.'|'.$oldemail]='contact id '.$oldcid;
             }
-            else
-			{
+            else
+			{
             	if ($oldemail != 'none')
             	{
             		if (empty($trackthirdpartiessent[$oldsid.'|'.$oldemail])) print "- No email sent for '".$oldtarget."', total: ".$total."\n";
-            		else print "- No email sent for '".$oldtarget."', total: ".$total." (already sent to ".$trackthirdpartiessent[$oldsid.'|'.$oldemail].")\n";
-            	}
+            		else print "- No email sent for '".$oldtarget."', total: ".$total." (already sent to ".$trackthirdpartiessent[$oldsid.'|'.$oldemail].")\n";
+            	}
             }
         }
     }
@@ -205,7 +205,7 @@ function envoi_mail($mode,$oldemail,$message,$total,$userlang,$oldtarget)
 {
     global $conf,$langs;
 
-    if (getenv('DOL_FORCE_EMAIL_TO')) $oldemail=getenv('DOL_FORCE_EMAIL_TO');
+    if (getenv('DOL_FORCE_EMAIL_TO')) $oldemail=getenv('DOL_FORCE_EMAIL_TO');
 
     $newlangs=new Translate('',$conf);
     $newlangs->setDefaultLang(empty($userlang)?(empty($conf->global->MAIN_LANG_DEFAULT)?'auto':$conf->global->MAIN_LANG_DEFAULT):$userlang);
@@ -264,11 +264,11 @@ function envoi_mail($mode,$oldemail,$message,$total,$userlang,$oldtarget)
     if ($mode == 'confirm')
     {
     	$result=$mail->sendfile();
-    	if (! $result)
-    	{
-    		print "Error sending email ".$mail->error."\n";
-    		dol_syslog("Error sending email ".$mail->error."\n");
-    	}
+    	if (! $result)
+    	{
+    		print "Error sending email ".$mail->error."\n";
+    		dol_syslog("Error sending email ".$mail->error."\n");
+    	}
     }
     else
     {
diff --git a/scripts/invoices/email_unpaid_invoices_to_representatives.php b/scripts/invoices/email_unpaid_invoices_to_representatives.php
index a88f2996b3f..2c23512cedb 100755
--- a/scripts/invoices/email_unpaid_invoices_to_representatives.php
+++ b/scripts/invoices/email_unpaid_invoices_to_representatives.php
@@ -72,7 +72,7 @@ $duration_value=isset($argv[2])?$argv[2]:'none';
 
 print $script_file." launched with mode ".$mode.(is_numeric($duration_value)?" delay=".$duration_value:"")."\n";
 
-if ($mode != 'confirm') $conf->global->MAIN_DISABLE_ALL_MAILS=1;
+if ($mode != 'confirm') $conf->global->MAIN_DISABLE_ALL_MAILS=1;
 
 $sql = "SELECT f.facnumber, f.total_ttc, f.date_lim_reglement as due_date, s.nom as name, u.rowid as uid, u.lastname, u.firstname, u.email, u.lang";
 $sql .= " FROM ".MAIN_DB_PREFIX."facture as f";
@@ -239,11 +239,11 @@ function envoi_mail($mode,$oldemail,$message,$total,$userlang,$oldsalerepresenta
     if ($mode == 'confirm')
     {
     	$result=$mail->sendfile();
-    	if (! $result)
-    	{
-    		print "Error sending email ".$mail->error."\n";
-    		dol_syslog("Error sending email ".$mail->error."\n");
-    	}
+    	if (! $result)
+    	{
+    		print "Error sending email ".$mail->error."\n";
+    		dol_syslog("Error sending email ".$mail->error."\n");
+    	}
     }
     else
     {
diff --git a/scripts/invoices/rebuild_merge_pdf.php b/scripts/invoices/rebuild_merge_pdf.php
index 42504bd372e..a53e8940361 100755
--- a/scripts/invoices/rebuild_merge_pdf.php
+++ b/scripts/invoices/rebuild_merge_pdf.php
@@ -122,10 +122,10 @@ foreach ($argv as $key => $value)
 
 		$paymentdateafter=dol_stringtotime($argv[$key+1]);
 		$paymentdatebefore=dol_stringtotime($argv[$key+2]);
-		if (empty($paymentdateafter) || empty($paymentdatebefore))
-		{
-			print 'Error: Bad date format'."\n";
-			exit;
+		if (empty($paymentdateafter) || empty($paymentdatebefore))
+		{
+			print 'Error: Bad date format'."\n";
+			exit;
 		}
 		print 'Rebuild PDF for invoices with at least one payment between '.dol_print_date($paymentdateafter,'day')." and ".dol_print_date($paymentdatebefore,'day').".\n";
 	}
@@ -196,16 +196,16 @@ if (empty($option) && count($filter) <= 0)
 	exit;
 }
 // Check if there is no uncompatible choice
-if (in_array('payments',$filter) && in_array('nopayment',$filter))
-{
-	usage();
-	exit;
-}
-if (in_array('bank',$filter) && in_array('nopayment',$filter))
-{
-	usage();
-	exit;
-}
+if (in_array('payments',$filter) && in_array('nopayment',$filter))
+{
+	usage();
+	exit;
+}
+if (in_array('bank',$filter) && in_array('nopayment',$filter))
+{
+	usage();
+	exit;
+}
 
 
 // Define SQL and SQL request to select invoices
diff --git a/scripts/members/sync_members_ldap2dolibarr.php b/scripts/members/sync_members_ldap2dolibarr.php
index 85687eca95e..1b4fc64457c 100755
--- a/scripts/members/sync_members_ldap2dolibarr.php
+++ b/scripts/members/sync_members_ldap2dolibarr.php
@@ -41,13 +41,13 @@ require_once(DOL_DOCUMENT_ROOT."/adherents/class/adherent.class.php");
 require_once(DOL_DOCUMENT_ROOT."/adherents/class/cotisation.class.php");
 
 $langs->load("main");
-$langs->load("errors");
+$langs->load("errors");
 
 
 // Global variables
 $version=DOL_VERSION;
 $error=0;
-$forcecommit=0;
+$forcecommit=0;
 
 
 
@@ -125,16 +125,16 @@ print "Mapped LDAP fields=".join(',',$required_fields)."\n";
 print "\n";
 
 // Check parameters
-if (empty($conf->global->LDAP_MEMBER_DN))
-{
-	print $langs->trans("Error").': '.$langs->trans("LDAP setup for members not defined inside Dolibarr")."\n";
-	exit(1);
-}
-if ($typeid <= 0)
-{
-	print $langs->trans("Error").': Parameter id_member_type is not a valid ref of an existing member type'."\n";
-	exit(2);
-}
+if (empty($conf->global->LDAP_MEMBER_DN))
+{
+	print $langs->trans("Error").': '.$langs->trans("LDAP setup for members not defined inside Dolibarr")."\n";
+	exit(1);
+}
+if ($typeid <= 0)
+{
+	print $langs->trans("Error").': Parameter id_member_type is not a valid ref of an existing member type'."\n";
+	exit(2);
+}
 
 
 print "Press a key to confirm...";
diff --git a/scripts/user/sync_groups_ldap2dolibarr.php b/scripts/user/sync_groups_ldap2dolibarr.php
index ff9907e43ee..0a010791793 100755
--- a/scripts/user/sync_groups_ldap2dolibarr.php
+++ b/scripts/user/sync_groups_ldap2dolibarr.php
@@ -35,28 +35,28 @@ if (substr($sapi_type, 0, 3) == 'cgi') {
     exit;
 }
 
-require_once($path."../../htdocs/master.inc.php");
-require_once(DOL_DOCUMENT_ROOT."/core/lib/date.lib.php");
-require_once(DOL_DOCUMENT_ROOT."/core/class/ldap.class.php");
-require_once(DOL_DOCUMENT_ROOT."/user/class/user.class.php");
-require_once(DOL_DOCUMENT_ROOT."/user/class/usergroup.class.php");
-
-$langs->load("main");
-$langs->load("errors");
+require_once($path."../../htdocs/master.inc.php");
+require_once(DOL_DOCUMENT_ROOT."/core/lib/date.lib.php");
+require_once(DOL_DOCUMENT_ROOT."/core/class/ldap.class.php");
+require_once(DOL_DOCUMENT_ROOT."/user/class/user.class.php");
+require_once(DOL_DOCUMENT_ROOT."/user/class/usergroup.class.php");
+
+$langs->load("main");
+$langs->load("errors");
 
 
-// Global variables
-$version=DOL_VERSION;
-$error=0;
-$forcecommit=0;
-
-
-/*
- * Main
- */
-
-@set_time_limit(0);
-print "***** ".$script_file." (".$version.") pid=".getmypid()." *****\n";
+// Global variables
+$version=DOL_VERSION;
+$error=0;
+$forcecommit=0;
+
+
+/*
+ * Main
+ */
+
+@set_time_limit(0);
+print "***** ".$script_file." (".$version.") pid=".getmypid()." *****\n";
 
 
 // List of fields to get from LDAP
diff --git a/scripts/user/sync_users_ldap2dolibarr.php b/scripts/user/sync_users_ldap2dolibarr.php
index 13fb7464cd4..89bc4613487 100755
--- a/scripts/user/sync_users_ldap2dolibarr.php
+++ b/scripts/user/sync_users_ldap2dolibarr.php
@@ -34,14 +34,14 @@ if (substr($sapi_type, 0, 3) == 'cgi') {
     exit;
 }
 
-require_once($path."../../htdocs/master.inc.php");
-require_once(DOL_DOCUMENT_ROOT."/core/lib/date.lib.php");
-require_once(DOL_DOCUMENT_ROOT."/core/class/ldap.class.php");
-require_once(DOL_DOCUMENT_ROOT."/user/class/user.class.php");
-
-$langs->load("main");
-$langs->load("errors");
-
+require_once($path."../../htdocs/master.inc.php");
+require_once(DOL_DOCUMENT_ROOT."/core/lib/date.lib.php");
+require_once(DOL_DOCUMENT_ROOT."/core/class/ldap.class.php");
+require_once(DOL_DOCUMENT_ROOT."/user/class/user.class.php");
+
+$langs->load("main");
+$langs->load("errors");
+
 
 // Global variables
 $version=DOL_VERSION;
diff --git a/test/phpunit/AdherentTest.php b/test/phpunit/AdherentTest.php
index d61b3fc6cf2..fe7c51289cb 100644
--- a/test/phpunit/AdherentTest.php
+++ b/test/phpunit/AdherentTest.php
@@ -29,7 +29,7 @@ global $conf,$user,$langs,$db;
 require_once 'PHPUnit/Autoload.php';
 require_once dirname(__FILE__).'/../../htdocs/master.inc.php';
 require_once dirname(__FILE__).'/../../htdocs/adherents/class/adherent.class.php';
-require_once dirname(__FILE__).'/../../htdocs/adherents/class/adherent_type.class.php';
+require_once dirname(__FILE__).'/../../htdocs/adherents/class/adherent_type.class.php';
 
 if (empty($user->id))
 {
diff --git a/test/phpunit/CategorieTest.php b/test/phpunit/CategorieTest.php
index e48fa7739ff..de99d38eb59 100755
--- a/test/phpunit/CategorieTest.php
+++ b/test/phpunit/CategorieTest.php
@@ -191,11 +191,11 @@ class CategorieTest extends PHPUnit_Framework_TestCase
     	$localobject2->tva_npr=1;
     	$result=$localobject2->create($user);
     	$cat = new Categorie($this->savdb);
-    	$cat->id = $catid;
-    	$result=$cat->add_type($localobject2,"product");
+    	$cat->id = $catid;
+    	$result=$cat->add_type($localobject2,"product");
 
-    	print __METHOD__." result=".$result."\n";
-    	$this->assertGreaterThan(0, $result);
+    	print __METHOD__." result=".$result."\n";
+    	$this->assertGreaterThan(0, $result);
 
     	// Get list of categories for product
     	$localcateg=new Categorie($this->savdb);
diff --git a/test/phpunit/NumberingModulesTest.php b/test/phpunit/NumberingModulesTest.php
index 82bb96dc0be..a4f4ad53b0e 100644
--- a/test/phpunit/NumberingModulesTest.php
+++ b/test/phpunit/NumberingModulesTest.php
@@ -160,10 +160,10 @@ class NumberingModulesTest extends PHPUnit_Framework_TestCase
 		$result3=$localobject2->validate($user, $result);		// create invoice by forcing ref
 		print __METHOD__." result=".$result."\n";
 		$this->assertEquals('1916-0002', $result);				// counter must not be reseted so be 2
-		$result=$localobject2->is_erasable();
+		$result=$localobject2->is_erasable();
 		print __METHOD__." is_erasable=".$result."\n";
-		$this->assertEquals(1, $result);						// Can be deleted
-		$result=$localobject->is_erasable();
+		$this->assertEquals(1, $result);						// Can be deleted
+		$result=$localobject->is_erasable();
 		print __METHOD__." is_erasable=".$result."\n";
 		$this->assertEquals(0, $result);						// Case 1 can not be deleted (case 2 is more recent)
 		
@@ -191,9 +191,9 @@ class NumberingModulesTest extends PHPUnit_Framework_TestCase
 		$result3=$localobject->validate($user, $result);
 		print __METHOD__." result=".$result."\n";
 		$this->assertEquals('192001-0001', $result);			// counter must start to 1
-		$result=$localobject->is_erasable();
+		$result=$localobject->is_erasable();
 		print __METHOD__." is_erasable=".$result."\n";
-		$this->assertEquals(1, $result);						// Can be deleted
+		$this->assertEquals(1, $result);						// Can be deleted
 		
 		$localobject2=new Facture($this->savdb);
 		$localobject2->initAsSpecimen();
@@ -204,12 +204,12 @@ class NumberingModulesTest extends PHPUnit_Framework_TestCase
 		$result3=$localobject2->validate($user, $result);
 		print __METHOD__." result=".$result."\n";
     	$this->assertEquals('192101-0001', $result);			// counter must be reseted to 1
-    	$result=$localobject2->is_erasable();
+    	$result=$localobject2->is_erasable();
     	print __METHOD__." is_erasable=".$result."\n";
-    	$this->assertEquals(1, $result);						// Can be deleted
-    	$result=$localobject->is_erasable();
+    	$this->assertEquals(1, $result);						// Can be deleted
+    	$result=$localobject->is_erasable();
     	print __METHOD__." is_erasable=".$result."\n";
-    	$this->assertEquals(1, $result);						// Case 1 can be deleted (because there was a reset for case 2)
+    	$this->assertEquals(1, $result);						// Case 1 can be deleted (because there was a reset for case 2)
     	 
 
 		// Now we try with a different fiscal month (forced by mask)
@@ -228,9 +228,9 @@ class NumberingModulesTest extends PHPUnit_Framework_TestCase
     	$result3=$localobject->validate($user, $result);
     	print __METHOD__." result=".$result."\n";
     	$this->assertEquals('193001-0001', $result);			// counter must start to 1
-    	$result=$numbering->getNextValue($mysoc, $localobject, 'last');
-    	print __METHOD__." result for last=".$result."\n";
-    	$this->assertEquals('193001-0001', $result);			// last ref into reset range should be same than last created
+    	$result=$numbering->getNextValue($mysoc, $localobject, 'last');
+    	print __METHOD__." result for last=".$result."\n";
+    	$this->assertEquals('193001-0001', $result);			// last ref into reset range should be same than last created
 
     	$localobject=new Facture($this->savdb);
     	$localobject->initAsSpecimen();
diff --git a/test/phpunit/UserTest.php b/test/phpunit/UserTest.php
index 088115a64ec..18cbe78c468 100644
--- a/test/phpunit/UserTest.php
+++ b/test/phpunit/UserTest.php
@@ -269,53 +269,53 @@ class UserTest extends PHPUnit_Framework_TestCase
     }
 
 
-    /**
-     * Edit an object to test updates
-     *
-     * @param 	mixed	&$localobject		Object Facture
-     * @return	void
-     */
-    public function changeProperties(&$localobject)
-    {
-    	$localobject->note='New note after update';
-    }
-
-    /**
-     * Compare all public properties values of 2 objects
-     *
-     * @param 	Object		$oA						Object operand 1
-     * @param 	Object		$oB						Object operand 2
-     * @param	boolean		$ignoretype				False will not report diff if type of value differs
-     * @param	array		$fieldstoignorearray	Array of fields to ignore in diff
-     * @return	array								Array with differences
-     */
-    public function objCompare($oA,$oB,$ignoretype=true,$fieldstoignorearray=array('id'))
-    {
-    	$retAr=array();
-
-    	if (get_class($oA) !== get_class($oB))
-    	{
-    		$retAr[]="Supplied objects are not of same class.";
-    	}
-    	else
-    	{
-    		$oVarsA=get_object_vars($oA);
-    		$oVarsB=get_object_vars($oB);
-    		$aKeys=array_keys($oVarsA);
-    		foreach($aKeys as $sKey)
-    		{
-    			if (in_array($sKey,$fieldstoignorearray)) continue;
-    			if (! $ignoretype && $oVarsA[$sKey] !== $oVarsB[$sKey])
-    			{
-    				$retAr[]=$sKey.' : '.(is_object($oVarsA[$sKey])?get_class($oVarsA[$sKey]):$oVarsA[$sKey]).' <> '.(is_object($oVarsB[$sKey])?get_class($oVarsB[$sKey]):$oVarsB[$sKey]);
-    			}
-    			if ($ignoretype && $oVarsA[$sKey] != $oVarsB[$sKey])
-    			{
-    				$retAr[]=$sKey.' : '.(is_object($oVarsA[$sKey])?get_class($oVarsA[$sKey]):$oVarsA[$sKey]).' <> '.(is_object($oVarsB[$sKey])?get_class($oVarsB[$sKey]):$oVarsB[$sKey]);
-    			}
-    		}
-    	}
-    	return $retAr;
+    /**
+     * Edit an object to test updates
+     *
+     * @param 	mixed	&$localobject		Object Facture
+     * @return	void
+     */
+    public function changeProperties(&$localobject)
+    {
+    	$localobject->note='New note after update';
+    }
+
+    /**
+     * Compare all public properties values of 2 objects
+     *
+     * @param 	Object		$oA						Object operand 1
+     * @param 	Object		$oB						Object operand 2
+     * @param	boolean		$ignoretype				False will not report diff if type of value differs
+     * @param	array		$fieldstoignorearray	Array of fields to ignore in diff
+     * @return	array								Array with differences
+     */
+    public function objCompare($oA,$oB,$ignoretype=true,$fieldstoignorearray=array('id'))
+    {
+    	$retAr=array();
+
+    	if (get_class($oA) !== get_class($oB))
+    	{
+    		$retAr[]="Supplied objects are not of same class.";
+    	}
+    	else
+    	{
+    		$oVarsA=get_object_vars($oA);
+    		$oVarsB=get_object_vars($oB);
+    		$aKeys=array_keys($oVarsA);
+    		foreach($aKeys as $sKey)
+    		{
+    			if (in_array($sKey,$fieldstoignorearray)) continue;
+    			if (! $ignoretype && $oVarsA[$sKey] !== $oVarsB[$sKey])
+    			{
+    				$retAr[]=$sKey.' : '.(is_object($oVarsA[$sKey])?get_class($oVarsA[$sKey]):$oVarsA[$sKey]).' <> '.(is_object($oVarsB[$sKey])?get_class($oVarsB[$sKey]):$oVarsB[$sKey]);
+    			}
+    			if ($ignoretype && $oVarsA[$sKey] != $oVarsB[$sKey])
+    			{
+    				$retAr[]=$sKey.' : '.(is_object($oVarsA[$sKey])?get_class($oVarsA[$sKey]):$oVarsA[$sKey]).' <> '.(is_object($oVarsB[$sKey])?get_class($oVarsB[$sKey]):$oVarsB[$sKey]);
+    			}
+    		}
+    	}
+    	return $retAr;
     }
 }
 ?>
\ No newline at end of file

From c9a71439b2b0bb77e4457ed4b9fec93337c6a39b Mon Sep 17 00:00:00 2001
From: Regis Houssin <regis.houssin@capnetworks.com>
Date: Wed, 5 Jun 2013 16:24:32 +0200
Subject: [PATCH 35/43] Fix: EOF

---
 htdocs/adherents/card_subscriptions.php       |    4 +-
 htdocs/adherents/class/adherent.class.php     |   12 +-
 htdocs/adherents/fiche.php                    |   32 +-
 htdocs/adherents/stats/byproperties.php       |    2 +-
 htdocs/adherents/stats/geo.php                |    6 +-
 htdocs/adherents/stats/index.php              |    4 +-
 htdocs/admin/boxes.php                        |    2 +-
 htdocs/admin/clicktodial.php                  |   16 +-
 htdocs/admin/commande.php                     |    4 +-
 htdocs/admin/facture.php                      |   30 +-
 htdocs/admin/system/phpinfo.php               |   20 +-
 htdocs/admin/triggers.php                     |   40 +-
 htdocs/categories/class/categorie.class.php   |    2 +-
 htdocs/categories/index.php                   |    2 +-
 htdocs/categories/viewcat.php                 |  120 +-
 htdocs/comm/action/class/actioncomm.class.php |    4 +-
 htdocs/comm/action/fiche.php                  |   14 +-
 htdocs/comm/action/index.php                  |   24 +-
 htdocs/comm/index.php                         |    2 +-
 htdocs/comm/mailing/cibles.php                |    2 +-
 htdocs/comm/propal/class/propal.class.php     |    8 +-
 .../comm/propal/class/propalestats.class.php  |    2 +-
 htdocs/commande/class/commande.class.php      |   26 +-
 htdocs/commande/class/commandestats.class.php |    2 +-
 htdocs/compta/bank/account.php                |    8 +-
 htdocs/compta/bank/bankid_fr.php              |    8 +-
 htdocs/compta/bank/bilan.php                  |    8 +-
 htdocs/compta/bank/budget.php                 |    8 +-
 htdocs/compta/bank/categ.php                  |    8 +-
 htdocs/compta/bank/fiche.php                  |    8 +-
 htdocs/compta/bank/graph.php                  |   10 +-
 htdocs/compta/bank/index.php                  |    8 +-
 htdocs/compta/bank/info.php                   |    8 +-
 htdocs/compta/bank/rappro.php                 |    8 +-
 htdocs/compta/bank/releve.php                 |  116 +-
 htdocs/compta/bank/search.php                 |    4 +-
 htdocs/compta/bank/treso.php                  |    8 +-
 htdocs/compta/bank/virement.php               |    8 +-
 htdocs/compta/deplacement/stats/index.php     |    2 +-
 htdocs/compta/facture.php                     |    2 +-
 htdocs/compta/facture/class/facture.class.php |  144 +-
 htdocs/compta/facture/stats/index.php         |    4 +-
 htdocs/compta/paiement/cheque/fiche.php       |    6 +-
 htdocs/compta/paiement/cheque/index.php       |    6 +-
 htdocs/compta/paiement/cheque/liste.php       |    6 +-
 .../compta/paiement/class/paiement.class.php  |    2 +-
 htdocs/compta/prelevement/bon.php             |    8 +-
 htdocs/compta/prelevement/bons.php            |    8 +-
 htdocs/compta/prelevement/create.php          |    8 +-
 htdocs/compta/prelevement/demandes.php        |    8 +-
 htdocs/compta/prelevement/factures.php        |    8 +-
 htdocs/compta/prelevement/fiche-rejet.php     |    8 +-
 htdocs/compta/prelevement/fiche-stat.php      |   10 +-
 htdocs/compta/prelevement/fiche.php           |    8 +-
 htdocs/compta/prelevement/index.php           |    8 +-
 htdocs/compta/prelevement/ligne.php           |    8 +-
 htdocs/compta/prelevement/lignes.php          |    8 +-
 htdocs/compta/prelevement/liste.php           |    6 +-
 htdocs/compta/prelevement/rejets.php          |    8 +-
 htdocs/compta/prelevement/stats.php           |    8 +-
 htdocs/compta/tva/fiche.php                   |   10 +-
 htdocs/contact/class/contact.class.php        |   12 +-
 htdocs/contact/note.php                       |  128 +-
 htdocs/core/boxes/box_activity.php            |   24 +-
 .../boxes/box_graph_invoices_permonth.php     |   20 +-
 htdocs/core/class/commonobject.class.php      |   34 +-
 htdocs/core/class/conf.class.php              |   10 +-
 htdocs/core/class/hookmanager.class.php       |    4 +-
 htdocs/core/class/html.form.class.php         |   14 +-
 htdocs/core/class/html.formactions.class.php  |    2 +-
 htdocs/core/class/html.formfile.class.php     |   24 +-
 htdocs/core/class/html.formother.class.php    |   34 +-
 htdocs/core/lib/admin.lib.php                 |   12 +-
 htdocs/core/lib/barcode.lib.php               |    2 +-
 htdocs/core/lib/contact.lib.php               |   10 +-
 htdocs/core/lib/files.lib.php                 |  380 +-
 htdocs/core/lib/functions.lib.php             |   22 +-
 htdocs/core/lib/functions2.lib.php            |   28 +-
 htdocs/core/lib/invoice2.lib.php              |    2 +-
 htdocs/core/lib/security2.lib.php             |    6 +-
 htdocs/core/menus/standard/auguria.lib.php    |   96 +-
 htdocs/core/menus/standard/auguria_menu.php   |   24 +-
 htdocs/core/menus/standard/eldy_menu.php      |   10 +-
 htdocs/core/menus/standard/empty.php          |  104 +-
 htdocs/core/modules/DolibarrModules.class.php |    2 +-
 .../modules/export/export_csv.modules.php     |    2 +-
 .../modules/export/export_excel.modules.php   |   24 +-
 .../modules/import/import_csv.modules.php     |    6 +-
 .../livraison/pdf/pdf_typhon.modules.php      |  168 +-
 htdocs/core/modules/modOpenSurvey.class.php   |   18 +-
 .../mod_facture_fournisseur_cactus.php        |  106 +-
 htdocs/core/search_page.php                   |    4 +-
 htdocs/core/tpl/login.tpl.php                 |    4 +-
 htdocs/core/tpl/passwordforgotten.tpl.php     |   22 +-
 htdocs/cron/list.php                          |   24 +-
 htdocs/exports/index.php                      |    4 +-
 htdocs/fichinter/fiche.php                    | 3624 ++++++++---------
 .../fourn/class/fournisseur.facture.class.php |   62 +-
 htdocs/fourn/facture/fiche.php                |   16 +-
 htdocs/fourn/fiche.php                        |    2 +-
 htdocs/imports/import.php                     |    8 +-
 htdocs/imports/index.php                      |    4 +-
 htdocs/install/upgrade2.php                   |   16 +-
 .../mailmanspip/class/mailmanspip.class.php   |    4 +-
 htdocs/main.inc.php                           |  100 +-
 htdocs/opensurvey/admin/index.php             |   34 +-
 htdocs/opensurvey/adminstuds.php              |   42 +-
 htdocs/opensurvey/adminstuds_preview.php      |  112 +-
 .../class/opensurveysondage.class.php         |   28 +-
 htdocs/opensurvey/fonctions.php               |  318 +-
 htdocs/opensurvey/index.php                   |   20 +-
 htdocs/opensurvey/list.php                    |   44 +-
 htdocs/opensurvey/public/choix_autre.php      |  166 +-
 htdocs/opensurvey/public/choix_date.php       |   92 +-
 htdocs/opensurvey/public/create_survey.php    |   26 +-
 htdocs/opensurvey/public/exportcsv.php        |   48 +-
 htdocs/opensurvey/public/index.php            |   38 +-
 htdocs/opensurvey/public/studs.php            |  234 +-
 htdocs/product/class/product.class.php        |   10 +-
 htdocs/projet/activity/index.php              |    2 +-
 htdocs/public/demo/index.php                  |  130 +-
 htdocs/public/emailing/mailing-read.php       |   14 +-
 .../public/emailing/mailing-unsubscribe.php   |   24 +-
 htdocs/public/offline.php                     |    4 +-
 htdocs/public/paybox/paymentko.php            |   38 +-
 htdocs/public/paybox/paymentok.php            |   84 +-
 htdocs/public/paypal/paymentko.php            |   42 +-
 htdocs/public/paypal/paymentok.php            |   42 +-
 htdocs/societe/checkvat/checkVatPopup.php     |    4 +-
 htdocs/societe/class/societe.class.php        |   18 +-
 htdocs/societe/soc.php                        |   42 +-
 htdocs/support/index.php                      |    2 +-
 htdocs/theme/amarok/graph-color.php           |   10 +-
 htdocs/theme/amarok/style.css.php             |  206 +-
 htdocs/theme/auguria/style.css.php            |    8 +-
 135 files changed, 3998 insertions(+), 3998 deletions(-)

diff --git a/htdocs/adherents/card_subscriptions.php b/htdocs/adherents/card_subscriptions.php
index ba2a80cfa7d..524e6c04e7a 100644
--- a/htdocs/adherents/card_subscriptions.php
+++ b/htdocs/adherents/card_subscriptions.php
@@ -536,8 +536,8 @@ if ($rowid)
     print '<tr><td>'.$langs->trans("Firstname").'</td><td class="valeur">'.$object->firstname.'&nbsp;</td>';
     print '</tr>';
 
-    // EMail
-    print '<tr><td>'.$langs->trans("EMail").'</td><td class="valeur">'.dol_print_email($object->email,0,$object->fk_soc,1).'</td></tr>';
+    // EMail
+    print '<tr><td>'.$langs->trans("EMail").'</td><td class="valeur">'.dol_print_email($object->email,0,$object->fk_soc,1).'</td></tr>';
     
     // Status
     print '<tr><td>'.$langs->trans("Status").'</td><td class="valeur">'.$object->getLibStatut(4).'</td></tr>';
diff --git a/htdocs/adherents/class/adherent.class.php b/htdocs/adherents/class/adherent.class.php
index 344bf615f56..733e8cfdf74 100644
--- a/htdocs/adherents/class/adherent.class.php
+++ b/htdocs/adherents/class/adherent.class.php
@@ -1504,7 +1504,7 @@ class Adherent extends CommonObject
         $langs->load("dict");
 
         $code=$this->civilite_id;
-        return $langs->getLabelFromKey($this->db, "Civility".$code, "c_civilite", "code", "civilite", $code);
+        return $langs->getLabelFromKey($this->db, "Civility".$code, "c_civilite", "code", "civilite", $code);
     }
 
     /**
@@ -1531,11 +1531,11 @@ class Adherent extends CommonObject
             $lien = '<a href="'.DOL_URL_ROOT.'/adherents/card_subscriptions.php?rowid='.$this->id.'">';
             $lienfin='</a>';
         }
-        if ($option == 'category')
-        {
-        	$lien = '<a href="'.DOL_URL_ROOT.'/categories/categorie.php?id='.$this->id.'&type=3">';
-        	$lienfin='</a>';
-        }
+        if ($option == 'category')
+        {
+        	$lien = '<a href="'.DOL_URL_ROOT.'/categories/categorie.php?id='.$this->id.'&type=3">';
+        	$lienfin='</a>';
+        }
 
         $picto='user';
         $label=$langs->trans("ShowMember");
diff --git a/htdocs/adherents/fiche.php b/htdocs/adherents/fiche.php
index c4c62d8285f..1e70df2da8d 100644
--- a/htdocs/adherents/fiche.php
+++ b/htdocs/adherents/fiche.php
@@ -49,8 +49,8 @@ $backtopage=GETPOST('backtopage','alpha');
 $confirm=GETPOST('confirm','alpha');
 $rowid=GETPOST('rowid','int');
 $typeid=GETPOST('typeid','int');
-$userid=GETPOST('userid','int');
-$socid=GETPOST('socid','int');
+$userid=GETPOST('userid','int');
+$socid=GETPOST('socid','int');
 
 if (! empty($conf->mailmanspip->enabled))
 {
@@ -249,16 +249,16 @@ if ($action == 'update' && ! $_POST["cancel"] && $user->rights->adherent->creer)
 	$lastname=$_POST["lastname"];
 	$firstname=$_POST["firstname"];
 	$morphy=$morphy=$_POST["morphy"];;
-	if ($morphy != 'mor' && empty($lastname)) {
-		$error++;
-		$langs->load("errors");
-		$errmsg .= $langs->trans("ErrorFieldRequired",$langs->transnoentities("Lastname"))."<br>\n";
-	}
-	if ($morphy != 'mor' && (!isset($firstname) || $firstname=='')) {
-		$error++;
-		$langs->load("errors");
-		$errmsg .= $langs->trans("ErrorFieldRequired",$langs->transnoentities("Firstname"))."<br>\n";
-	}
+	if ($morphy != 'mor' && empty($lastname)) {
+		$error++;
+		$langs->load("errors");
+		$errmsg .= $langs->trans("ErrorFieldRequired",$langs->transnoentities("Lastname"))."<br>\n";
+	}
+	if ($morphy != 'mor' && (!isset($firstname) || $firstname=='')) {
+		$error++;
+		$langs->load("errors");
+		$errmsg .= $langs->trans("ErrorFieldRequired",$langs->transnoentities("Firstname"))."<br>\n";
+	}
 
 	// Create new object
 	if ($result > 0 && ! $error)
@@ -383,7 +383,7 @@ if ($action == 'update' && ! $_POST["cancel"] && $user->rights->adherent->creer)
 				else
 				{
 					setEventMessage($object->mesgs, 'mesgs');
-				}
+				}
 			}
 
 			$rowid=$object->id;
@@ -715,7 +715,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action))
 	{
 		$object = new Adherent($db);
 		$result=$object->fetch($rowid);
-		if ($result <= 0) dol_print_error('',$object->error);
+		if ($result <= 0) dol_print_error('',$object->error);
 	}
    	$objcanvas->assign_values($action, $object->id, $object->ref);	// Set value for templates
     $objcanvas->display_canvas($action);							// Show template
@@ -1409,8 +1409,8 @@ else
 		// Firstname
 		print '<tr><td>'.$langs->trans("Firstname").'</td><td class="valeur">'.$object->firstname.'&nbsp;</td></tr>';
 
-		// EMail
-		print '<tr><td>'.$langs->trans("EMail").'</td><td class="valeur">'.dol_print_email($object->email,0,$object->fk_soc,1).'</td></tr>';
+		// EMail
+		print '<tr><td>'.$langs->trans("EMail").'</td><td class="valeur">'.dol_print_email($object->email,0,$object->fk_soc,1).'</td></tr>';
 		
 		// Password
 		if (empty($conf->global->ADHERENT_LOGIN_NOT_REQUIRED))
diff --git a/htdocs/adherents/stats/byproperties.php b/htdocs/adherents/stats/byproperties.php
index 7c1cc07ad69..b84350528d4 100755
--- a/htdocs/adherents/stats/byproperties.php
+++ b/htdocs/adherents/stats/byproperties.php
@@ -44,7 +44,7 @@ $year = strftime("%Y", time());
 $startyear=$year-2;
 $endyear=$year;
 
-$langs->load("members");
+$langs->load("members");
 $langs->load("companies");
 
 
diff --git a/htdocs/adherents/stats/geo.php b/htdocs/adherents/stats/geo.php
index 38a47555706..090e414c548 100755
--- a/htdocs/adherents/stats/geo.php
+++ b/htdocs/adherents/stats/geo.php
@@ -23,9 +23,9 @@
 
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/member.lib.php';
-require_once DOL_DOCUMENT_ROOT.'/core/class/dolgraph.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/dolgraph.class.php';
 
-$graphwidth=DolGraph::getDefaultGraphSizeForStats('width',700);
+$graphwidth=DolGraph::getDefaultGraphSizeForStats('width',700);
 $mapratio = 0.5;
 $graphheight = round($graphwidth * $mapratio);
 
@@ -44,7 +44,7 @@ $year = strftime("%Y", time());
 $startyear=$year-2;
 $endyear=$year;
 
-$langs->load("members");
+$langs->load("members");
 $langs->load("companies");
 
 
diff --git a/htdocs/adherents/stats/index.php b/htdocs/adherents/stats/index.php
index 7ca24d5bd4f..6d0fcf6bb9e 100644
--- a/htdocs/adherents/stats/index.php
+++ b/htdocs/adherents/stats/index.php
@@ -46,8 +46,8 @@ $year = strftime("%Y", time());
 $startyear=$year-2;
 $endyear=$year;
 
-$langs->load("members");
-$langs->load("companies");
+$langs->load("members");
+$langs->load("companies");
 
 
 /*
diff --git a/htdocs/admin/boxes.php b/htdocs/admin/boxes.php
index d5bdedc01d5..31d313b84e9 100644
--- a/htdocs/admin/boxes.php
+++ b/htdocs/admin/boxes.php
@@ -347,7 +347,7 @@ foreach($boxtoadd as $box)
     print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
     print '<tr '.$bc[$var].'>';
     print '<td>'.img_object("",$logo).' '.$langs->transnoentitiesnoconv($box->boxlabel);
-    if (! empty($box->class) && preg_match('/graph_/',$box->class)) print ' ('.$langs->trans("Graph").')';
+    if (! empty($box->class) && preg_match('/graph_/',$box->class)) print ' ('.$langs->trans("Graph").')';
     print '</td>';
     print '<td>';
     if ($box->note == '(WarningUsingThisBoxSlowDown)')
diff --git a/htdocs/admin/clicktodial.php b/htdocs/admin/clicktodial.php
index 726bd912964..41a3f02838d 100644
--- a/htdocs/admin/clicktodial.php
+++ b/htdocs/admin/clicktodial.php
@@ -84,11 +84,11 @@ print '<br>';
 print $langs->trans("ClickToDialUrlDesc").'<br>';
 print $langs->trans("Example").':<br>http://myphoneserver/mypage?login=__LOGIN__&password=__PASS__&caller=__PHONEFROM__&called=__PHONETO__';
 
-//if (! empty($user->clicktodial_url))
-//{
-	print '<br>';
-	print info_admin($langs->trans("ValueOverwrittenByUserSetup"));
-//}
+//if (! empty($user->clicktodial_url))
+//{
+	print '<br>';
+	print info_admin($langs->trans("ValueOverwrittenByUserSetup"));
+//}
 
 print '</td></tr>';
 
@@ -113,9 +113,9 @@ if (! empty($conf->global->CLICKTODIAL_URL))
 	print '</form>';
 
 	$setupcomplete=1;
-	if (preg_match('/__LOGIN__/',$conf->global->CLICKTODIAL_URL) && empty($user->clicktodial_login)) $setupcomplete=0;
-	if (preg_match('/__PASSWORD__/',$conf->global->CLICKTODIAL_URL) && empty($user->clicktodial_password)) $setupcomplete=0;
-	if (preg_match('/__PHONEFROM__/',$conf->global->CLICKTODIAL_URL) && empty($user->clicktodial_poste)) $setupcomplete=0;
+	if (preg_match('/__LOGIN__/',$conf->global->CLICKTODIAL_URL) && empty($user->clicktodial_login)) $setupcomplete=0;
+	if (preg_match('/__PASSWORD__/',$conf->global->CLICKTODIAL_URL) && empty($user->clicktodial_password)) $setupcomplete=0;
+	if (preg_match('/__PHONEFROM__/',$conf->global->CLICKTODIAL_URL) && empty($user->clicktodial_poste)) $setupcomplete=0;
 
 	if ($setupcomplete)
 	{
diff --git a/htdocs/admin/commande.php b/htdocs/admin/commande.php
index 391b399ceaa..bc586140250 100644
--- a/htdocs/admin/commande.php
+++ b/htdocs/admin/commande.php
@@ -44,8 +44,8 @@ if (! $user->admin) accessforbidden();
 
 $action = GETPOST('action','alpha');
 $value = GETPOST('value','alpha');
-$label = GETPOST('label','alpha');
-$scandir = GETPOST('scandir','alpha');
+$label = GETPOST('label','alpha');
+$scandir = GETPOST('scandir','alpha');
 $type = 'order';
 
 
diff --git a/htdocs/admin/facture.php b/htdocs/admin/facture.php
index 4f7f0729472..5da3ad27183 100644
--- a/htdocs/admin/facture.php
+++ b/htdocs/admin/facture.php
@@ -40,8 +40,8 @@ if (! $user->admin) accessforbidden();
 
 $action = GETPOST('action','alpha');
 $value = GETPOST('value','alpha');
-$label = GETPOST('label','alpha');
-$scandir = GETPOST('scandir','alpha');
+$label = GETPOST('label','alpha');
+$scandir = GETPOST('scandir','alpha');
 $type='invoice';
 
 
@@ -158,19 +158,19 @@ else if ($action == 'del')
 // Set default model
 else if ($action == 'setdoc')
 {
-	if (dolibarr_set_const($db, "FACTURE_ADDON_PDF",$value,'chaine',0,'',$conf->entity))
-	{
-		// La constante qui a ete lue en avant du nouveau set
-		// on passe donc par une variable pour avoir un affichage coherent
-		$conf->global->FACTURE_ADDON_PDF = $value;
-	}
-	
-	// On active le modele
-	$ret = delDocumentModel($value, $type);
-	if ($ret > 0)
-	{
-		$ret = addDocumentModel($value, $type, $label, $scandir);
-	}
+	if (dolibarr_set_const($db, "FACTURE_ADDON_PDF",$value,'chaine',0,'',$conf->entity))
+	{
+		// La constante qui a ete lue en avant du nouveau set
+		// on passe donc par une variable pour avoir un affichage coherent
+		$conf->global->FACTURE_ADDON_PDF = $value;
+	}
+	
+	// On active le modele
+	$ret = delDocumentModel($value, $type);
+	if ($ret > 0)
+	{
+		$ret = addDocumentModel($value, $type, $label, $scandir);
+	}
 }
 
 else if ($action == 'setmod')
diff --git a/htdocs/admin/system/phpinfo.php b/htdocs/admin/system/phpinfo.php
index c6e2819f5d7..bbb2c60e51f 100644
--- a/htdocs/admin/system/phpinfo.php
+++ b/htdocs/admin/system/phpinfo.php
@@ -23,8 +23,8 @@
  */
 
 require '../../main.inc.php';
-require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
-require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
 
 $langs->load("admin");
 
@@ -48,18 +48,18 @@ if (isset($title))
 
 
 
-print '<table class="noborder" width="100%">';
-print '<tr class="liste_titre"><td>'.$langs->trans("Parameter").'</td><td>'.$langs->trans("Value").'</td></tr>';
-print "\n";
-
+print '<table class="noborder" width="100%">';
+print '<tr class="liste_titre"><td>'.$langs->trans("Parameter").'</td><td>'.$langs->trans("Value").'</td></tr>';
+print "\n";
+
 $var=false;
 
-// Recupere la version de l'OS
-$phpversion=version_php();
-print "<tr ".$bc[$var].'><td  width="220px">'.$langs->trans("Version")."</td><td>".$phpversion."</td></tr>\n";
+// Recupere la version de l'OS
+$phpversion=version_php();
+print "<tr ".$bc[$var].'><td  width="220px">'.$langs->trans("Version")."</td><td>".$phpversion."</td></tr>\n";
 
 print '</table>';
-print '<br>';
+print '<br>';
 
 
 
diff --git a/htdocs/admin/triggers.php b/htdocs/admin/triggers.php
index 3d9ebbd1d29..980bd9ef4bb 100644
--- a/htdocs/admin/triggers.php
+++ b/htdocs/admin/triggers.php
@@ -52,27 +52,27 @@ $template_dir = DOL_DOCUMENT_ROOT.'/core/tpl/';
 $interfaces = new Interfaces($db);
 $triggers = $interfaces->getTriggersList(0,'priority');
 
-print '<table class="noborder">
-<tr class="liste_titre">
-<td colspan="2">'.$langs->trans("File").'</td>
-<td align="center">'.$langs->trans("Active").'</td>
-<td align="center">&nbsp;</td>
-</tr>
+print '<table class="noborder">
+<tr class="liste_titre">
+<td colspan="2">'.$langs->trans("File").'</td>
+<td align="center">'.$langs->trans("Active").'</td>
+<td align="center">&nbsp;</td>
+</tr>
 ';
-
-$var=True;
-foreach ($triggers as $trigger)
-{
-	$var=!$var;
-	print '<tr '.$bc[$var].'>';
-	print '<td valign="top" width="14" align="center">'.$trigger['picto'].'</td>';
-	print '<td valign="top">'.$trigger['file'].'</td>';
-	print '<td valign="top" align="center">'.$trigger['status'].'</td>';
-	print '<td valign="top">'.$form->textwithpicto('', $trigger['info']).'</td>';
-	print '</tr>';
-}
-
-print '</table>';
+
+$var=True;
+foreach ($triggers as $trigger)
+{
+	$var=!$var;
+	print '<tr '.$bc[$var].'>';
+	print '<td valign="top" width="14" align="center">'.$trigger['picto'].'</td>';
+	print '<td valign="top">'.$trigger['file'].'</td>';
+	print '<td valign="top" align="center">'.$trigger['status'].'</td>';
+	print '<td valign="top">'.$form->textwithpicto('', $trigger['info']).'</td>';
+	print '</tr>';
+}
+
+print '</table>';
 
 llxFooter();
 
diff --git a/htdocs/categories/class/categorie.class.php b/htdocs/categories/class/categorie.class.php
index 19e8b1a9f5d..50950506778 100644
--- a/htdocs/categories/class/categorie.class.php
+++ b/htdocs/categories/class/categorie.class.php
@@ -379,7 +379,7 @@ class Categorie
 	{
 		if ($this->id == -1) return -2;
 		if ($type == 'company')     $type='societe';
-		if ($type == 'fournisseur') $type='societe';
+		if ($type == 'fournisseur') $type='societe';
 
 		$sql  = "INSERT INTO ".MAIN_DB_PREFIX."categorie_".$type." (fk_categorie, fk_".$type.")";
 		$sql .= " VALUES (".$this->id.", ".$obj->id.")";
diff --git a/htdocs/categories/index.php b/htdocs/categories/index.php
index 4e9f376977c..bd293f9febb 100644
--- a/htdocs/categories/index.php
+++ b/htdocs/categories/index.php
@@ -127,7 +127,7 @@ else print '&nbsp;';
 //print '</td></tr></table>';
 print '</div></div></div>';
 
-print '<div class="fichecenter"><br>';
+print '<div class="fichecenter"><br>';
 
 
 // Charge tableau des categories
diff --git a/htdocs/categories/viewcat.php b/htdocs/categories/viewcat.php
index 36ed1bd4ded..3cdb5d516f1 100644
--- a/htdocs/categories/viewcat.php
+++ b/htdocs/categories/viewcat.php
@@ -36,7 +36,7 @@ $ref=GETPOST('ref');
 $type=GETPOST('type');
 $action=GETPOST('action');
 $confirm=GETPOST('confirm');
-$removeelem = GETPOST('removeelem','int');
+$removeelem = GETPOST('removeelem','int');
 
 if ($id == "")
 {
@@ -62,39 +62,39 @@ $type=$object->type;
  *	Actions
  */
 
-// Remove element from category
-if ($id > 0 && $removeelem > 0)
-{
-	if ($type==0 && ($user->rights->produit->creer || $user->rights->service->creer))
-	{
-		require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
-		$tmpobject = new Product($db);
-		$result = $tmpobject->fetch($removeelem);
-		$elementtype = 'product';
-	}
-	if ($type==1 && $user->rights->societe->creer)
-	{
-		$tmpobject = new Societe($db);
-		$result = $tmpobject->fetch($removeelem);
-		$elementtype = 'fournisseur';
-	}
-	if ($type==2 && $user->rights->societe->creer)
-	{
-		$tmpobject = new Societe($db);
-		$result = $tmpobject->fetch($removeelem);
-		$elementtype = 'societe';
-	}
-	if ($type == 3 && $user->rights->adherent->creer)
+// Remove element from category
+if ($id > 0 && $removeelem > 0)
+{
+	if ($type==0 && ($user->rights->produit->creer || $user->rights->service->creer))
 	{
-		require_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent.class.php';
-		$tmpobject = new Adherent($db);
-		$result = $tmpobject->fetch($removeelem);
+		require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
+		$tmpobject = new Product($db);
+		$result = $tmpobject->fetch($removeelem);
+		$elementtype = 'product';
+	}
+	if ($type==1 && $user->rights->societe->creer)
+	{
+		$tmpobject = new Societe($db);
+		$result = $tmpobject->fetch($removeelem);
+		$elementtype = 'fournisseur';
+	}
+	if ($type==2 && $user->rights->societe->creer)
+	{
+		$tmpobject = new Societe($db);
+		$result = $tmpobject->fetch($removeelem);
+		$elementtype = 'societe';
+	}
+	if ($type == 3 && $user->rights->adherent->creer)
+	{
+		require_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent.class.php';
+		$tmpobject = new Adherent($db);
+		$result = $tmpobject->fetch($removeelem);
 		$elementtype = 'member';
-	}
-	
+	}
+	
 	$result=$object->del_type($tmpobject,$elementtype);
-	if ($result < 0) dol_print_error('',$object->error);
-}
+	if ($result < 0) dol_print_error('',$object->error);
+}
 
 if ($user->rights->categorie->supprimer && $action == 'confirm_delete' && $confirm == 'yes')
 {
@@ -312,21 +312,21 @@ if ($object->type == 1)
 				print '<td class="nowrap" valign="top">';
 				print $soc->getNomUrl(1,'category_supplier');
 				print "</td>\n";
-				// Link to delete from category
-				print '<td align="right">';
-				$typeid=$object->type;
-				$permission=0;
-				if ($typeid == 0) $permission=($user->rights->produit->creer || $user->rights->service->creer);
-				if ($typeid == 1) $permission=$user->rights->societe->creer;
-				if ($typeid == 2) $permission=$user->rights->societe->creer;
-				if ($typeid == 3) $permission=$user->rights->adherent->creer;
-				if ($permission)
-				{
-					print "<a href= '".$_SERVER['PHP_SELF']."?".(empty($socid)?'id':'socid')."=".$object->id."&amp;type=".$typeid."&amp;removeelem=".$soc->id."'>";
-					print img_delete($langs->trans("DeleteFromCat")).' ';
-					print $langs->trans("DeleteFromCat")."</a>";
-				}
-				print '</td>';
+				// Link to delete from category
+				print '<td align="right">';
+				$typeid=$object->type;
+				$permission=0;
+				if ($typeid == 0) $permission=($user->rights->produit->creer || $user->rights->service->creer);
+				if ($typeid == 1) $permission=$user->rights->societe->creer;
+				if ($typeid == 2) $permission=$user->rights->societe->creer;
+				if ($typeid == 3) $permission=$user->rights->adherent->creer;
+				if ($permission)
+				{
+					print "<a href= '".$_SERVER['PHP_SELF']."?".(empty($socid)?'id':'socid')."=".$object->id."&amp;type=".$typeid."&amp;removeelem=".$soc->id."'>";
+					print img_delete($langs->trans("DeleteFromCat")).' ';
+					print $langs->trans("DeleteFromCat")."</a>";
+				}
+				print '</td>';
 				
 				print "</tr>\n";
 			}
@@ -364,20 +364,20 @@ if($object->type == 2)
 				print '<td class="nowrap" valign="top">';
 				print $soc->getNomUrl(1,'category');
 				print "</td>\n";
-				// Link to delete from category
-				print '<td align="right">';
-				$typeid=$object->type;
-				$permission=0;
-				if ($typeid == 0) $permission=($user->rights->produit->creer || $user->rights->service->creer);
-				if ($typeid == 1) $permission=$user->rights->societe->creer;
-				if ($typeid == 2) $permission=$user->rights->societe->creer;
-				if ($typeid == 3) $permission=$user->rights->adherent->creer;
-				if ($permission)
-				{
-					print "<a href= '".$_SERVER['PHP_SELF']."?".(empty($socid)?'id':'socid')."=".$object->id."&amp;type=".$typeid."&amp;removeelem=".$soc->id."'>";
-					print img_delete($langs->trans("DeleteFromCat")).' ';
-					print $langs->trans("DeleteFromCat")."</a>";
-				}
+				// Link to delete from category
+				print '<td align="right">';
+				$typeid=$object->type;
+				$permission=0;
+				if ($typeid == 0) $permission=($user->rights->produit->creer || $user->rights->service->creer);
+				if ($typeid == 1) $permission=$user->rights->societe->creer;
+				if ($typeid == 2) $permission=$user->rights->societe->creer;
+				if ($typeid == 3) $permission=$user->rights->adherent->creer;
+				if ($permission)
+				{
+					print "<a href= '".$_SERVER['PHP_SELF']."?".(empty($socid)?'id':'socid')."=".$object->id."&amp;type=".$typeid."&amp;removeelem=".$soc->id."'>";
+					print img_delete($langs->trans("DeleteFromCat")).' ';
+					print $langs->trans("DeleteFromCat")."</a>";
+				}
 				print '</td>';
 				print "</tr>\n";
 			}
diff --git a/htdocs/comm/action/class/actioncomm.class.php b/htdocs/comm/action/class/actioncomm.class.php
index bb30efe8ef9..f4bb4542843 100644
--- a/htdocs/comm/action/class/actioncomm.class.php
+++ b/htdocs/comm/action/class/actioncomm.class.php
@@ -334,7 +334,7 @@ class ActionComm extends CommonObject
                 $this->priority				= $obj->priority;
                 $this->fulldayevent			= $obj->fulldayevent;
                 $this->location				= $obj->location;
-                $this->transparency			= $obj->transparency;
+                $this->transparency			= $obj->transparency;
 
                 $this->socid				= $obj->fk_soc;	// To have fetch_thirdparty method working
                 $this->societe->id			= $obj->fk_soc;
@@ -476,7 +476,7 @@ class ActionComm extends CommonObject
         $sql.= ", priority = '".$this->priority."'";
         $sql.= ", fulldayevent = '".$this->fulldayevent."'";
         $sql.= ", location = ".($this->location ? "'".$this->db->escape($this->location)."'":"null");
-        $sql.= ", transparency = '".$this->transparency."'";
+        $sql.= ", transparency = '".$this->transparency."'";
         $sql.= ", fk_user_mod = '".$user->id."'";
         $sql.= ", fk_user_action=".($this->usertodo->id > 0 ? "'".$this->usertodo->id."'":"null");
         $sql.= ", fk_user_done=".($this->userdone->id > 0 ? "'".$this->userdone->id."'":"null");
diff --git a/htdocs/comm/action/fiche.php b/htdocs/comm/action/fiche.php
index 4b438786d56..94a6e276a89 100644
--- a/htdocs/comm/action/fiche.php
+++ b/htdocs/comm/action/fiche.php
@@ -523,8 +523,8 @@ if ($action == 'create')
 
 	// Busy
 	print '<tr><td width="30%" class="nowrap">'.$langs->trans("Busy").'</td><td>';
-	print '<input id="transparency" type="checkbox" name="transparency" value="'.$actioncomm->transparency.'">';
-	print '</td></tr>';
+	print '<input id="transparency" type="checkbox" name="transparency" value="'.$actioncomm->transparency.'">';
+	print '</td></tr>';
 
 	// Realised by
 	if ($conf->global->AGENDA_ENABLE_DONEBY)
@@ -764,13 +764,13 @@ if ($id > 0)
 		print '</td></tr>';
 
 		// Busy
-		print '<tr><td class="nowrap">'.$langs->trans("Busy").'</td><td>';
+		print '<tr><td class="nowrap">'.$langs->trans("Busy").'</td><td>';
 		print '<input id="transparency" type="checkbox" name="transparency"'.($act->transparency?' checked="checked"':'').'">';
-		print '</td></tr>';
-
+		print '</td></tr>';
+
 		// Realised by
-		if ($conf->global->AGENDA_ENABLE_DONEBY)
-		{
+		if ($conf->global->AGENDA_ENABLE_DONEBY)
+		{
 			print '<tr><td class="nowrap">'.$langs->trans("ActionDoneBy").'</td><td colspan="3">';
 			print $form->select_dolusers($act->userdone->id> 0?$act->userdone->id:-1,'doneby',1);
 			print '</td></tr>';
diff --git a/htdocs/comm/action/index.php b/htdocs/comm/action/index.php
index fd9df1ea848..f95842884bb 100644
--- a/htdocs/comm/action/index.php
+++ b/htdocs/comm/action/index.php
@@ -76,7 +76,7 @@ $pid=GETPOST("projectid","int",3);
 $status=GETPOST("status");
 $type=GETPOST("type");
 $maxprint=(isset($_GET["maxprint"])?GETPOST("maxprint"):$conf->global->AGENDA_MAX_EVENTS_DAY_VIEW);
-$actioncode=GETPOST("actioncode","alpha",3)?GETPOST("actioncode","alpha",3):(GETPOST("actioncode")=="0"?'':(empty($conf->global->AGENDA_USE_EVENT_TYPE)?'AC_OTH':''));
+$actioncode=GETPOST("actioncode","alpha",3)?GETPOST("actioncode","alpha",3):(GETPOST("actioncode")=="0"?'':(empty($conf->global->AGENDA_USE_EVENT_TYPE)?'AC_OTH':''));
 
 if (GETPOST('viewcal'))  {
     $action='show_month'; $day='';
@@ -1014,17 +1014,17 @@ function show_day_events($db, $day, $month, $year, $monthshown, $style, &$eventa
                     {
                     	// Define color index if not yet defined
                     	$idusertouse=($event->usertodo->id?$event->usertodo->id:0);
-                    	if (isset($colorindexused[$idusertouse]))
-                    	{
-                    		$colorindex=$colorindexused[$idusertouse];	// Color already assigned to this user
-                    	}
-                    	else
-                    	{
-                    		$colorindex=$nextindextouse;
-                    		$colorindexused[$idusertouse]=$colorindex;
-                    		if (! empty($theme_datacolor[$nextindextouse+1])) $nextindextouse++;	// Prepare to use next color
-                    	}
-                    	//print '|'.($color).'='.($idusertouse?$idusertouse:0).'='.$colorindex.'<br>';
+                    	if (isset($colorindexused[$idusertouse]))
+                    	{
+                    		$colorindex=$colorindexused[$idusertouse];	// Color already assigned to this user
+                    	}
+                    	else
+                    	{
+                    		$colorindex=$nextindextouse;
+                    		$colorindexused[$idusertouse]=$colorindex;
+                    		if (! empty($theme_datacolor[$nextindextouse+1])) $nextindextouse++;	// Prepare to use next color
+                    	}
+                    	//print '|'.($color).'='.($idusertouse?$idusertouse:0).'='.$colorindex.'<br>';
 						// Define color
                     	$color=sprintf("%02x%02x%02x",$theme_datacolor[$colorindex][0],$theme_datacolor[$colorindex][1],$theme_datacolor[$colorindex][2]);
                     }
diff --git a/htdocs/comm/index.php b/htdocs/comm/index.php
index fbc76d402e1..f32fa89b59b 100644
--- a/htdocs/comm/index.php
+++ b/htdocs/comm/index.php
@@ -249,7 +249,7 @@ if (! empty($conf->commande->enabled) && $user->rights->commande->lire)
 }
 
 
-print '</div><div class="fichetwothirdright"><div class="ficheaddleft">';
+print '</div><div class="fichetwothirdright"><div class="ficheaddleft">';
 
 
 $NBMAX=3;
diff --git a/htdocs/comm/mailing/cibles.php b/htdocs/comm/mailing/cibles.php
index 08b0e150227..dfb84f5a01d 100644
--- a/htdocs/comm/mailing/cibles.php
+++ b/htdocs/comm/mailing/cibles.php
@@ -375,7 +375,7 @@ if ($object->fetch($id) >= 0)
 		if ($search_firstname) $param.= "&amp;search_firstname=".urlencode($search_firstname);
 		if ($search_email)     $param.= "&amp;search_email=".urlencode($search_email);
 
-		$cleartext='<br></div><div>'.$langs->trans("ToClearAllRecipientsClickHere").': '.'<input type="submit" name="clearlist" class="button" value="'.$langs->trans("TargetsReset").'">';
+		$cleartext='<br></div><div>'.$langs->trans("ToClearAllRecipientsClickHere").': '.'<input type="submit" name="clearlist" class="button" value="'.$langs->trans("TargetsReset").'">';
 
 		print_barre_liste($langs->trans("MailSelectedRecipients").$cleartext,$page,$_SERVER["PHP_SELF"],$param,$sortfield,$sortorder,"",$num,$object->nbemail,'');
 
diff --git a/htdocs/comm/propal/class/propal.class.php b/htdocs/comm/propal/class/propal.class.php
index c8d0bfeebde..db8dd255b6c 100644
--- a/htdocs/comm/propal/class/propal.class.php
+++ b/htdocs/comm/propal/class/propal.class.php
@@ -1797,10 +1797,10 @@ class Propal extends CommonObject
         $sql.= " WHERE p.entity = ".$conf->entity;
         $sql.= " AND p.fk_soc = s.rowid";
         $sql.= " AND p.fk_statut = c.id";
-        if (! $user->rights->societe->client->voir && ! $socid) //restriction
-        {
-        	$sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
-        }
+        if (! $user->rights->societe->client->voir && ! $socid) //restriction
+        {
+        	$sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
+        }
         if ($socid) $sql.= " AND s.rowid = ".$socid;
         if ($draft)	$sql.= " AND p.fk_statut = 0";
         if ($notcurrentuser > 0) $sql.= " AND p.fk_user_author <> ".$user->id;
diff --git a/htdocs/comm/propal/class/propalestats.class.php b/htdocs/comm/propal/class/propalestats.class.php
index 54ddc846272..34584c7f99e 100644
--- a/htdocs/comm/propal/class/propalestats.class.php
+++ b/htdocs/comm/propal/class/propalestats.class.php
@@ -26,7 +26,7 @@
 
 include_once DOL_DOCUMENT_ROOT . '/core/class/stats.class.php';
 include_once DOL_DOCUMENT_ROOT . '/comm/propal/class/propal.class.php';
-include_once DOL_DOCUMENT_ROOT . '/core/lib/date.lib.php';
+include_once DOL_DOCUMENT_ROOT . '/core/lib/date.lib.php';
 
 
 /**
diff --git a/htdocs/commande/class/commande.class.php b/htdocs/commande/class/commande.class.php
index 508f9a70fc6..edfbb35f5cd 100644
--- a/htdocs/commande/class/commande.class.php
+++ b/htdocs/commande/class/commande.class.php
@@ -2026,19 +2026,19 @@ class Commande extends CommonOrder
                 {
                     $obj = $this->db->fetch_object($result);
 
-                    if ($shortlist == 1)
-                    {
-                    	$ga[$obj->cid] = $obj->ref;
-                    }
-                    else if ($shortlist == 2)
-                    {
-                    	$ga[$obj->cid] = $obj->ref.' ('.$obj->name.')';
-                    }
-                    else
-					{
-                    	$ga[$i]['id']	= $obj->cid;
-                    	$ga[$i]['ref'] 	= $obj->ref;
-                    	$ga[$i]['name'] = $obj->name;
+                    if ($shortlist == 1)
+                    {
+                    	$ga[$obj->cid] = $obj->ref;
+                    }
+                    else if ($shortlist == 2)
+                    {
+                    	$ga[$obj->cid] = $obj->ref.' ('.$obj->name.')';
+                    }
+                    else
+					{
+                    	$ga[$i]['id']	= $obj->cid;
+                    	$ga[$i]['ref'] 	= $obj->ref;
+                    	$ga[$i]['name'] = $obj->name;
                     }
                     $i++;
                 }
diff --git a/htdocs/commande/class/commandestats.class.php b/htdocs/commande/class/commandestats.class.php
index 56c69d84541..40714e98811 100644
--- a/htdocs/commande/class/commandestats.class.php
+++ b/htdocs/commande/class/commandestats.class.php
@@ -26,7 +26,7 @@
 include_once DOL_DOCUMENT_ROOT . '/core/class/stats.class.php';
 include_once DOL_DOCUMENT_ROOT . '/commande/class/commande.class.php';
 include_once DOL_DOCUMENT_ROOT . '/fourn/class/fournisseur.commande.class.php';
-include_once DOL_DOCUMENT_ROOT . '/core/lib/date.lib.php';
+include_once DOL_DOCUMENT_ROOT . '/core/lib/date.lib.php';
 
 
 /**
diff --git a/htdocs/compta/bank/account.php b/htdocs/compta/bank/account.php
index a02dff6b868..5c9edf478e1 100644
--- a/htdocs/compta/bank/account.php
+++ b/htdocs/compta/bank/account.php
@@ -35,10 +35,10 @@ require_once DOL_DOCUMENT_ROOT.'/compta/sociales/class/chargesociales.class.php'
 require_once DOL_DOCUMENT_ROOT.'/compta/paiement/class/paiement.class.php';
 require_once DOL_DOCUMENT_ROOT.'/compta/tva/class/tva.class.php';
 require_once DOL_DOCUMENT_ROOT.'/fourn/class/paiementfourn.class.php';
-require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
-
-$langs->load("banks");
-$langs->load("categories");
+require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
+
+$langs->load("banks");
+$langs->load("categories");
 $langs->load("bills");
 
 $id = (GETPOST('id','int') ? GETPOST('id','int') : GETPOST('account','int'));
diff --git a/htdocs/compta/bank/bankid_fr.php b/htdocs/compta/bank/bankid_fr.php
index 402dbeda095..dbe67212f37 100644
--- a/htdocs/compta/bank/bankid_fr.php
+++ b/htdocs/compta/bank/bankid_fr.php
@@ -27,10 +27,10 @@
 require('../../main.inc.php');
 require_once DOL_DOCUMENT_ROOT.'/core/lib/bank.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
-require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
-
-$langs->load("banks");
-$langs->load("categories");
+require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
+
+$langs->load("banks");
+$langs->load("categories");
 $langs->load("bills");
 
 $action=GETPOST('action');
diff --git a/htdocs/compta/bank/bilan.php b/htdocs/compta/bank/bilan.php
index 2224627cd94..a5e6605ad85 100644
--- a/htdocs/compta/bank/bilan.php
+++ b/htdocs/compta/bank/bilan.php
@@ -23,10 +23,10 @@
  */
 
 require('../../main.inc.php');
-require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
-
-$langs->load("banks");
-$langs->load("categories");
+require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
+
+$langs->load("banks");
+$langs->load("categories");
 
 if (!$user->rights->banque->lire)
   accessforbidden();
diff --git a/htdocs/compta/bank/budget.php b/htdocs/compta/bank/budget.php
index e14b3e92df6..672e1363d3e 100644
--- a/htdocs/compta/bank/budget.php
+++ b/htdocs/compta/bank/budget.php
@@ -24,10 +24,10 @@
  */
 
 require('../../main.inc.php');
-require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
-
-$langs->load("banks");
-$langs->load("categories");
+require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
+
+$langs->load("banks");
+$langs->load("categories");
 
 // Security check
 if ($user->societe_id) $socid=$user->societe_id;
diff --git a/htdocs/compta/bank/categ.php b/htdocs/compta/bank/categ.php
index ab589e89001..94370d699e6 100644
--- a/htdocs/compta/bank/categ.php
+++ b/htdocs/compta/bank/categ.php
@@ -112,8 +112,8 @@ llxHeader();
 
 print_fiche_titre($langs->trans("Rubriques"));
 
-print '<form method="POST" action="'.$_SERVER["PHP_SELF"].'">';
-print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+print '<form method="POST" action="'.$_SERVER["PHP_SELF"].'">';
+print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
 
 print '<table class="noborder" width="100%">';
 print '<tr class="liste_titre">';
@@ -160,7 +160,7 @@ if ($result)
 	$db->free($result);
 }
 
-print "</form>";
+print "</form>";
 
 /*
  * Line to add category
@@ -176,7 +176,7 @@ if ($action != 'edit')
 
 print "</table>";
 
-print "</form>";
+print "</form>";
 
 llxFooter();
 
diff --git a/htdocs/compta/bank/fiche.php b/htdocs/compta/bank/fiche.php
index daee366ebdb..407a5398dc5 100644
--- a/htdocs/compta/bank/fiche.php
+++ b/htdocs/compta/bank/fiche.php
@@ -29,10 +29,10 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/bank.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formbank.class.php';
-require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
-
-$langs->load("banks");
-$langs->load("categories");
+require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
+
+$langs->load("banks");
+$langs->load("categories");
 $langs->load("companies");
 
 $action=GETPOST("action");
diff --git a/htdocs/compta/bank/graph.php b/htdocs/compta/bank/graph.php
index 932acf5dcb5..3954edf99ee 100644
--- a/htdocs/compta/bank/graph.php
+++ b/htdocs/compta/bank/graph.php
@@ -27,12 +27,12 @@ require('../../main.inc.php');
 require_once DOL_DOCUMENT_ROOT.'/core/lib/bank.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/dolgraph.class.php';
-
-$langs->load("banks");
-$langs->load("categories");
 
-$WIDTH=DolGraph::getDefaultGraphSizeForStats('width',768);
-$HEIGHT=DolGraph::getDefaultGraphSizeForStats('height',200);
+$langs->load("banks");
+$langs->load("categories");
+
+$WIDTH=DolGraph::getDefaultGraphSizeForStats('width',768);
+$HEIGHT=DolGraph::getDefaultGraphSizeForStats('height',200);
 
 // Security check
 if (isset($_GET["account"]) || isset($_GET["ref"]))
diff --git a/htdocs/compta/bank/index.php b/htdocs/compta/bank/index.php
index 344231cea5d..51b7a4dc818 100644
--- a/htdocs/compta/bank/index.php
+++ b/htdocs/compta/bank/index.php
@@ -27,10 +27,10 @@ require('../../main.inc.php');
 require_once DOL_DOCUMENT_ROOT.'/core/lib/bank.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/compta/tva/class/tva.class.php';
 require_once DOL_DOCUMENT_ROOT.'/compta/sociales/class/chargesociales.class.php';
-require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
-
-$langs->load("banks");
-$langs->load("categories");
+require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
+
+$langs->load("banks");
+$langs->load("categories");
 
 // Security check
 if ($user->societe_id) $socid=$user->societe_id;
diff --git a/htdocs/compta/bank/info.php b/htdocs/compta/bank/info.php
index a4a871cec93..a5a0cdf1677 100644
--- a/htdocs/compta/bank/info.php
+++ b/htdocs/compta/bank/info.php
@@ -24,10 +24,10 @@
 require('../../main.inc.php');
 require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/compta/paiement/class/paiement.class.php';
-require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
-
-$langs->load("banks");
-$langs->load("categories");
+require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
+
+$langs->load("banks");
+$langs->load("categories");
 $langs->load("companies");
 
 
diff --git a/htdocs/compta/bank/rappro.php b/htdocs/compta/bank/rappro.php
index da28602314a..29a47a60e9b 100644
--- a/htdocs/compta/bank/rappro.php
+++ b/htdocs/compta/bank/rappro.php
@@ -31,10 +31,10 @@ require_once DOL_DOCUMENT_ROOT.'/compta/sociales/class/chargesociales.class.php'
 require_once DOL_DOCUMENT_ROOT.'/compta/paiement/class/paiement.class.php';
 require_once DOL_DOCUMENT_ROOT.'/compta/tva/class/tva.class.php';
 require_once DOL_DOCUMENT_ROOT.'/fourn/class/paiementfourn.class.php';
-require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
-
-$langs->load("banks");
-$langs->load("categories");
+require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
+
+$langs->load("banks");
+$langs->load("categories");
 $langs->load("bills");
 
 if (! $user->rights->banque->consolidate) accessforbidden();
diff --git a/htdocs/compta/bank/releve.php b/htdocs/compta/bank/releve.php
index 2d9ac9cd86e..b62ea51118c 100644
--- a/htdocs/compta/bank/releve.php
+++ b/htdocs/compta/bank/releve.php
@@ -25,16 +25,16 @@
 
 require('../../main.inc.php');
 require_once DOL_DOCUMENT_ROOT.'/core/lib/bank.lib.php';
-require_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php';
-require_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent.class.php';
-require_once DOL_DOCUMENT_ROOT.'/compta/sociales/class/chargesociales.class.php';
-require_once DOL_DOCUMENT_ROOT.'/compta/paiement/class/paiement.class.php';
-require_once DOL_DOCUMENT_ROOT.'/compta/tva/class/tva.class.php';
-require_once DOL_DOCUMENT_ROOT.'/fourn/class/paiementfourn.class.php';
-require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
-
-$langs->load("banks");
-$langs->load("categories");
+require_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php';
+require_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent.class.php';
+require_once DOL_DOCUMENT_ROOT.'/compta/sociales/class/chargesociales.class.php';
+require_once DOL_DOCUMENT_ROOT.'/compta/paiement/class/paiement.class.php';
+require_once DOL_DOCUMENT_ROOT.'/compta/tva/class/tva.class.php';
+require_once DOL_DOCUMENT_ROOT.'/fourn/class/paiementfourn.class.php';
+require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
+
+$langs->load("banks");
+$langs->load("categories");
 $langs->load("companies");
 $langs->load("bills");
 
@@ -82,14 +82,14 @@ $pagenext = $page + 1;
 llxHeader();
 
 $form = new Form($db);
-$societestatic=new Societe($db);
-$chargestatic=new ChargeSociales($db);
-$memberstatic=new Adherent($db);
-$paymentstatic=new Paiement($db);
-$paymentsupplierstatic=new PaiementFourn($db);
-$paymentvatstatic=new TVA($db);
-$bankstatic=new Account($db);
-$banklinestatic=new AccountLine($db);
+$societestatic=new Societe($db);
+$chargestatic=new ChargeSociales($db);
+$memberstatic=new Adherent($db);
+$paymentstatic=new Paiement($db);
+$paymentsupplierstatic=new PaiementFourn($db);
+$paymentvatstatic=new TVA($db);
+$bankstatic=new Account($db);
+$banklinestatic=new AccountLine($db);
 
 
 // Load account
@@ -332,59 +332,59 @@ else
 				if ($links[$key]['type']=='payment')
 				{
 					$paymentstatic->id=$links[$key]['url_id'];
-					$paymentstatic->ref=$langs->trans("Payment");
+					$paymentstatic->ref=$langs->trans("Payment");
 					print ' '.$paymentstatic->getNomUrl(1);
 					$newline=0;
 				}
 				elseif ($links[$key]['type']=='payment_supplier')
 				{
-					$paymentsupplierstatic->id=$links[$key]['url_id'];
-					$paymentsupplierstatic->ref=$langs->trans("Payment");;
+					$paymentsupplierstatic->id=$links[$key]['url_id'];
+					$paymentsupplierstatic->ref=$langs->trans("Payment");;
 					print ' '.$paymentsupplierstatic->getNomUrl(1);
 					$newline=0;
 				}
 				elseif ($links[$key]['type']=='payment_sc')
 				{
-					print '<a href="'.DOL_URL_ROOT.'/compta/payment_sc/fiche.php?id='.$links[$key]['url_id'].'">';
-					print ' '.img_object($langs->trans('ShowPayment'),'payment').' ';
-					print $langs->trans("SocialContributionPayment");
-					print '</a>';
+					print '<a href="'.DOL_URL_ROOT.'/compta/payment_sc/fiche.php?id='.$links[$key]['url_id'].'">';
+					print ' '.img_object($langs->trans('ShowPayment'),'payment').' ';
+					print $langs->trans("SocialContributionPayment");
+					print '</a>';
 					$newline=0;
 				}
-				elseif ($links[$key]['type']=='payment_vat')
-				{
-					$paymentvatstatic->id=$links[$key]['url_id'];
-					$paymentvatstatic->ref=$langs->trans("Payment");
-					print ' '.$paymentvatstatic->getNomUrl(2);
-				}
+				elseif ($links[$key]['type']=='payment_vat')
+				{
+					$paymentvatstatic->id=$links[$key]['url_id'];
+					$paymentvatstatic->ref=$langs->trans("Payment");
+					print ' '.$paymentvatstatic->getNomUrl(2);
+				}
 				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.
-					if ($objp->amount > 0)
-					{
-						$banklinestatic->fetch($links[$key]['url_id']);
-						$bankstatic->id=$banklinestatic->fk_account;
-						$bankstatic->label=$banklinestatic->bank_account_label;
-						print ' ('.$langs->trans("from").' ';
-						print $bankstatic->getNomUrl(1,'transactions');
-						print ' '.$langs->trans("toward").' ';
-						$bankstatic->id=$objp->bankid;
-						$bankstatic->label=$objp->bankref;
-						print $bankstatic->getNomUrl(1,'');
-						print ')';
-					}
-					else
-					{
-						$bankstatic->id=$objp->bankid;
-						$bankstatic->label=$objp->bankref;
-						print ' ('.$langs->trans("from").' ';
-						print $bankstatic->getNomUrl(1,'');
-						print ' '.$langs->trans("toward").' ';
-						$banklinestatic->fetch($links[$key]['url_id']);
-						$bankstatic->id=$banklinestatic->fk_account;
-						$bankstatic->label=$banklinestatic->bank_account_label;
-						print $bankstatic->getNomUrl(1,'transactions');
-						print ')';
-					}
+					// Do not show link to transfer since there is no transfer card (avoid confusion). Can already be accessed from transaction detail.
+					if ($objp->amount > 0)
+					{
+						$banklinestatic->fetch($links[$key]['url_id']);
+						$bankstatic->id=$banklinestatic->fk_account;
+						$bankstatic->label=$banklinestatic->bank_account_label;
+						print ' ('.$langs->trans("from").' ';
+						print $bankstatic->getNomUrl(1,'transactions');
+						print ' '.$langs->trans("toward").' ';
+						$bankstatic->id=$objp->bankid;
+						$bankstatic->label=$objp->bankref;
+						print $bankstatic->getNomUrl(1,'');
+						print ')';
+					}
+					else
+					{
+						$bankstatic->id=$objp->bankid;
+						$bankstatic->label=$objp->bankref;
+						print ' ('.$langs->trans("from").' ';
+						print $bankstatic->getNomUrl(1,'');
+						print ' '.$langs->trans("toward").' ';
+						$banklinestatic->fetch($links[$key]['url_id']);
+						$bankstatic->id=$banklinestatic->fk_account;
+						$bankstatic->label=$banklinestatic->bank_account_label;
+						print $bankstatic->getNomUrl(1,'transactions');
+						print ')';
+					}
 				}
 				elseif ($links[$key]['type']=='company') {
 					print '<a href="'.DOL_URL_ROOT.'/societe/soc.php?socid='.$links[$key]['url_id'].'">';
diff --git a/htdocs/compta/bank/search.php b/htdocs/compta/bank/search.php
index bdfda680d6d..ea7d29beb0f 100644
--- a/htdocs/compta/bank/search.php
+++ b/htdocs/compta/bank/search.php
@@ -27,8 +27,8 @@
 require('../../main.inc.php');
 require_once DOL_DOCUMENT_ROOT.'/core/lib/bank.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php';
-require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
-require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/bankcateg.class.php';
+require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
+require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/bankcateg.class.php';
 
 $langs->load("banks");
 $langs->load("categories");
diff --git a/htdocs/compta/bank/treso.php b/htdocs/compta/bank/treso.php
index 91f05a2fdaa..af7078421a2 100644
--- a/htdocs/compta/bank/treso.php
+++ b/htdocs/compta/bank/treso.php
@@ -29,10 +29,10 @@ require_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php';
 require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
 require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.facture.class.php';
 require_once DOL_DOCUMENT_ROOT.'/compta/sociales/class/chargesociales.class.php';
-require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
-
-$langs->load("banks");
-$langs->load("categories");
+require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
+
+$langs->load("banks");
+$langs->load("categories");
 $langs->load("bills");
 
 // Security check
diff --git a/htdocs/compta/bank/virement.php b/htdocs/compta/bank/virement.php
index f770c5bc371..bea66e6a47d 100644
--- a/htdocs/compta/bank/virement.php
+++ b/htdocs/compta/bank/virement.php
@@ -26,10 +26,10 @@
 
 require('../../main.inc.php');
 require_once DOL_DOCUMENT_ROOT.'/core/lib/bank.lib.php';
-require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
-
-$langs->load("banks");
-$langs->load("categories");
+require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
+
+$langs->load("banks");
+$langs->load("categories");
 
 if (! $user->rights->banque->transfer)
   accessforbidden();
diff --git a/htdocs/compta/deplacement/stats/index.php b/htdocs/compta/deplacement/stats/index.php
index eade2e3c13d..d6c1465937f 100755
--- a/htdocs/compta/deplacement/stats/index.php
+++ b/htdocs/compta/deplacement/stats/index.php
@@ -205,7 +205,7 @@ complete_head_from_modules($conf,$langs,null,$head,$h,'trip_stats');
 dol_fiche_head($head,'byyear',$langs->trans("Statistics"));
 
 
-print '<div class="fichecenter"><div class="fichethirdleft">';
+print '<div class="fichecenter"><div class="fichethirdleft">';
 
 
 // Show filter box
diff --git a/htdocs/compta/facture.php b/htdocs/compta/facture.php
index 250605f386b..3663e71ffde 100644
--- a/htdocs/compta/facture.php
+++ b/htdocs/compta/facture.php
@@ -2687,7 +2687,7 @@ else if ($id > 0 || ! empty($ref))
 		print $formconfirm;
 
 
-
+
 
 		// Invoice content
 
diff --git a/htdocs/compta/facture/class/facture.class.php b/htdocs/compta/facture/class/facture.class.php
index c45e52bec39..bd0bbaf121e 100644
--- a/htdocs/compta/facture/class/facture.class.php
+++ b/htdocs/compta/facture/class/facture.class.php
@@ -2660,77 +2660,77 @@ class Facture extends CommonInvoice
 	}
 
 
-	/**
-	 *  Return list of invoices (eventually filtered on a user) into an array
-	 *
-	 *  @param		int		$shortlist		0=Return array[id]=ref, 1=Return array[](id=>id,ref=>ref,name=>name)
-	 *  @param      int		$draft      	0=not draft, 1=draft
-	 *  @param      User	$excluser      	Objet user to exclude
-	 *  @param    	int		$socid			Id third pary
-	 *  @param    	int		$limit			For pagination
-	 *  @param    	int		$offset			For pagination
-	 *  @param    	string	$sortfield		Sort criteria
-	 *  @param    	string	$sortorder		Sort order
-	 *  @return     int             		-1 if KO, array with result if OK
-	 */
-	function liste_array($shortlist=0, $draft=0, $excluser='', $socid=0, $limit=0, $offset=0, $sortfield='f.datef,f.rowid', $sortorder='DESC')
-	{
-		global $conf,$user;
-
-		$ga = array();
-
-		$sql = "SELECT s.rowid, s.nom as name, s.client,";
-		$sql.= " f.rowid as fid, f.facnumber as ref, f.datef as df";
-		if (! $user->rights->societe->client->voir && ! $socid) $sql .= ", sc.fk_soc, sc.fk_user";
-		$sql.= " FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."facture as f";
-		if (! $user->rights->societe->client->voir && ! $socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
-		$sql.= " WHERE f.entity = ".$conf->entity;
-		$sql.= " AND f.fk_soc = s.rowid";
-		if (! $user->rights->societe->client->voir && ! $socid) //restriction
-		{
-			$sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
-		}
-		if ($socid) $sql.= " AND s.rowid = ".$socid;
-		if ($draft) $sql.= " AND f.fk_statut = 0";
-		if (is_object($excluser)) $sql.= " AND f.fk_user_author <> ".$excluser->id;
-		$sql.= $this->db->order($sortfield,$sortorder);
-		$sql.= $this->db->plimit($limit,$offset);
-
-		$result=$this->db->query($sql);
-		if ($result)
-		{
-			$numc = $this->db->num_rows($result);
-			if ($numc)
-			{
-				$i = 0;
-				while ($i < $numc)
-				{
-					$obj = $this->db->fetch_object($result);
-
-					if ($shortlist == 1)
-					{
-						$ga[$obj->fid] = $obj->ref;
-					}
-					else if ($shortlist == 2)
-					{
-						$ga[$obj->fid] = $obj->ref.' ('.$obj->name.')';
-					}
-					else
-					{
-						$ga[$i]['id']	= $obj->fid;
-						$ga[$i]['ref'] 	= $obj->ref;
-						$ga[$i]['name'] = $obj->name;
-					}
-					$i++;
-				}
-			}
-			return $ga;
-		}
-		else
-		{
-			dol_print_error($this->db);
-			return -1;
-		}
+	/**
+	 *  Return list of invoices (eventually filtered on a user) into an array
+	 *
+	 *  @param		int		$shortlist		0=Return array[id]=ref, 1=Return array[](id=>id,ref=>ref,name=>name)
+	 *  @param      int		$draft      	0=not draft, 1=draft
+	 *  @param      User	$excluser      	Objet user to exclude
+	 *  @param    	int		$socid			Id third pary
+	 *  @param    	int		$limit			For pagination
+	 *  @param    	int		$offset			For pagination
+	 *  @param    	string	$sortfield		Sort criteria
+	 *  @param    	string	$sortorder		Sort order
+	 *  @return     int             		-1 if KO, array with result if OK
+	 */
+	function liste_array($shortlist=0, $draft=0, $excluser='', $socid=0, $limit=0, $offset=0, $sortfield='f.datef,f.rowid', $sortorder='DESC')
+	{
+		global $conf,$user;
+
+		$ga = array();
+
+		$sql = "SELECT s.rowid, s.nom as name, s.client,";
+		$sql.= " f.rowid as fid, f.facnumber as ref, f.datef as df";
+		if (! $user->rights->societe->client->voir && ! $socid) $sql .= ", sc.fk_soc, sc.fk_user";
+		$sql.= " FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."facture as f";
+		if (! $user->rights->societe->client->voir && ! $socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+		$sql.= " WHERE f.entity = ".$conf->entity;
+		$sql.= " AND f.fk_soc = s.rowid";
+		if (! $user->rights->societe->client->voir && ! $socid) //restriction
+		{
+			$sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
+		}
+		if ($socid) $sql.= " AND s.rowid = ".$socid;
+		if ($draft) $sql.= " AND f.fk_statut = 0";
+		if (is_object($excluser)) $sql.= " AND f.fk_user_author <> ".$excluser->id;
+		$sql.= $this->db->order($sortfield,$sortorder);
+		$sql.= $this->db->plimit($limit,$offset);
+
+		$result=$this->db->query($sql);
+		if ($result)
+		{
+			$numc = $this->db->num_rows($result);
+			if ($numc)
+			{
+				$i = 0;
+				while ($i < $numc)
+				{
+					$obj = $this->db->fetch_object($result);
+
+					if ($shortlist == 1)
+					{
+						$ga[$obj->fid] = $obj->ref;
+					}
+					else if ($shortlist == 2)
+					{
+						$ga[$obj->fid] = $obj->ref.' ('.$obj->name.')';
+					}
+					else
+					{
+						$ga[$i]['id']	= $obj->fid;
+						$ga[$i]['ref'] 	= $obj->ref;
+						$ga[$i]['name'] = $obj->name;
+					}
+					$i++;
+				}
+			}
+			return $ga;
+		}
+		else
+		{
+			dol_print_error($this->db);
+			return -1;
+		}
 	}
 
 
@@ -3121,7 +3121,7 @@ class Facture extends CommonInvoice
 				$this->total_tva      += $line->total_tva;
 				$this->total_ttc      += $line->total_ttc;
 			}
-			$this->revenuestamp = 0;
+			$this->revenuestamp = 0;
 
 			// Add a line "offered"
 			$line=new FactureLigne($this->db);
diff --git a/htdocs/compta/facture/stats/index.php b/htdocs/compta/facture/stats/index.php
index 4abff5b63be..ffdc17e0e63 100644
--- a/htdocs/compta/facture/stats/index.php
+++ b/htdocs/compta/facture/stats/index.php
@@ -54,8 +54,8 @@ $endyear=$year;
  * View
  */
 
-$langs->load("bills");
-$langs->load("companies");
+$langs->load("bills");
+$langs->load("companies");
 
 $form=new Form($db);
 
diff --git a/htdocs/compta/paiement/cheque/fiche.php b/htdocs/compta/paiement/cheque/fiche.php
index 8a24ab3ce29..3251b4a1ab6 100644
--- a/htdocs/compta/paiement/cheque/fiche.php
+++ b/htdocs/compta/paiement/cheque/fiche.php
@@ -29,9 +29,9 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php';
 require_once DOL_DOCUMENT_ROOT.'/compta/paiement/class/paiement.class.php';
 require_once DOL_DOCUMENT_ROOT.'/compta/paiement/cheque/class/remisecheque.class.php';
 require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
-
-$langs->load("banks");
-$langs->load("categories");
+
+$langs->load("banks");
+$langs->load("categories");
 $langs->load('bills');
 $langs->load('companies');
 $langs->load('compta');
diff --git a/htdocs/compta/paiement/cheque/index.php b/htdocs/compta/paiement/cheque/index.php
index cfde42a5cf3..80ea9ea6817 100644
--- a/htdocs/compta/paiement/cheque/index.php
+++ b/htdocs/compta/paiement/cheque/index.php
@@ -26,9 +26,9 @@
 require('../../../main.inc.php');
 require_once DOL_DOCUMENT_ROOT.'/compta/paiement/cheque/class/remisecheque.class.php';
 require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
-
-$langs->load("banks");
-$langs->load("categories");
+
+$langs->load("banks");
+$langs->load("categories");
 
 // Security check
 if ($user->societe_id) $socid=$user->societe_id;
diff --git a/htdocs/compta/paiement/cheque/liste.php b/htdocs/compta/paiement/cheque/liste.php
index 8370bd95551..705bc15eb88 100644
--- a/htdocs/compta/paiement/cheque/liste.php
+++ b/htdocs/compta/paiement/cheque/liste.php
@@ -26,9 +26,9 @@
 require('../../../main.inc.php');
 require_once DOL_DOCUMENT_ROOT.'/compta/paiement/cheque/class/remisecheque.class.php';
 require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
-
-$langs->load("banks");
-$langs->load("categories");
+
+$langs->load("banks");
+$langs->load("categories");
 $langs->load("bills");
 
 // Security check
diff --git a/htdocs/compta/paiement/class/paiement.class.php b/htdocs/compta/paiement/class/paiement.class.php
index e5dd9e60ea4..7ef5f44fb88 100644
--- a/htdocs/compta/paiement/class/paiement.class.php
+++ b/htdocs/compta/paiement/class/paiement.class.php
@@ -392,7 +392,7 @@ class Paiement extends CommonObject
         		$this->error='Bad value for parameter accountid';
         		dol_syslog(get_class($this).'::addPaymentToBank '.$this->error, LOG_ERR);
         		return -1;
-        	}
+        	}
 
         	$this->db->begin();
 
diff --git a/htdocs/compta/prelevement/bon.php b/htdocs/compta/prelevement/bon.php
index 89b40e095bc..b1bcbb3d04b 100644
--- a/htdocs/compta/prelevement/bon.php
+++ b/htdocs/compta/prelevement/bon.php
@@ -27,10 +27,10 @@ require('../../main.inc.php');
 require_once DOL_DOCUMENT_ROOT.'/core/lib/prelevement.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/compta/prelevement/class/bonprelevement.class.php';
-require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
-
-$langs->load("banks");
-$langs->load("categories");
+require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
+
+$langs->load("banks");
+$langs->load("categories");
 $langs->load("bills");
 $langs->load("categories");
 
diff --git a/htdocs/compta/prelevement/bons.php b/htdocs/compta/prelevement/bons.php
index ce33322d03a..8f2d336defe 100644
--- a/htdocs/compta/prelevement/bons.php
+++ b/htdocs/compta/prelevement/bons.php
@@ -26,10 +26,10 @@
 
 require('../../main.inc.php');
 require_once DOL_DOCUMENT_ROOT.'/compta/prelevement/class/bonprelevement.class.php';
-require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
-
-$langs->load("banks");
-$langs->load("categories");
+require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
+
+$langs->load("banks");
+$langs->load("categories");
 $langs->load("widthdrawals");
 
 // Security check
diff --git a/htdocs/compta/prelevement/create.php b/htdocs/compta/prelevement/create.php
index f9d770111a7..ddf8a988b48 100644
--- a/htdocs/compta/prelevement/create.php
+++ b/htdocs/compta/prelevement/create.php
@@ -30,10 +30,10 @@ require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
 require_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/prelevement.lib.php';
-require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
-
-$langs->load("banks");
-$langs->load("categories");
+require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
+
+$langs->load("banks");
+$langs->load("categories");
 $langs->load("widthdrawals");
 $langs->load("companies");
 $langs->load("bills");
diff --git a/htdocs/compta/prelevement/demandes.php b/htdocs/compta/prelevement/demandes.php
index 3012a70bd55..3ae2b850aac 100644
--- a/htdocs/compta/prelevement/demandes.php
+++ b/htdocs/compta/prelevement/demandes.php
@@ -28,10 +28,10 @@ require('../../main.inc.php');
 require_once DOL_DOCUMENT_ROOT.'/core/modules/modPrelevement.class.php';
 require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
 require_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php';
-require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
-
-$langs->load("banks");
-$langs->load("categories");
+require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
+
+$langs->load("banks");
+$langs->load("categories");
 $langs->load("widthdrawals");
 $langs->load("companies");
 
diff --git a/htdocs/compta/prelevement/factures.php b/htdocs/compta/prelevement/factures.php
index ec8eaa51479..115a7829374 100644
--- a/htdocs/compta/prelevement/factures.php
+++ b/htdocs/compta/prelevement/factures.php
@@ -29,10 +29,10 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/prelevement.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/compta/prelevement/class/bonprelevement.class.php';
 require_once DOL_DOCUMENT_ROOT.'/compta/prelevement/class/rejetprelevement.class.php';
 require_once DOL_DOCUMENT_ROOT.'/compta/paiement/class/paiement.class.php';
-require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
-
-$langs->load("banks");
-$langs->load("categories");
+require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
+
+$langs->load("banks");
+$langs->load("categories");
 $langs->load("companies");
 $langs->load('withdrawals');
 $langs->load('bills');
diff --git a/htdocs/compta/prelevement/fiche-rejet.php b/htdocs/compta/prelevement/fiche-rejet.php
index c77a0ab6682..87516c3ad65 100644
--- a/htdocs/compta/prelevement/fiche-rejet.php
+++ b/htdocs/compta/prelevement/fiche-rejet.php
@@ -29,10 +29,10 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/prelevement.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/compta/prelevement/class/bonprelevement.class.php';
 require_once DOL_DOCUMENT_ROOT.'/compta/prelevement/class/rejetprelevement.class.php';
 require_once DOL_DOCUMENT_ROOT.'/compta/paiement/class/paiement.class.php';
-require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
-
-$langs->load("banks");
-$langs->load("categories");
+require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
+
+$langs->load("banks");
+$langs->load("categories");
 $langs->load('withdrawals');
 $langs->load('bills');
 
diff --git a/htdocs/compta/prelevement/fiche-stat.php b/htdocs/compta/prelevement/fiche-stat.php
index 161df078aae..5fcd70b1a9b 100644
--- a/htdocs/compta/prelevement/fiche-stat.php
+++ b/htdocs/compta/prelevement/fiche-stat.php
@@ -27,11 +27,11 @@ require('../../main.inc.php');
 require_once DOL_DOCUMENT_ROOT.'/core/lib/prelevement.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/compta/prelevement/class/bonprelevement.class.php';
 require_once DOL_DOCUMENT_ROOT.'/compta/prelevement/class/ligneprelevement.class.php';
-require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
-
-$langs->load("banks");
-$langs->load("categories");
-$langs->load("withdrawals");
+require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
+
+$langs->load("banks");
+$langs->load("categories");
+$langs->load("withdrawals");
 
 // Security check
 if ($user->societe_id > 0) accessforbidden();
diff --git a/htdocs/compta/prelevement/fiche.php b/htdocs/compta/prelevement/fiche.php
index a7ebf00c950..22af3b3548d 100644
--- a/htdocs/compta/prelevement/fiche.php
+++ b/htdocs/compta/prelevement/fiche.php
@@ -26,10 +26,10 @@
 require('../../main.inc.php');
 require_once DOL_DOCUMENT_ROOT.'/core/lib/prelevement.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/compta/prelevement/class/bonprelevement.class.php';
-require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
-
-$langs->load("banks");
-$langs->load("categories");
+require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
+
+$langs->load("banks");
+$langs->load("categories");
 
 if (!$user->rights->prelevement->bons->lire)
 accessforbidden();
diff --git a/htdocs/compta/prelevement/index.php b/htdocs/compta/prelevement/index.php
index d3823cc130e..56a7529fd9a 100644
--- a/htdocs/compta/prelevement/index.php
+++ b/htdocs/compta/prelevement/index.php
@@ -31,10 +31,10 @@ require_once DOL_DOCUMENT_ROOT.'/compta/prelevement/class/bonprelevement.class.p
 require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
 require_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/prelevement.lib.php';
-require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
-
-$langs->load("banks");
-$langs->load("categories");
+require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
+
+$langs->load("banks");
+$langs->load("categories");
 $langs->load("withdrawals");
 
 // Security check
diff --git a/htdocs/compta/prelevement/ligne.php b/htdocs/compta/prelevement/ligne.php
index 28358dc75f5..54aaf02841a 100644
--- a/htdocs/compta/prelevement/ligne.php
+++ b/htdocs/compta/prelevement/ligne.php
@@ -29,10 +29,10 @@ require_once DOL_DOCUMENT_ROOT.'/compta/prelevement/class/bonprelevement.class.p
 require_once DOL_DOCUMENT_ROOT.'/compta/prelevement/class/ligneprelevement.class.php';
 require_once DOL_DOCUMENT_ROOT.'/compta/prelevement/class/rejetprelevement.class.php';
 require_once DOL_DOCUMENT_ROOT.'/compta/paiement/class/paiement.class.php';
-require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
-
-$langs->load("banks");
-$langs->load("categories");
+require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
+
+$langs->load("banks");
+$langs->load("categories");
 
 // Security check
 if ($user->societe_id > 0) accessforbidden();
diff --git a/htdocs/compta/prelevement/lignes.php b/htdocs/compta/prelevement/lignes.php
index 445f1e66755..c322142b6a9 100644
--- a/htdocs/compta/prelevement/lignes.php
+++ b/htdocs/compta/prelevement/lignes.php
@@ -30,10 +30,10 @@ require_once DOL_DOCUMENT_ROOT.'/compta/prelevement/class/bonprelevement.class.p
 require_once DOL_DOCUMENT_ROOT.'/compta/prelevement/class/ligneprelevement.class.php';
 require_once DOL_DOCUMENT_ROOT.'/compta/prelevement/class/rejetprelevement.class.php';
 require_once DOL_DOCUMENT_ROOT.'/compta/paiement/class/paiement.class.php';
-require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
-
-$langs->load("banks");
-$langs->load("categories");
+require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
+
+$langs->load("banks");
+$langs->load("categories");
 
 // Security check
 if ($user->societe_id > 0) accessforbidden();
diff --git a/htdocs/compta/prelevement/liste.php b/htdocs/compta/prelevement/liste.php
index d3d8634d64a..cd09dc6cf25 100644
--- a/htdocs/compta/prelevement/liste.php
+++ b/htdocs/compta/prelevement/liste.php
@@ -26,9 +26,9 @@
 require('../../main.inc.php');
 require_once DOL_DOCUMENT_ROOT.'/compta/prelevement/class/bonprelevement.class.php';
 require_once DOL_DOCUMENT_ROOT.'/compta/prelevement/class/ligneprelevement.class.php';
-require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
-
-$langs->load("banks");
+require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
+
+$langs->load("banks");
 $langs->load("withdrawals");
 $langs->load("companies");
 $langs->load("categories");
diff --git a/htdocs/compta/prelevement/rejets.php b/htdocs/compta/prelevement/rejets.php
index b33a5fd2455..5744ab0eb7b 100644
--- a/htdocs/compta/prelevement/rejets.php
+++ b/htdocs/compta/prelevement/rejets.php
@@ -28,10 +28,10 @@ require('../../main.inc.php');
 require_once DOL_DOCUMENT_ROOT.'/compta/prelevement/class/rejetprelevement.class.php';
 require_once DOL_DOCUMENT_ROOT.'/compta/prelevement/class/ligneprelevement.class.php';
 require_once DOL_DOCUMENT_ROOT.'/compta/paiement/class/paiement.class.php';
-require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
-
-$langs->load("banks");
-$langs->load("categories");
+require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
+
+$langs->load("banks");
+$langs->load("categories");
 $langs->load("withdrawals");
 $langs->load("companies");
 
diff --git a/htdocs/compta/prelevement/stats.php b/htdocs/compta/prelevement/stats.php
index 34ffdb168b5..418d733dbd4 100644
--- a/htdocs/compta/prelevement/stats.php
+++ b/htdocs/compta/prelevement/stats.php
@@ -26,10 +26,10 @@
 
 require('../../main.inc.php');
 require_once DOL_DOCUMENT_ROOT.'/compta/prelevement/class/ligneprelevement.class.php';
-require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
-
-$langs->load("banks");
-$langs->load("categories");
+require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
+
+$langs->load("banks");
+$langs->load("categories");
 $langs->load("withdrawals");
 $langs->load("companies");
 
diff --git a/htdocs/compta/tva/fiche.php b/htdocs/compta/tva/fiche.php
index a31b4030b65..f36fd0be5a5 100644
--- a/htdocs/compta/tva/fiche.php
+++ b/htdocs/compta/tva/fiche.php
@@ -41,7 +41,7 @@ $socid = isset($_GET["socid"])?$_GET["socid"]:'';
 if ($user->societe_id) $socid=$user->societe_id;
 $result = restrictedArea($user, 'tax', '', '', 'charges');
 
-$tva = new Tva($db);
+$tva = new Tva($db);
 
 // Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array
 $hookmanager->initHooks(array('taxvatcard'));
@@ -54,7 +54,7 @@ $hookmanager->initHooks(array('taxvatcard'));
 
 if ($_POST["cancel"] == $langs->trans("Cancel"))
 {
-	header("Location: reglement.php");
+	header("Location: reglement.php");
 	exit;
 }
 
@@ -231,9 +231,9 @@ if ($id)
 	print $vatpayment->ref;
 	print '</td></tr>';
 
-	// Label
-	print '<tr><td>'.$langs->trans("Label").'</td><td>'.$vatpayment->label.'</td></tr>';
-
+	// Label
+	print '<tr><td>'.$langs->trans("Label").'</td><td>'.$vatpayment->label.'</td></tr>';
+
 	print "<tr>";
 	print '<td>'.$langs->trans("DatePayment").'</td><td colspan="3">';
 	print dol_print_date($vatpayment->datep,'day');
diff --git a/htdocs/contact/class/contact.class.php b/htdocs/contact/class/contact.class.php
index fb1ce97fd01..90bd7861435 100644
--- a/htdocs/contact/class/contact.class.php
+++ b/htdocs/contact/class/contact.class.php
@@ -1009,13 +1009,13 @@ class Contact extends CommonObject
 		$this->country = 'France';
 		$this->email = 'specimen@specimen.com';
 
-		$this->phone_pro = '0909090901';
-		$this->phone_perso = '0909090902';
-		$this->phone_mobile = '0909090903';
-		$this->fax = '0909090909';
+		$this->phone_pro = '0909090901';
+		$this->phone_perso = '0909090902';
+		$this->phone_mobile = '0909090903';
+		$this->fax = '0909090909';
 
-		$this->note_public='This is a comment (public)';
-		$this->note_private='This is a comment (private)';
+		$this->note_public='This is a comment (public)';
+		$this->note_private='This is a comment (private)';
 
 		$socid = rand(1, $num_socs);
 		$this->socid = $socids[$socid];
diff --git a/htdocs/contact/note.php b/htdocs/contact/note.php
index c876c67fe01..27a56b48825 100644
--- a/htdocs/contact/note.php
+++ b/htdocs/contact/note.php
@@ -27,7 +27,7 @@
 
 require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/contact.lib.php';
-require_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php';
+require_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php';
 
 $action = GETPOST('action');
 
@@ -66,7 +66,7 @@ else if ($action == 'setnote_private' && $user->rights->societe->creer)
  *	View
  */
 
-$title = (! empty($conf->global->SOCIETE_ADDRESSES_MANAGEMENT) ? $langs->trans("Contacts") : $langs->trans("ContactsAddresses"));
+$title = (! empty($conf->global->SOCIETE_ADDRESSES_MANAGEMENT) ? $langs->trans("Contacts") : $langs->trans("ContactsAddresses"));
 
 $form = new Form($db);
 
@@ -90,68 +90,68 @@ if ($id > 0)
 
     print '<table class="border" width="100%">';
 
-    $linkback = '<a href="'.DOL_URL_ROOT.'/contact/list.php">'.$langs->trans("BackToList").'</a>';
-    
-    // Ref
-    print '<tr><td width="20%">'.$langs->trans("Ref").'</td><td colspan="3">';
-    print $form->showrefnav($object, 'id', $linkback);
-    print '</td></tr>';
-    
-    // Name
-    print '<tr><td width="20%">'.$langs->trans("Lastname").' / '.$langs->trans("Label").'</td><td width="30%">'.$object->lastname.'</td>';
-    print '<td width="20%">'.$langs->trans("Firstname").'</td><td width="30%">'.$object->firstname.'</td></tr>';
-    
-    // Company
-    if (empty($conf->global->SOCIETE_DISABLE_CONTACTS))
-    {
-    	if ($object->socid > 0)
-    	{
-    		$objsoc = new Societe($db);
-    		$objsoc->fetch($object->socid);
-    
-    		print '<tr><td>'.$langs->trans("Company").'</td><td colspan="3">'.$objsoc->getNomUrl(1).'</td></tr>';
-    	}
-    
-    	else
-    	{
-    		print '<tr><td>'.$langs->trans("Company").'</td><td colspan="3">';
-    		print $langs->trans("ContactNotLinkedToCompany");
-    		print '</td></tr>';
-    	}
-    }
-    
-    // Civility
-    print '<tr><td>'.$langs->trans("UserTitle").'</td><td colspan="3">';
-    print $object->getCivilityLabel();
-    print '</td></tr>';
-    
-    // Date To Birth
-    print '<tr>';
-    if (! empty($object->birthday))
-    {
-    	include_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
-    
-    	print '<td>'.$langs->trans("DateToBirth").'</td><td colspan="3">'.dol_print_date($object->birthday,"day");
-    
-    	print ' &nbsp; ';
-    	//var_dump($birthdatearray);
-    	$ageyear=convertSecondToTime($now-$object->birthday,'year')-1970;
-    	$agemonth=convertSecondToTime($now-$object->birthday,'month')-1;
-    	if ($ageyear >= 2) print '('.$ageyear.' '.$langs->trans("DurationYears").')';
-    	else if ($agemonth >= 2) print '('.$agemonth.' '.$langs->trans("DurationMonths").')';
-    	else print '('.$agemonth.' '.$langs->trans("DurationMonth").')';
-    
-    
-    	print ' &nbsp; - &nbsp; ';
-    	if ($object->birthday_alert) print $langs->trans("BirthdayAlertOn");
-    	else print $langs->trans("BirthdayAlertOff");
-    	print '</td>';
-    }
-    else
-    {
-    	print '<td>'.$langs->trans("DateToBirth").'</td><td colspan="3">'.$langs->trans("Unknown")."</td>";
-    }
-    print "</tr>";
+    $linkback = '<a href="'.DOL_URL_ROOT.'/contact/list.php">'.$langs->trans("BackToList").'</a>';
+    
+    // Ref
+    print '<tr><td width="20%">'.$langs->trans("Ref").'</td><td colspan="3">';
+    print $form->showrefnav($object, 'id', $linkback);
+    print '</td></tr>';
+    
+    // Name
+    print '<tr><td width="20%">'.$langs->trans("Lastname").' / '.$langs->trans("Label").'</td><td width="30%">'.$object->lastname.'</td>';
+    print '<td width="20%">'.$langs->trans("Firstname").'</td><td width="30%">'.$object->firstname.'</td></tr>';
+    
+    // Company
+    if (empty($conf->global->SOCIETE_DISABLE_CONTACTS))
+    {
+    	if ($object->socid > 0)
+    	{
+    		$objsoc = new Societe($db);
+    		$objsoc->fetch($object->socid);
+    
+    		print '<tr><td>'.$langs->trans("Company").'</td><td colspan="3">'.$objsoc->getNomUrl(1).'</td></tr>';
+    	}
+    
+    	else
+    	{
+    		print '<tr><td>'.$langs->trans("Company").'</td><td colspan="3">';
+    		print $langs->trans("ContactNotLinkedToCompany");
+    		print '</td></tr>';
+    	}
+    }
+    
+    // Civility
+    print '<tr><td>'.$langs->trans("UserTitle").'</td><td colspan="3">';
+    print $object->getCivilityLabel();
+    print '</td></tr>';
+    
+    // Date To Birth
+    print '<tr>';
+    if (! empty($object->birthday))
+    {
+    	include_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
+    
+    	print '<td>'.$langs->trans("DateToBirth").'</td><td colspan="3">'.dol_print_date($object->birthday,"day");
+    
+    	print ' &nbsp; ';
+    	//var_dump($birthdatearray);
+    	$ageyear=convertSecondToTime($now-$object->birthday,'year')-1970;
+    	$agemonth=convertSecondToTime($now-$object->birthday,'month')-1;
+    	if ($ageyear >= 2) print '('.$ageyear.' '.$langs->trans("DurationYears").')';
+    	else if ($agemonth >= 2) print '('.$agemonth.' '.$langs->trans("DurationMonths").')';
+    	else print '('.$agemonth.' '.$langs->trans("DurationMonth").')';
+    
+    
+    	print ' &nbsp; - &nbsp; ';
+    	if ($object->birthday_alert) print $langs->trans("BirthdayAlertOn");
+    	else print $langs->trans("BirthdayAlertOff");
+    	print '</td>';
+    }
+    else
+    {
+    	print '<td>'.$langs->trans("DateToBirth").'</td><td colspan="3">'.$langs->trans("Unknown")."</td>";
+    }
+    print "</tr>";
     
     print "</table>";
 
diff --git a/htdocs/core/boxes/box_activity.php b/htdocs/core/boxes/box_activity.php
index ad0da9451e9..d0b59b67dd7 100644
--- a/htdocs/core/boxes/box_activity.php
+++ b/htdocs/core/boxes/box_activity.php
@@ -42,21 +42,21 @@ class box_activity extends ModeleBoxes
 	var $info_box_contents = array();
 
 
-	/**
-	 *  Constructor
-	 *
-	 * 	@param	DoliDB	$db			Database handler
-	 *  @param	string	$param		More parameters
-	 */
-	function __construct($db,$param)
-	{
-		global $conf;
-
-		$this->db=$db;
+	/**
+	 *  Constructor
+	 *
+	 * 	@param	DoliDB	$db			Database handler
+	 *  @param	string	$param		More parameters
+	 */
+	function __construct($db,$param)
+	{
+		global $conf;
+
+		$this->db=$db;
 		// FIXME: Use a cache to save data because this slow down too much main home page. This box slow down too seriously software.
 		// FIXME: Removed number_format (not compatible with all languages)
 		// FIXME: Pb into some status
-		$this->enabled=$conf->global->MAIN_FEATURES_LEVEL;	// Not enabled by default due to bugs (see previous FIXME)
+		$this->enabled=$conf->global->MAIN_FEATURES_LEVEL;	// Not enabled by default due to bugs (see previous FIXME)
 	}
 
 	/**
diff --git a/htdocs/core/boxes/box_graph_invoices_permonth.php b/htdocs/core/boxes/box_graph_invoices_permonth.php
index 3ec5add8a05..5bce26306f3 100644
--- a/htdocs/core/boxes/box_graph_invoices_permonth.php
+++ b/htdocs/core/boxes/box_graph_invoices_permonth.php
@@ -39,18 +39,18 @@ class box_graph_invoices_permonth extends ModeleBoxes
 	var $info_box_contents = array();
 
 
-	/**
-	 *  Constructor
-	 *
-	 * 	@param	DoliDB	$db			Database handler
-	 *  @param	string	$param		More parameters
-	 */
-	function __construct($db,$param)
+	/**
+	 *  Constructor
+	 *
+	 * 	@param	DoliDB	$db			Database handler
+	 *  @param	string	$param		More parameters
+	 */
+	function __construct($db,$param)
 	{
 		global $conf;
-
-		$this->db=$db;
-		$this->enabled=$conf->global->MAIN_FEATURES_LEVEL;
+
+		$this->db=$db;
+		$this->enabled=$conf->global->MAIN_FEATURES_LEVEL;
 	}
 
 	/**
diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php
index 2cbf113b362..419174a31dc 100644
--- a/htdocs/core/class/commonobject.class.php
+++ b/htdocs/core/class/commonobject.class.php
@@ -81,24 +81,24 @@ abstract class CommonObject
         return dol_trunc($ret,$maxlen);
     }
 
-    /**
-     * 	Return full address of contact
-     *
-     * 	@param		int			$withcountry		1=Add country into address string
-     *  @param		string		$sep				Separator to use to build string
-     *	@return		string							Full address string
-     */
-    function getFullAddress($withcountry=0,$sep="\n")
-    {
-    	if ($withcountry && $this->country_id && (empty($this->country_code) || empty($this->country)))
-    	{
-    		require_once DOL_DOCUMENT_ROOT .'/core/lib/company.lib.php';
-    		$tmparray=getCountry($this->country_id,'all');
-    		$this->country_code=$tmparray['code'];
-    		$this->country     =$tmparray['label'];
-    	}
+    /**
+     * 	Return full address of contact
+     *
+     * 	@param		int			$withcountry		1=Add country into address string
+     *  @param		string		$sep				Separator to use to build string
+     *	@return		string							Full address string
+     */
+    function getFullAddress($withcountry=0,$sep="\n")
+    {
+    	if ($withcountry && $this->country_id && (empty($this->country_code) || empty($this->country)))
+    	{
+    		require_once DOL_DOCUMENT_ROOT .'/core/lib/company.lib.php';
+    		$tmparray=getCountry($this->country_id,'all');
+    		$this->country_code=$tmparray['code'];
+    		$this->country     =$tmparray['label'];
+    	}
 
-    	return dol_format_address($this, $withcountry, $sep);
+    	return dol_format_address($this, $withcountry, $sep);
     }
 
     /**
diff --git a/htdocs/core/class/conf.class.php b/htdocs/core/class/conf.class.php
index a7a8fe04903..4ce1bbf8c3d 100644
--- a/htdocs/core/class/conf.class.php
+++ b/htdocs/core/class/conf.class.php
@@ -63,11 +63,11 @@ class Conf
 	//! Used to store list of entities to use for each element
 	public $entities				= array();
 
-	public $dol_hide_topmenu;			// Set if we force param dol_hide_topmenu into login url
-	public $dol_hide_leftmenu;			// Set if we force param dol_hide_leftmenu into login url
-	public $dol_optimize_smallscreen;	// Set if we force param dol_optimize_smallscreen into login url or if browser is smartphone
-	public $dol_no_mouse_hover;			// Set if we force param dol_no_mouse_hover into login url or if browser is smartphone
-	public $dol_use_jmobile;			// Set if we force param dol_use_jmobile into login url
+	public $dol_hide_topmenu;			// Set if we force param dol_hide_topmenu into login url
+	public $dol_hide_leftmenu;			// Set if we force param dol_hide_leftmenu into login url
+	public $dol_optimize_smallscreen;	// Set if we force param dol_optimize_smallscreen into login url or if browser is smartphone
+	public $dol_no_mouse_hover;			// Set if we force param dol_no_mouse_hover into login url or if browser is smartphone
+	public $dol_use_jmobile;			// Set if we force param dol_use_jmobile into login url
 
 
 	/**
diff --git a/htdocs/core/class/hookmanager.class.php b/htdocs/core/class/hookmanager.class.php
index 58c7063e40a..43722bb59f2 100755
--- a/htdocs/core/class/hookmanager.class.php
+++ b/htdocs/core/class/hookmanager.class.php
@@ -166,8 +166,8 @@ class HookManager
                     		}
                     	}
 
-                    	if (is_array($actionclassinstance->results))  $this->resArray =array_merge($this->resArray, $actionclassinstance->results);
-                    	if (! empty($actionclassinstance->resprints)) $this->resPrint.=$actionclassinstance->resprints;
+                    	if (is_array($actionclassinstance->results))  $this->resArray =array_merge($this->resArray, $actionclassinstance->results);
+                    	if (! empty($actionclassinstance->resprints)) $this->resPrint.=$actionclassinstance->resprints;
                     }
                     // Generic hooks that return a string or array (printSearchForm, printLeftBlock, printTopRightMenu, formAddObjectLine, formBuilddocOptions, ...)
                     else
diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index 6501dd94ef8..d68d9c8d59f 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -702,13 +702,13 @@ class Form
                 	$selected_input_value=$product->ref;
                 }
 =======
-				if ($selected && empty($selected_input_value))
-                {
-                	require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
-                	$product = new Product($this->db);
-                	$product->fetch($selected);
-                	$selected_input_value=$product->ref;
-                }
+				if ($selected && empty($selected_input_value))
+                {
+                	require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
+                	$product = new Product($this->db);
+                	$product->fetch($selected);
+                	$selected_input_value=$product->ref;
+                }
 >>>>>>> refs/remotes/origin/3.3
                 // mode=1 means customers products
                 $ajaxoptions=array();
diff --git a/htdocs/core/class/html.formactions.class.php b/htdocs/core/class/html.formactions.class.php
index b7477c203f5..ef8422a7dbc 100644
--- a/htdocs/core/class/html.formactions.class.php
+++ b/htdocs/core/class/html.formactions.class.php
@@ -230,7 +230,7 @@ class FormActions
        	//asort($arraylist);
 
        	if ($selected == 'manual') $selected='AC_OTH';
-       	if ($selected == 'auto')   $selected='AC_OTH_AUTO';
+       	if ($selected == 'auto')   $selected='AC_OTH_AUTO';
        	
         print $form->selectarray($htmlname, $arraylist, $selected);
         if ($user->admin && empty($onlyautoornot)) print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionnarySetup"),1);
diff --git a/htdocs/core/class/html.formfile.class.php b/htdocs/core/class/html.formfile.class.php
index 5d2fbf4f225..f8f2503c9a7 100644
--- a/htdocs/core/class/html.formfile.class.php
+++ b/htdocs/core/class/html.formfile.class.php
@@ -383,18 +383,18 @@ 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>
-';*/
+
+// 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">';
diff --git a/htdocs/core/class/html.formother.class.php b/htdocs/core/class/html.formother.class.php
index c2d3a7c32c2..f5def186abb 100644
--- a/htdocs/core/class/html.formother.class.php
+++ b/htdocs/core/class/html.formother.class.php
@@ -945,30 +945,30 @@ class FormOther
 	        	if (! count($arrayboxtoactivatelabel)) print 'jQuery("#boxcombo").hide();';
 	        	print  '
 
-	        	jQuery("#left, #right").sortable({
-		        	/* placeholder: \'ui-state-highlight\', */
-	    	    	handle: \'.boxhandle\',
-	    	    	revert: \'invalid\',
-	       			items: \'.box\',
-	        		containment: \'.fiche\',
-	        		connectWith: \'.connectedSortable\',
-	        		stop: function(event, ui) {
-	        			updateBoxOrder(0);
-	        		}
+	        	jQuery("#left, #right").sortable({
+		        	/* placeholder: \'ui-state-highlight\', */
+	    	    	handle: \'.boxhandle\',
+	    	    	revert: \'invalid\',
+	       			items: \'.box\',
+	        		containment: \'.fiche\',
+	        		connectWith: \'.connectedSortable\',
+	        		stop: function(event, ui) {
+	        			updateBoxOrder(0);
+	        		}
 	    		});
 
-	        	jQuery(".boxclose").click(function() {
-	        		var self = this;	// because JQuery can modify this
+	        	jQuery(".boxclose").click(function() {
+	        		var self = this;	// because JQuery can modify this
 	        		var boxid=self.id.substring(8);
-	        		var label=jQuery(\'#boxlabelentry\'+boxid).val();
+	        		var label=jQuery(\'#boxlabelentry\'+boxid).val();
 	        		jQuery(\'#boxto_\'+boxid).remove();
 	        		if (boxid > 0) jQuery(\'#boxcombo\').append(new Option(label, boxid));
-	        		updateBoxOrder(1);
-	        	});
+	        		updateBoxOrder(1);
+	        	});
 
-        	});'."\n";
+        	});'."\n";
 
-	        print '</script>'."\n";
+	        print '</script>'."\n";
         }
 
         $nbboxactivated=count($boxidactivatedforuser);
diff --git a/htdocs/core/lib/admin.lib.php b/htdocs/core/lib/admin.lib.php
index 6e302fa9806..f80bdcf79e6 100644
--- a/htdocs/core/lib/admin.lib.php
+++ b/htdocs/core/lib/admin.lib.php
@@ -300,7 +300,7 @@ function run_sql($sqlfile,$silent=1,$entity='',$usesavepoint=1,$handler='',$oker
                 $sqlmodified++;
             }
 
-            if ($sqlmodified) dol_syslog('Admin.lib::run_sql New Request '.($i+1).' sql='.$newsql, LOG_DEBUG);
+            if ($sqlmodified) dol_syslog('Admin.lib::run_sql New Request '.($i+1).' sql='.$newsql, LOG_DEBUG);
 
             $result=$db->query($newsql,$usesavepoint);
             if ($result)
@@ -1078,13 +1078,13 @@ function form_constantes($tableau,$strictw3c=0)
             }
             if ($const == 'ADHERENT_MAILMAN_LISTS')
             {
-            	print '. '.$langs->trans("Example").': <a href="#" id="exampleclick3">'.img_down().'</a><br>';
+            	print '. '.$langs->trans("Example").': <a href="#" id="exampleclick3">'.img_down().'</a><br>';
             	print '<div id="example3" class="hidden">';
-            	print 'mymailmanlist<br>';
+            	print 'mymailmanlist<br>';
             	print 'mymailmanlist1,mymailmanlist2<br>';
-            	if ($conf->categorie->enabled) print 'CATEG:Categ1:mymailmanlist1,CATEG:Categ2:mymailmanlist2<br>';
-            	print '</div>';
-            	//print 'http://lists.domain.com/cgi-bin/mailman/admin/%LISTE%/members/remove?adminpw=%MAILMAN_ADMINPW%&unsubscribees=%EMAIL%';
+            	if ($conf->categorie->enabled) print 'CATEG:Categ1:mymailmanlist1,CATEG:Categ2:mymailmanlist2<br>';
+            	print '</div>';
+            	//print 'http://lists.domain.com/cgi-bin/mailman/admin/%LISTE%/members/remove?adminpw=%MAILMAN_ADMINPW%&unsubscribees=%EMAIL%';
             }
 
             print "</td>\n";
diff --git a/htdocs/core/lib/barcode.lib.php b/htdocs/core/lib/barcode.lib.php
index 67b51748d3e..83d161a20a0 100644
--- a/htdocs/core/lib/barcode.lib.php
+++ b/htdocs/core/lib/barcode.lib.php
@@ -253,7 +253,7 @@ function barcode_encode_genbarcode($code,$encoding)
 
     $command=escapeshellarg($genbarcode_loc);
     //$paramclear=" \"".str_replace("\"", "\\\"",$code)."\" \"".str_replace("\"", "\\\"",strtoupper($encoding))."\"";
-    $paramclear=" ".escapeshellarg($code)." ".escapeshellarg(strtoupper($encoding));
+    $paramclear=" ".escapeshellarg($code)." ".escapeshellarg(strtoupper($encoding));
     
     $fullcommandclear=$command." ".$paramclear." 2>&1";
     //print $fullcommandclear."<br>\n";exit;
diff --git a/htdocs/core/lib/contact.lib.php b/htdocs/core/lib/contact.lib.php
index bbbce42315b..96da640962d 100644
--- a/htdocs/core/lib/contact.lib.php
+++ b/htdocs/core/lib/contact.lib.php
@@ -66,11 +66,11 @@ function contact_prepare_head($object)
     // $this->tabs = array('entity:-tabname);   												to remove a tab
     complete_head_from_modules($conf,$langs,$object,$head,$h,'contact');
 
-    // Notes
-    $head[$h][0] = DOL_URL_ROOT.'/contact/note.php?id='.$object->id;
-    $head[$h][1] = $langs->trans("Note");
-    $head[$h][2] = 'note';
-    $h++;
+    // Notes
+    $head[$h][0] = DOL_URL_ROOT.'/contact/note.php?id='.$object->id;
+    $head[$h][1] = $langs->trans("Note");
+    $head[$h][2] = 'note';
+    $h++;
     
     // Info
     $head[$h][0] = DOL_URL_ROOT.'/contact/info.php?id='.$object->id;
diff --git a/htdocs/core/lib/files.lib.php b/htdocs/core/lib/files.lib.php
index 1845334e6e9..b2073ff314f 100644
--- a/htdocs/core/lib/files.lib.php
+++ b/htdocs/core/lib/files.lib.php
@@ -1251,175 +1251,175 @@ function dol_check_secure_access_document($modulepart,$original_file,$entity,$re
 	$sqlprotectagainstexternals='';
 	$ret=array();
 
-	// find the subdirectory name as the reference
+	// find the subdirectory name as the reference
 	if (empty($refname)) $refname=basename(dirname($original_file)."/");
 	
 	// Wrapping for some images
-	if ($modulepart == 'companylogo')
-	{
-		$accessallowed=1;
-		$original_file=$conf->mycompany->dir_output.'/logos/'.$original_file;
-	}
-	// Wrapping for users photos
-	elseif ($modulepart == 'userphoto')
-	{
-		$accessallowed=1;
-		$original_file=$conf->user->dir_output.'/'.$original_file;
-	}
-	// Wrapping for members photos
-	elseif ($modulepart == 'memberphoto')
-	{
-		$accessallowed=1;
-		$original_file=$conf->adherent->dir_output.'/'.$original_file;
+	if ($modulepart == 'companylogo')
+	{
+		$accessallowed=1;
+		$original_file=$conf->mycompany->dir_output.'/logos/'.$original_file;
 	}
-	// Wrapping pour les apercu factures
-	elseif ($modulepart == 'apercufacture')
-	{
-		if ($user->rights->facture->lire) $accessallowed=1;
-		$original_file=$conf->facture->dir_output.'/'.$original_file;
-	}
-	// Wrapping pour les apercu propal
-	elseif ($modulepart == 'apercupropal')
-	{
-		if ($user->rights->propale->lire) $accessallowed=1;
-		$original_file=$conf->propal->dir_output.'/'.$original_file;
-	}
-	// Wrapping pour les apercu commande
-	elseif ($modulepart == 'apercucommande')
-	{
-		if ($user->rights->commande->lire) $accessallowed=1;
-		$original_file=$conf->commande->dir_output.'/'.$original_file;
-	}
-	// Wrapping pour les apercu intervention
-	elseif ($modulepart == 'apercufichinter')
-	{
-		if ($user->rights->ficheinter->lire) $accessallowed=1;
-		$original_file=$conf->ficheinter->dir_output.'/'.$original_file;
-	}
-	// Wrapping pour les images des stats propales
-	elseif ($modulepart == 'propalstats')
-	{
-		if ($user->rights->propale->lire) $accessallowed=1;
-		$original_file=$conf->propal->dir_temp.'/'.$original_file;
-	}
-	// Wrapping pour les images des stats commandes
-	elseif ($modulepart == 'orderstats')
-	{
-		if ($user->rights->commande->lire) $accessallowed=1;
-		$original_file=$conf->commande->dir_temp.'/'.$original_file;
-	}
-	elseif ($modulepart == 'orderstatssupplier')
-	{
-		if ($user->rights->fournisseur->commande->lire) $accessallowed=1;
-		$original_file=$conf->fournisseur->dir_output.'/commande/temp/'.$original_file;
-	}
-	// Wrapping pour les images des stats factures
-	elseif ($modulepart == 'billstats')
-	{
-		if ($user->rights->facture->lire) $accessallowed=1;
-		$original_file=$conf->facture->dir_temp.'/'.$original_file;
-	}
-	elseif ($modulepart == 'billstatssupplier')
-	{
-		if ($user->rights->fournisseur->facture->lire) $accessallowed=1;
-		$original_file=$conf->fournisseur->dir_output.'/facture/temp/'.$original_file;
-	}
-	// Wrapping pour les images des stats expeditions
-	elseif ($modulepart == 'expeditionstats')
-	{
-		if ($user->rights->expedition->lire) $accessallowed=1;
-		$original_file=$conf->expedition->dir_temp.'/'.$original_file;
-	}
-	// Wrapping pour les images des stats expeditions
-	elseif ($modulepart == 'tripsexpensesstats')
-	{
-		if ($user->rights->deplacement->lire) $accessallowed=1;
-		$original_file=$conf->deplacement->dir_temp.'/'.$original_file;
-	}
-	// Wrapping pour les images des stats expeditions
-	elseif ($modulepart == 'memberstats')
-	{
-		if ($user->rights->adherent->lire) $accessallowed=1;
-		$original_file=$conf->adherent->dir_temp.'/'.$original_file;
-	}
-	// Wrapping pour les images des stats produits
-	elseif (preg_match('/^productstats_/i',$modulepart))
-	{
-		if ($user->rights->produit->lire || $user->rights->service->lire) $accessallowed=1;
-		$original_file=(!empty($conf->product->multidir_temp[$entity])?$conf->product->multidir_temp[$entity]:$conf->service->multidir_temp[$entity]).'/'.$original_file;
-	}
-	// Wrapping for products or services
-	elseif ($modulepart == 'tax')
-	{
-		if ($user->rights->tax->charges->lire) $accessallowed=1;
-		$original_file=$conf->tax->dir_output.'/'.$original_file;
-	}
-	// Wrapping for products or services
-	elseif ($modulepart == 'actions')
-	{
-		if ($user->rights->agenda->myactions->read) $accessallowed=1;
-		$original_file=$conf->agenda->dir_output.'/'.$original_file;
-	}
-	// Wrapping for categories
-	elseif ($modulepart == 'category')
-	{
-		if ($user->rights->categorie->lire) $accessallowed=1;
-		$original_file=$conf->categorie->multidir_output[$entity].'/'.$original_file;
-	}
-	// Wrapping pour les prelevements
-	elseif ($modulepart == 'prelevement')
+	// Wrapping for users photos
+	elseif ($modulepart == 'userphoto')
+	{
+		$accessallowed=1;
+		$original_file=$conf->user->dir_output.'/'.$original_file;
+	}
+	// Wrapping for members photos
+	elseif ($modulepart == 'memberphoto')
+	{
+		$accessallowed=1;
+		$original_file=$conf->adherent->dir_output.'/'.$original_file;
+	}
+	// Wrapping pour les apercu factures
+	elseif ($modulepart == 'apercufacture')
+	{
+		if ($user->rights->facture->lire) $accessallowed=1;
+		$original_file=$conf->facture->dir_output.'/'.$original_file;
+	}
+	// Wrapping pour les apercu propal
+	elseif ($modulepart == 'apercupropal')
+	{
+		if ($user->rights->propale->lire) $accessallowed=1;
+		$original_file=$conf->propal->dir_output.'/'.$original_file;
+	}
+	// Wrapping pour les apercu commande
+	elseif ($modulepart == 'apercucommande')
+	{
+		if ($user->rights->commande->lire) $accessallowed=1;
+		$original_file=$conf->commande->dir_output.'/'.$original_file;
+	}
+	// Wrapping pour les apercu intervention
+	elseif ($modulepart == 'apercufichinter')
+	{
+		if ($user->rights->ficheinter->lire) $accessallowed=1;
+		$original_file=$conf->ficheinter->dir_output.'/'.$original_file;
+	}
+	// Wrapping pour les images des stats propales
+	elseif ($modulepart == 'propalstats')
+	{
+		if ($user->rights->propale->lire) $accessallowed=1;
+		$original_file=$conf->propal->dir_temp.'/'.$original_file;
+	}
+	// Wrapping pour les images des stats commandes
+	elseif ($modulepart == 'orderstats')
+	{
+		if ($user->rights->commande->lire) $accessallowed=1;
+		$original_file=$conf->commande->dir_temp.'/'.$original_file;
+	}
+	elseif ($modulepart == 'orderstatssupplier')
+	{
+		if ($user->rights->fournisseur->commande->lire) $accessallowed=1;
+		$original_file=$conf->fournisseur->dir_output.'/commande/temp/'.$original_file;
+	}
+	// Wrapping pour les images des stats factures
+	elseif ($modulepart == 'billstats')
+	{
+		if ($user->rights->facture->lire) $accessallowed=1;
+		$original_file=$conf->facture->dir_temp.'/'.$original_file;
+	}
+	elseif ($modulepart == 'billstatssupplier')
+	{
+		if ($user->rights->fournisseur->facture->lire) $accessallowed=1;
+		$original_file=$conf->fournisseur->dir_output.'/facture/temp/'.$original_file;
+	}
+	// Wrapping pour les images des stats expeditions
+	elseif ($modulepart == 'expeditionstats')
+	{
+		if ($user->rights->expedition->lire) $accessallowed=1;
+		$original_file=$conf->expedition->dir_temp.'/'.$original_file;
+	}
+	// Wrapping pour les images des stats expeditions
+	elseif ($modulepart == 'tripsexpensesstats')
+	{
+		if ($user->rights->deplacement->lire) $accessallowed=1;
+		$original_file=$conf->deplacement->dir_temp.'/'.$original_file;
+	}
+	// Wrapping pour les images des stats expeditions
+	elseif ($modulepart == 'memberstats')
+	{
+		if ($user->rights->adherent->lire) $accessallowed=1;
+		$original_file=$conf->adherent->dir_temp.'/'.$original_file;
+	}
+	// Wrapping pour les images des stats produits
+	elseif (preg_match('/^productstats_/i',$modulepart))
+	{
+		if ($user->rights->produit->lire || $user->rights->service->lire) $accessallowed=1;
+		$original_file=(!empty($conf->product->multidir_temp[$entity])?$conf->product->multidir_temp[$entity]:$conf->service->multidir_temp[$entity]).'/'.$original_file;
+	}
+	// Wrapping for products or services
+	elseif ($modulepart == 'tax')
+	{
+		if ($user->rights->tax->charges->lire) $accessallowed=1;
+		$original_file=$conf->tax->dir_output.'/'.$original_file;
+	}
+	// Wrapping for products or services
+	elseif ($modulepart == 'actions')
+	{
+		if ($user->rights->agenda->myactions->read) $accessallowed=1;
+		$original_file=$conf->agenda->dir_output.'/'.$original_file;
+	}
+	// Wrapping for categories
+	elseif ($modulepart == 'category')
+	{
+		if ($user->rights->categorie->lire) $accessallowed=1;
+		$original_file=$conf->categorie->multidir_output[$entity].'/'.$original_file;
+	}
+	// Wrapping pour les prelevements
+	elseif ($modulepart == 'prelevement')
 	{
 		if ($user->rights->prelevement->bons->lire || preg_match('/^specimen/i',$original_file))
 		{
 			$accessallowed=1;
 		}
-		$original_file=$conf->prelevement->dir_output.'/'.$original_file;
-	}
-	// Wrapping pour les graph energie
-	elseif ($modulepart == 'graph_stock')
-	{
-		$accessallowed=1;
-		$original_file=$conf->stock->dir_temp.'/'.$original_file;
-	}
-	// Wrapping pour les graph fournisseurs
-	elseif ($modulepart == 'graph_fourn')
-	{
-		$accessallowed=1;
-		$original_file=$conf->fournisseur->dir_temp.'/'.$original_file;
-	}
-	// Wrapping pour les graph des produits
-	elseif ($modulepart == 'graph_product')
-	{
-		$accessallowed=1;
-		$original_file=$conf->product->multidir_temp[$entity].'/'.$original_file;
-	}
-	// Wrapping pour les code barre
-	elseif ($modulepart == 'barcode')
-	{
-		$accessallowed=1;
-		// If viewimage is called for barcode, we try to output an image on the fly,
-		// with not build of file on disk.
-		//$original_file=$conf->barcode->dir_temp.'/'.$original_file;
-		$original_file='';
-	}
-	// Wrapping pour les icones de background des mailings
-	elseif ($modulepart == 'iconmailing')
-	{
-		$accessallowed=1;
-		$original_file=$conf->mailing->dir_temp.'/'.$original_file;
-	}
-	// Wrapping pour les icones de background des mailings
-	elseif ($modulepart == 'scanner_user_temp')
-	{
-		$accessallowed=1;
-		$original_file=$conf->scanner->dir_temp.'/'.$user->id.'/'.$original_file;
-	}
-	// Wrapping pour les images fckeditor
-	elseif ($modulepart == 'fckeditor')
-	{
-		$accessallowed=1;
-		$original_file=$conf->fckeditor->dir_output.'/'.$original_file;
-	}
+		$original_file=$conf->prelevement->dir_output.'/'.$original_file;
+	}
+	// Wrapping pour les graph energie
+	elseif ($modulepart == 'graph_stock')
+	{
+		$accessallowed=1;
+		$original_file=$conf->stock->dir_temp.'/'.$original_file;
+	}
+	// Wrapping pour les graph fournisseurs
+	elseif ($modulepart == 'graph_fourn')
+	{
+		$accessallowed=1;
+		$original_file=$conf->fournisseur->dir_temp.'/'.$original_file;
+	}
+	// Wrapping pour les graph des produits
+	elseif ($modulepart == 'graph_product')
+	{
+		$accessallowed=1;
+		$original_file=$conf->product->multidir_temp[$entity].'/'.$original_file;
+	}
+	// Wrapping pour les code barre
+	elseif ($modulepart == 'barcode')
+	{
+		$accessallowed=1;
+		// If viewimage is called for barcode, we try to output an image on the fly,
+		// with not build of file on disk.
+		//$original_file=$conf->barcode->dir_temp.'/'.$original_file;
+		$original_file='';
+	}
+	// Wrapping pour les icones de background des mailings
+	elseif ($modulepart == 'iconmailing')
+	{
+		$accessallowed=1;
+		$original_file=$conf->mailing->dir_temp.'/'.$original_file;
+	}
+	// Wrapping pour les icones de background des mailings
+	elseif ($modulepart == 'scanner_user_temp')
+	{
+		$accessallowed=1;
+		$original_file=$conf->scanner->dir_temp.'/'.$user->id.'/'.$original_file;
+	}
+	// Wrapping pour les images fckeditor
+	elseif ($modulepart == 'fckeditor')
+	{
+		$accessallowed=1;
+		$original_file=$conf->fckeditor->dir_output.'/'.$original_file;
+	}
 
 	// Wrapping for third parties
 	else if ($modulepart == 'company' || $modulepart == 'societe')
@@ -1711,36 +1711,36 @@ function dol_check_secure_access_document($modulepart,$original_file,$entity,$re
     else
 	{
 		// Define $accessallowed
-		if (preg_match('/^([a-z]+)_user_temp$/i',$modulepart,$reg))
-		{
-			if ($user->rights->$reg[1]->lire || $user->rights->$reg[1]->read || ($user->rights->$reg[1]->download)) $accessallowed=1;
-			$original_file=$conf->$reg[1]->dir_temp.'/'.$user->id.'/'.$original_file;
-		}
-		else if (preg_match('/^([a-z]+)_temp$/i',$modulepart,$reg))
-		{
-			if ($user->rights->$reg[1]->lire || $user->rights->$reg[1]->read || ($user->rights->$reg[1]->download)) $accessallowed=1;
-			$original_file=$conf->$reg[1]->dir_temp.'/'.$original_file;
-		}
-		else if (preg_match('/^([a-z]+)_user$/i',$modulepart,$reg))
-		{
-			if ($user->rights->$reg[1]->lire || $user->rights->$reg[1]->read || ($user->rights->$reg[1]->download)) $accessallowed=1;
-			$original_file=$conf->$reg[1]->dir_output.'/'.$user->id.'/'.$original_file;
-		}
-		else
-		{
-			$perm=GETPOST('perm');
-			$subperm=GETPOST('subperm');
-			if ($perm || $subperm)
-			{
-				if (($perm && ! $subperm && $user->rights->$modulepart->$perm) || ($perm && $subperm && $user->rights->$modulepart->$perm->$subperm)) $accessallowed=1;
-				$original_file=$conf->$modulepart->dir_output.'/'.$original_file;
-			}
-			else
-			{
-				if ($user->rights->$modulepart->lire || $user->rights->$modulepart->read) $accessallowed=1;
-				$original_file=$conf->$modulepart->dir_output.'/'.$original_file;
-			}
-		}
+		if (preg_match('/^([a-z]+)_user_temp$/i',$modulepart,$reg))
+		{
+			if ($user->rights->$reg[1]->lire || $user->rights->$reg[1]->read || ($user->rights->$reg[1]->download)) $accessallowed=1;
+			$original_file=$conf->$reg[1]->dir_temp.'/'.$user->id.'/'.$original_file;
+		}
+		else if (preg_match('/^([a-z]+)_temp$/i',$modulepart,$reg))
+		{
+			if ($user->rights->$reg[1]->lire || $user->rights->$reg[1]->read || ($user->rights->$reg[1]->download)) $accessallowed=1;
+			$original_file=$conf->$reg[1]->dir_temp.'/'.$original_file;
+		}
+		else if (preg_match('/^([a-z]+)_user$/i',$modulepart,$reg))
+		{
+			if ($user->rights->$reg[1]->lire || $user->rights->$reg[1]->read || ($user->rights->$reg[1]->download)) $accessallowed=1;
+			$original_file=$conf->$reg[1]->dir_output.'/'.$user->id.'/'.$original_file;
+		}
+		else
+		{
+			$perm=GETPOST('perm');
+			$subperm=GETPOST('subperm');
+			if ($perm || $subperm)
+			{
+				if (($perm && ! $subperm && $user->rights->$modulepart->$perm) || ($perm && $subperm && $user->rights->$modulepart->$perm->$subperm)) $accessallowed=1;
+				$original_file=$conf->$modulepart->dir_output.'/'.$original_file;
+			}
+			else
+			{
+				if ($user->rights->$modulepart->lire || $user->rights->$modulepart->read) $accessallowed=1;
+				$original_file=$conf->$modulepart->dir_output.'/'.$original_file;
+			}
+		}
 		if (preg_match('/^specimen/i',$original_file))	$accessallowed=1;    // If link to a specimen
 		if ($user->admin) $accessallowed=1;    // If user is admin
 
diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index 49a0fff506f..b54a370817f 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -741,7 +741,7 @@ function dol_format_address($object,$withcountry=0,$sep="\n")
 		}
 	}
 
-	if ($withcountry) $ret.=($object->country?$sep.$object->country:'');
+	if ($withcountry) $ret.=($object->country?$sep.$object->country:'');
 
 	return $ret;
 }
@@ -834,12 +834,12 @@ function dol_print_date($time,$format='',$tzoutput='tzserver',$outputlangs='',$e
 	else if ($format == 'dayxcard')	 	$format='%Y%m%d';
 	else if ($format == 'dayrfc')			 $format='%Y-%m-%d';             // DATE_RFC3339
 	else if ($format == 'dayhourrfc')		 $format='%Y-%m-%dT%H:%M:%SZ';   // DATETIME RFC3339
-	else if ($format == 'standard')		$format='%Y-%m-%d %H:%M:%S';
+	else if ($format == 'standard')		$format='%Y-%m-%d %H:%M:%S';
 
 	if ($reduceformat)
 	{
-		$format=str_replace('%Y','%y',$format);
-		$format=str_replace('yyyy','yy',$format);
+		$format=str_replace('%Y','%y',$format);
+		$format=str_replace('yyyy','yy',$format);
 	}
 
 	// If date undefined or "", we return ""
@@ -1230,8 +1230,8 @@ function dol_print_phone($phone,$country='',$cid=0,$socid=0,$addlink='',$separ="
 	{
 		if (! empty($conf->browser->phone))	// If phone, we use link of phone
 		{
-			$newphone ='<a href="tel:'.$phone.'"';
-			$newphone.='>'.$phone.'</a>';
+			$newphone ='<a href="tel:'.$phone.'"';
+			$newphone.='>'.$phone.'</a>';
 		}
 		else if (! empty($conf->clicktodial->enabled) && $addlink == 'AC_TEL')		// If click to dial, we use click to dial url
 		{
@@ -2329,10 +2329,10 @@ function getTitleFieldOfList($name, $thead=0, $file="", $field="", $begin="", $m
 
 	if (! empty($conf->dol_optimize_smallscreen) && empty($thead) && $field)    // If this is a sort field
 	{
-		$options=preg_replace('/sortfield=([a-zA-Z0-9,\s\.]+)/i','',$moreparam);
-		$options=preg_replace('/sortorder=([a-zA-Z0-9,\s\.]+)/i','',$options);
-		$options=preg_replace('/&+/i','&',$options);
-		if (! preg_match('/^&/',$options)) $options='&'.$options;
+		$options=preg_replace('/sortfield=([a-zA-Z0-9,\s\.]+)/i','',$moreparam);
+		$options=preg_replace('/sortorder=([a-zA-Z0-9,\s\.]+)/i','',$options);
+		$options=preg_replace('/&+/i','&',$options);
+		if (! preg_match('/^&/',$options)) $options='&'.$options;
 
 		if ($sortorder == 'DESC' ) 	$out.= '<a href="'.$file.'?sortfield='.$field.'&sortorder=asc&begin='.$begin.$options.'">';
 		if ($sortorder == 'ASC' ) 	$out.= '<a href="'.$file.'?sortfield='.$field.'&sortorder=desc&begin='.$begin.$options.'">';
@@ -2342,7 +2342,7 @@ function getTitleFieldOfList($name, $thead=0, $file="", $field="", $begin="", $m
 
 	if (! empty($conf->dol_optimize_smallscreen) && empty($thead) && $field)    // If this is a sort field
 	{
-		$out.='</a>';
+		$out.='</a>';
 	}
 
 	if (empty($conf->dol_optimize_smallscreen) && empty($thead) && $field)    // If this is a sort field
diff --git a/htdocs/core/lib/functions2.lib.php b/htdocs/core/lib/functions2.lib.php
index ab41e5aaec7..1ff0fd47b0a 100644
--- a/htdocs/core/lib/functions2.lib.php
+++ b/htdocs/core/lib/functions2.lib.php
@@ -745,18 +745,18 @@ function get_next_value($db,$mask,$table,$field,$where='',$objsoc='',$date='',$m
     {
         $counterpadded=str_pad($counter,dol_strlen($maskcounter),"0",STR_PAD_LEFT);
 
-        // Define $maskLike
-        $maskLike = dol_string_nospecial($mask);
-        $maskLike = str_replace("%","_",$maskLike);
-        // Replace protected special codes with matching number of _ as wild card caracter
-        $maskLike = preg_replace('/\{yyyy\}/i','____',$maskLike);
-        $maskLike = preg_replace('/\{yy\}/i','__',$maskLike);
-        $maskLike = preg_replace('/\{y\}/i','_',$maskLike);
-        $maskLike = preg_replace('/\{mm\}/i','__',$maskLike);
-        $maskLike = preg_replace('/\{dd\}/i','__',$maskLike);
-        $maskLike = str_replace(dol_string_nospecial('{'.$masktri.'}'),$counterpadded,$maskLike);
-        if ($maskrefclient) $maskLike = str_replace(dol_string_nospecial('{'.$maskrefclient.'}'),str_pad("",dol_strlen($maskrefclient),"_"),$maskLike);
-        if ($masktype) $maskLike = str_replace(dol_string_nospecial('{'.$masktype.'}'),$masktype_value,$maskLike);
+        // Define $maskLike
+        $maskLike = dol_string_nospecial($mask);
+        $maskLike = str_replace("%","_",$maskLike);
+        // Replace protected special codes with matching number of _ as wild card caracter
+        $maskLike = preg_replace('/\{yyyy\}/i','____',$maskLike);
+        $maskLike = preg_replace('/\{yy\}/i','__',$maskLike);
+        $maskLike = preg_replace('/\{y\}/i','_',$maskLike);
+        $maskLike = preg_replace('/\{mm\}/i','__',$maskLike);
+        $maskLike = preg_replace('/\{dd\}/i','__',$maskLike);
+        $maskLike = str_replace(dol_string_nospecial('{'.$masktri.'}'),$counterpadded,$maskLike);
+        if ($maskrefclient) $maskLike = str_replace(dol_string_nospecial('{'.$maskrefclient.'}'),str_pad("",dol_strlen($maskrefclient),"_"),$maskLike);
+        if ($masktype) $maskLike = str_replace(dol_string_nospecial('{'.$masktype.'}'),$masktype_value,$maskLike);
 
         $ref='';
         $sql = "SELECT ".$field." as ref";
@@ -764,8 +764,8 @@ function get_next_value($db,$mask,$table,$field,$where='',$objsoc='',$date='',$m
         $sql.= " WHERE ".$field." LIKE '".$maskLike."'";
     	$sql.= " AND ".$field." NOT LIKE '%PROV%'";
         $sql.= " AND entity IN (".getEntity($table, 1).")";
-        if ($where) $sql.=$where;
-        if ($sqlwhere) $sql.=' AND '.$sqlwhere;
+        if ($where) $sql.=$where;
+        if ($sqlwhere) $sql.=' AND '.$sqlwhere;
 
         dol_syslog("functions2::get_next_value sql=".$sql);
         $resql=$db->query($sql);
diff --git a/htdocs/core/lib/invoice2.lib.php b/htdocs/core/lib/invoice2.lib.php
index dd9e1ba987d..6a6855b7ed9 100644
--- a/htdocs/core/lib/invoice2.lib.php
+++ b/htdocs/core/lib/invoice2.lib.php
@@ -238,7 +238,7 @@ function rebuild_merge_pdf($db, $langs, $conf, $diroutputpdf, $newlangid, $filte
 			$filename='mergedpdf';
 
 			if (! empty($option)) $filename.='_'.$option;
-			$file=$diroutputpdf.'/'.$filename.'.pdf';
+			$file=$diroutputpdf.'/'.$filename.'.pdf';
 
 			if (! $error && $pagecount)
 			{
diff --git a/htdocs/core/lib/security2.lib.php b/htdocs/core/lib/security2.lib.php
index dcb94bd084a..556007967f4 100644
--- a/htdocs/core/lib/security2.lib.php
+++ b/htdocs/core/lib/security2.lib.php
@@ -291,9 +291,9 @@ function dol_loginfunction($langs,$conf,$mysoc)
 	// Set dol_hide_topmenu, dol_hide_leftmenu, dol_optimize_smallscreen, dol_nomousehover
 	$dol_hide_topmenu=GETPOST('dol_hide_topmenu');
 	$dol_hide_leftmenu=GETPOST('dol_hide_leftmenu');
-	$dol_optimize_smallscreen=GETPOST('dol_optimize_smallscreen');
-	$dol_no_mouse_hover=GETPOST('dol_no_mouse_hover');
-	$dol_use_jmobile=GETPOST('dol_use_jmobile');
+	$dol_optimize_smallscreen=GETPOST('dol_optimize_smallscreen');
+	$dol_no_mouse_hover=GETPOST('dol_no_mouse_hover');
+	$dol_use_jmobile=GETPOST('dol_use_jmobile');
 
 	// Include login page template
 	include $template_dir.'login.tpl.php';
diff --git a/htdocs/core/menus/standard/auguria.lib.php b/htdocs/core/menus/standard/auguria.lib.php
index 316c4d5b607..4d1bfad0ba3 100644
--- a/htdocs/core/menus/standard/auguria.lib.php
+++ b/htdocs/core/menus/standard/auguria.lib.php
@@ -76,8 +76,8 @@ function print_auguria_menu($db,$atarget,$type_user,&$tabMenu,&$menu,$noout=0)
 			}
 			$url=preg_replace('/__LOGIN__/',$user->login,$url);
 			$shorturl=preg_replace('/__LOGIN__/',$user->login,$shorturl);
-			$url=preg_replace('/__USERID__/',$user->id,$url);
-			$shorturl=preg_replace('/__USERID__/',$user->id,$shorturl);
+			$url=preg_replace('/__USERID__/',$user->id,$url);
+			$shorturl=preg_replace('/__USERID__/',$user->id,$shorturl);
 
 			// Define the class (top menu selected or not)
 			if (! empty($_SESSION['idmenu']) && $newTabMenu[$i]['rowid'] == $_SESSION['idmenu']) $classname='class="tmenusel"';
@@ -238,54 +238,54 @@ function print_left_auguria_menu($db,$menu_array_before,$menu_array_after,&$tabM
 	$menuArbo = new Menubase($db,'auguria');
 	$newmenu = $menuArbo->menuLeftCharger($newmenu,$mainmenu,$leftmenu,($user->societe_id?1:0),'auguria',$tabMenu);
 
-	// We update newmenu for special dynamic menus
-	if ($conf->banque->enabled && $user->rights->banque->lire && $mainmenu == 'bank')	// Entry for each bank account
-	{
-		$sql = "SELECT rowid, label, courant, rappro, courant";
-		$sql.= " FROM ".MAIN_DB_PREFIX."bank_account";
-		$sql.= " WHERE entity = ".$conf->entity;
-		$sql.= " AND clos = 0";
-		$sql.= " ORDER BY label";
-	
-		$resql = $db->query($sql);
-		if ($resql)
-		{
-			$numr = $db->num_rows($resql);
-			$i = 0;
-	
-			if ($numr > 0) 	$newmenu->add('/compta/bank/index.php',$langs->trans("BankAccounts"),0,$user->rights->banque->lire);
-	
-			while ($i < $numr)
-			{
-				$objp = $db->fetch_object($resql);
-				$newmenu->add('/compta/bank/fiche.php?id='.$objp->rowid,$objp->label,1,$user->rights->banque->lire);
-				if ($objp->rappro && $objp->courant != 2 && empty($objp->clos))  // If not cash account and not closed and can be reconciliate
-				{
-					$newmenu->add('/compta/bank/rappro.php?account='.$objp->rowid,$langs->trans("Conciliate"),2,$user->rights->banque->consolidate);
-				}
-				$i++;
-			}
-		}
-		else dol_print_error($db);
-		$db->free($resql);
+	// We update newmenu for special dynamic menus
+	if ($conf->banque->enabled && $user->rights->banque->lire && $mainmenu == 'bank')	// Entry for each bank account
+	{
+		$sql = "SELECT rowid, label, courant, rappro, courant";
+		$sql.= " FROM ".MAIN_DB_PREFIX."bank_account";
+		$sql.= " WHERE entity = ".$conf->entity;
+		$sql.= " AND clos = 0";
+		$sql.= " ORDER BY label";
+	
+		$resql = $db->query($sql);
+		if ($resql)
+		{
+			$numr = $db->num_rows($resql);
+			$i = 0;
+	
+			if ($numr > 0) 	$newmenu->add('/compta/bank/index.php',$langs->trans("BankAccounts"),0,$user->rights->banque->lire);
+	
+			while ($i < $numr)
+			{
+				$objp = $db->fetch_object($resql);
+				$newmenu->add('/compta/bank/fiche.php?id='.$objp->rowid,$objp->label,1,$user->rights->banque->lire);
+				if ($objp->rappro && $objp->courant != 2 && empty($objp->clos))  // If not cash account and not closed and can be reconciliate
+				{
+					$newmenu->add('/compta/bank/rappro.php?account='.$objp->rowid,$langs->trans("Conciliate"),2,$user->rights->banque->consolidate);
+				}
+				$i++;
+			}
+		}
+		else dol_print_error($db);
+		$db->free($resql);
 	}
 
 	if ($conf->ftp->enabled && $mainmenu == 'ftp')	// Entry for FTP
 	{
-		$MAXFTP=20;
-		$i=1;
-		while ($i <= $MAXFTP)
-		{
-			$paramkey='FTP_NAME_'.$i;
-			//print $paramkey;
-			if (! empty($conf->global->$paramkey))
-			{
-				$link="/ftp/index.php?idmenu=".$_SESSION["idmenu"]."&numero_ftp=".$i;
-		
-				$newmenu->add($link, dol_trunc($conf->global->$paramkey,24));
-			}
-			$i++;
-		}
+		$MAXFTP=20;
+		$i=1;
+		while ($i <= $MAXFTP)
+		{
+			$paramkey='FTP_NAME_'.$i;
+			//print $paramkey;
+			if (! empty($conf->global->$paramkey))
+			{
+				$link="/ftp/index.php?idmenu=".$_SESSION["idmenu"]."&numero_ftp=".$i;
+		
+				$newmenu->add($link, dol_trunc($conf->global->$paramkey,24));
+			}
+			$i++;
+		}
 	}	
 
 	
@@ -334,8 +334,8 @@ function print_left_auguria_menu($db,$menu_array_before,$menu_array_after,&$tabM
 
 			// Add mainmenu in GET url. This make to go back on correct menu even when using Back on browser.
 			$url=dol_buildpath($menu_array[$i]['url'],1);
-			$url=preg_replace('/__LOGIN__/',$user->login,$url);
-			$url=preg_replace('/__USERID__/',$user->id,$url);
+			$url=preg_replace('/__LOGIN__/',$user->login,$url);
+			$url=preg_replace('/__USERID__/',$user->id,$url);
 
 			if (! preg_match('/mainmenu=/i',$menu_array[$i]['url']))
 			{
diff --git a/htdocs/core/menus/standard/auguria_menu.php b/htdocs/core/menus/standard/auguria_menu.php
index 802bda1ff3d..97788a14770 100644
--- a/htdocs/core/menus/standard/auguria_menu.php
+++ b/htdocs/core/menus/standard/auguria_menu.php
@@ -101,7 +101,7 @@ class MenuManager
     		// On va le chercher en session si non defini par le lien
     		$leftmenu=isset($_SESSION["leftmenu"])?$_SESSION["leftmenu"]:'';
     	}
-    	if (! empty($forceleftmenu)) $leftmenu=$forceleftmenu;
+    	if (! empty($forceleftmenu)) $leftmenu=$forceleftmenu;
 
     	require_once DOL_DOCUMENT_ROOT.'/core/class/menubase.class.php';
     	$tabMenu=array();
@@ -191,8 +191,8 @@ class MenuManager
         		if ($val['enabled'] == 1)
         		{
         			$relurl=dol_buildpath($val['url'],1);
-        			$relurl=preg_replace('/__LOGIN__/',$user->login,$relurl);
-        			$relurl=preg_replace('/__USERID__/',$user->id,$relurl);
+        			$relurl=preg_replace('/__LOGIN__/',$user->login,$relurl);
+        			$relurl=preg_replace('/__USERID__/',$user->id,$relurl);
 
         			print '<a href="#">'.$val['titre'].'</a>'."\n";
         			// Search submenu fot this entry
@@ -201,7 +201,7 @@ class MenuManager
         			$submenu=new Menu();
         			$res=print_left_auguria_menu($this->db,$this->menu_array,$this->menu_array_after,$this->tabMenu,$submenu,1,$tmpmainmenu,$tmpleftmenu);
         			$nexturl=dol_buildpath($submenu->liste[0]['url'],1);
-
+
         			$canonrelurl=preg_replace('/\?.*$/','',$relurl);
         			$canonnexturl=preg_replace('/\?.*$/','',$nexturl);
         			//var_dump($canonrelurl);
@@ -210,12 +210,12 @@ class MenuManager
         			if (($canonrelurl != $canonnexturl && ! in_array($val['mainmenu'],array('tools')))
         				|| (strpos($canonrelurl,'/product/index.php') !== false || strpos($canonrelurl,'/compta/bank/index.php') !== false))
 					{
-						// We add sub entry
-						print str_pad('',1).'<li data-role="list-divider" class="lilevel1 ui-btn-icon-right ui-btn">';	 // ui-btn to highlight on clic
-						print '<a href="'.$relurl.'">';
-						print str_pad('',12,'&nbsp;');
-						print $langs->trans(ucfirst($val['mainmenu'])."Dashboard");
-						print '</a>';
+						// We add sub entry
+						print str_pad('',1).'<li data-role="list-divider" class="lilevel1 ui-btn-icon-right ui-btn">';	 // ui-btn to highlight on clic
+						print '<a href="'.$relurl.'">';
+						print str_pad('',12,'&nbsp;');
+						print $langs->trans(ucfirst($val['mainmenu'])."Dashboard");
+						print '</a>';
 						print '</li>'."\n";
         			}
         			foreach($submenu->liste as $key2 => $val2)		// $val['url','titre','level','enabled'=0|1|2,'target','mainmenu','leftmenu'
@@ -226,8 +226,8 @@ class MenuManager
         				$canonurl2=preg_replace('/\?.*$/','',$val2['url']);
         				//var_dump($val2['url'].' - '.$canonurl2.' - '.$val2['level']);
         				if (in_array($canonurl2,array('/admin/index.php','/admin/tools/index.php','/core/tools.php'))) $relurl2='';
-        				if ($val2['level']==0) print str_pad('',$val2['level']+1).'<li'.($val2['level']==0?' data-role="list-divider"':'').' class="lilevel'.($val2['level']+1).' ui-btn-icon-right ui-btn">';	 // ui-btn to highlight on clic
-        				else print str_pad('',$val2['level']+1).'<li class="lilevel'.($val2['level']+1).'">';	 // ui-btn to highlight on clic
+        				if ($val2['level']==0) print str_pad('',$val2['level']+1).'<li'.($val2['level']==0?' data-role="list-divider"':'').' class="lilevel'.($val2['level']+1).' ui-btn-icon-right ui-btn">';	 // ui-btn to highlight on clic
+        				else print str_pad('',$val2['level']+1).'<li class="lilevel'.($val2['level']+1).'">';	 // ui-btn to highlight on clic
         				if ($relurl2) print '<a href="'.$relurl2.'">';
         				print str_pad('',($val2['level']+1)*12,'&nbsp;');
         				print $val2['titre'];
diff --git a/htdocs/core/menus/standard/eldy_menu.php b/htdocs/core/menus/standard/eldy_menu.php
index 47e7e723682..b50ea897d83 100644
--- a/htdocs/core/menus/standard/eldy_menu.php
+++ b/htdocs/core/menus/standard/eldy_menu.php
@@ -77,7 +77,7 @@ class MenuManager
         	// On va le chercher en session si non defini par le lien
         	$mainmenu=isset($_SESSION["mainmenu"])?$_SESSION["mainmenu"]:'';
         }
-        if (! empty($forcemainmenu)) $mainmenu=$forcemainmenu;
+        if (! empty($forcemainmenu)) $mainmenu=$forcemainmenu;
 
         if (isset($_GET["leftmenu"]))
         {
@@ -98,7 +98,7 @@ class MenuManager
         	// On va le chercher en session si non defini par le lien
         	$leftmenu=isset($_SESSION["leftmenu"])?$_SESSION["leftmenu"]:'';
         }
-        if (! empty($forceleftmenu)) $leftmenu=$forceleftmenu;
+        if (! empty($forceleftmenu)) $leftmenu=$forceleftmenu;
 
         require_once DOL_DOCUMENT_ROOT.'/core/class/menubase.class.php';
         $tabMenu=array();
@@ -145,8 +145,8 @@ class MenuManager
         		if ($val['enabled'] == 1)
         		{
 					$relurl=dol_buildpath($val['url'],1);
-					$relurl=preg_replace('/__LOGIN__/',$user->login,$relurl);
-					$relurl=preg_replace('/__USERID__/',$user->id,$relurl);
+					$relurl=preg_replace('/__LOGIN__/',$user->login,$relurl);
+					$relurl=preg_replace('/__USERID__/',$user->id,$relurl);
 
         			print '<a href="#">'.$val['titre'].'</a>'."\n";
         			// Search submenu fot this entry
@@ -158,7 +158,7 @@ class MenuManager
 
         			$canonrelurl=preg_replace('/\?.*$/','',$relurl);
         			$canonnexturl=preg_replace('/\?.*$/','',$nexturl);
-        			//var_dump($canonrelurl);
+        			//var_dump($canonrelurl);
         			//var_dump($canonnexturl);
         			print '<ul>'."\n";
         			if (($canonrelurl != $canonnexturl && ! in_array($val['mainmenu'],array('tools')))
diff --git a/htdocs/core/menus/standard/empty.php b/htdocs/core/menus/standard/empty.php
index 240953afd57..7b0beee2d11 100644
--- a/htdocs/core/menus/standard/empty.php
+++ b/htdocs/core/menus/standard/empty.php
@@ -89,7 +89,7 @@ class MenuManager
 			if (empty($noout)) print_start_menu_entry_empty($idsel, $classname, $showmode);
 			if (empty($noout)) print_text_menu_entry_empty($langs->trans("Home"), 1, dol_buildpath('/index.php',1).'?mainmenu=home&amp;leftmenu=', $id, $idsel, $classname, $this->atarget);
 			if (empty($noout)) print_end_menu_entry_empty($showmode);
-			$this->menu->add(dol_buildpath('/index.php',1), $langs->trans("Home"), 0, $showmode, $this->atarget, 'home', '');
+			$this->menu->add(dol_buildpath('/index.php',1), $langs->trans("Home"), 0, $showmode, $this->atarget, 'home', '');
 
 			if (empty($noout)) print_end_menu_array_empty();
 
@@ -191,62 +191,62 @@ class MenuManager
 			{
 				$this->leftmenu=dol_clone($this->menu);
 				unset($this->menu->liste);
-			}
+			}
 		}
 
-		if ($mode == 'jmobile')
-		{
-			foreach($this->topmenu->liste as $key => $val)		// $val['url','titre','level','enabled'=0|1|2,'target','mainmenu','leftmenu'
-			{
-				print '<ul data-role="listview" data-inset="true">';
-				print '<li data-role="list-divider">';
-				if ($val['enabled'] == 1)
-				{
-					$relurl=dol_buildpath($val['url'],1);
-					$relurl=preg_replace('/__LOGIN__/',$user->login,$relurl);
-					$relurl=preg_replace('/__USERID__/',$user->id,$relurl);
-
-					print '<a href="#">'.$val['titre'].'</a>'."\n";
-					// Search submenu fot this entry
-					$tmpmainmenu=$val['mainmenu'];
-					$tmpleftmenu='all';
-					//$submenu=new Menu();
-					//$res=print_left_eldy_menu($this->db,$this->menu_array,$this->menu_array_after,$this->tabMenu,$submenu,1,$tmpmainmenu,$tmpleftmenu);
-					//$nexturl=dol_buildpath($submenu->liste[0]['url'],1);
-					$submenu=$this->leftmenu;
-
-					$canonrelurl=preg_replace('/\?.*$/','',$relurl);
-					$canonnexturl=preg_replace('/\?.*$/','',$nexturl);
-					//var_dump($canonrelurl);
-					//var_dump($canonnexturl);
-					print '<ul>';
+		if ($mode == 'jmobile')
+		{
+			foreach($this->topmenu->liste as $key => $val)		// $val['url','titre','level','enabled'=0|1|2,'target','mainmenu','leftmenu'
+			{
+				print '<ul data-role="listview" data-inset="true">';
+				print '<li data-role="list-divider">';
+				if ($val['enabled'] == 1)
+				{
+					$relurl=dol_buildpath($val['url'],1);
+					$relurl=preg_replace('/__LOGIN__/',$user->login,$relurl);
+					$relurl=preg_replace('/__USERID__/',$user->id,$relurl);
+
+					print '<a href="#">'.$val['titre'].'</a>'."\n";
+					// Search submenu fot this entry
+					$tmpmainmenu=$val['mainmenu'];
+					$tmpleftmenu='all';
+					//$submenu=new Menu();
+					//$res=print_left_eldy_menu($this->db,$this->menu_array,$this->menu_array_after,$this->tabMenu,$submenu,1,$tmpmainmenu,$tmpleftmenu);
+					//$nexturl=dol_buildpath($submenu->liste[0]['url'],1);
+					$submenu=$this->leftmenu;
+
+					$canonrelurl=preg_replace('/\?.*$/','',$relurl);
+					$canonnexturl=preg_replace('/\?.*$/','',$nexturl);
+					//var_dump($canonrelurl);
+					//var_dump($canonnexturl);
+					print '<ul>';
         			if ($canonrelurl != $canonnexturl && ! in_array($val['mainmenu'],array('home','tools')))
-					{
-						// We add sub entry
-						print '<li data-role="list-divider"><a href="'.$relurl.'">'.$langs->trans("MainArea").'-'.$val['titre'].'</a></li>'."\n";
-					}
-					foreach($submenu->liste as $key2 => $val2)		// $val['url','titre','level','enabled'=0|1|2,'target','mainmenu','leftmenu'
-					{
-						$relurl2=dol_buildpath($val2['url'],1);
-						$relurl2=preg_replace('/__LOGIN__/',$user->login,$relurl2);
-						$relurl2=preg_replace('/__USERID__/',$user->id,$relurl2);
-						//var_dump($val2);
-						print '<li'.($val2['level']==0?' data-role="list-divider"':'').'><a href="'.$relurl2.'">'.$val2['titre'].'</a></li>'."\n";
-					}
-					//var_dump($submenu);
-					print '</ul>';
-				}
-				if ($val['enabled'] == 2)
-				{
-					print '<font class="vsmenudisabled">'.$val['titre'].'</font>';
-				}
-				print '</li>';
+					{
+						// We add sub entry
+						print '<li data-role="list-divider"><a href="'.$relurl.'">'.$langs->trans("MainArea").'-'.$val['titre'].'</a></li>'."\n";
+					}
+					foreach($submenu->liste as $key2 => $val2)		// $val['url','titre','level','enabled'=0|1|2,'target','mainmenu','leftmenu'
+					{
+						$relurl2=dol_buildpath($val2['url'],1);
+						$relurl2=preg_replace('/__LOGIN__/',$user->login,$relurl2);
+						$relurl2=preg_replace('/__USERID__/',$user->id,$relurl2);
+						//var_dump($val2);
+						print '<li'.($val2['level']==0?' data-role="list-divider"':'').'><a href="'.$relurl2.'">'.$val2['titre'].'</a></li>'."\n";
+					}
+					//var_dump($submenu);
+					print '</ul>';
+				}
+				if ($val['enabled'] == 2)
+				{
+					print '<font class="vsmenudisabled">'.$val['titre'].'</font>';
+				}
+				print '</li>';
 				print '</ul>'."\n";
 
-				break;	// Only first menu entry (so home)
-			}
-		}
-
+				break;	// Only first menu entry (so home)
+			}
+		}
+
 		unset($this->menu);
 
 		return $res;
diff --git a/htdocs/core/modules/DolibarrModules.class.php b/htdocs/core/modules/DolibarrModules.class.php
index 6e30e978546..541de648360 100644
--- a/htdocs/core/modules/DolibarrModules.class.php
+++ b/htdocs/core/modules/DolibarrModules.class.php
@@ -608,7 +608,7 @@ abstract class DolibarrModules
                 $file  = $this->boxes[$key]['file'];
                 //$note  = $this->boxes[$key][2];
 
-                if (empty($file)) $file  = isset($this->boxes[$key][1])?$this->boxes[$key][1]:'';	// For backward compatibility
+                if (empty($file)) $file  = isset($this->boxes[$key][1])?$this->boxes[$key][1]:'';	// For backward compatibility
                 
                 $sql = "DELETE FROM ".MAIN_DB_PREFIX."boxes";
                 $sql.= " USING ".MAIN_DB_PREFIX."boxes, ".MAIN_DB_PREFIX."boxes_def";
diff --git a/htdocs/core/modules/export/export_csv.modules.php b/htdocs/core/modules/export/export_csv.modules.php
index 53b1e557f25..4d29682fdd3 100644
--- a/htdocs/core/modules/export/export_csv.modules.php
+++ b/htdocs/core/modules/export/export_csv.modules.php
@@ -297,7 +297,7 @@ class ExportCsv extends ModeleExports
 		// Rule Dolibarr: No HTML
 		//print $charset.' '.$newvalue."\n";
 		$newvalue=dol_string_nohtmltag($newvalue,1,$charset);
-		//print $charset.' '.$newvalue."\n";
+		//print $charset.' '.$newvalue."\n";
 
 		// Rule 1 CSV: No CR, LF in cells
 		$newvalue=str_replace("\r",'',$newvalue);
diff --git a/htdocs/core/modules/export/export_excel.modules.php b/htdocs/core/modules/export/export_excel.modules.php
index ea0110dfe9b..85e765c2fb3 100644
--- a/htdocs/core/modules/export/export_excel.modules.php
+++ b/htdocs/core/modules/export/export_excel.modules.php
@@ -425,19 +425,19 @@ class ExportExcel extends ModeleExports
      * @return 	string			Letter
      */
     function column2Letter($c)
-    {
-
-    	$c = intval($c);
-    	if ($c <= 0) return '';
-
+    {
+
+    	$c = intval($c);
+    	if ($c <= 0) return '';
+
     	while ($c != 0)
-    	{
-    		$p = ($c - 1) % 26;
-    		$c = intval(($c - $p) / 26);
-    		$letter = chr(65 + $p) . $letter;
-    	}
-
-    	return $letter;
+    	{
+    		$p = ($c - 1) % 26;
+    		$c = intval(($c - $p) / 26);
+    		$letter = chr(65 + $p) . $letter;
+    	}
+
+    	return $letter;
     }
 }
 
diff --git a/htdocs/core/modules/import/import_csv.modules.php b/htdocs/core/modules/import/import_csv.modules.php
index 90a0da8b7b3..dea0334dc13 100644
--- a/htdocs/core/modules/import/import_csv.modules.php
+++ b/htdocs/core/modules/import/import_csv.modules.php
@@ -655,9 +655,9 @@ function tablewithentity($table)
 	global $db;
 	
 	$resql=$db->DDLDescTable($table,'entity');
-	if ($resql)
-	{
-		$i=0;
+	if ($resql)
+	{
+		$i=0;
 		$obj=$db->fetch_object($resql);
 		if ($obj) return 1;
 		else return 0;
diff --git a/htdocs/core/modules/livraison/pdf/pdf_typhon.modules.php b/htdocs/core/modules/livraison/pdf/pdf_typhon.modules.php
index adf1b8689b1..5b7b385ab27 100644
--- a/htdocs/core/modules/livraison/pdf/pdf_typhon.modules.php
+++ b/htdocs/core/modules/livraison/pdf/pdf_typhon.modules.php
@@ -150,17 +150,17 @@ class pdf_typhon extends ModelePDFDeliveryOrder
 		{
 			$object->fetch_thirdparty();
 
-			// Definition of $dir and $file
-			if ($object->specimen)
-			{
-				$dir = $conf->expedition->dir_output."/receipt";
-				$file = $dir . "/SPECIMEN.pdf";
-			}
-			else
-			{
-				$objectref = dol_sanitizeFileName($object->ref);
-				$dir = $conf->expedition->dir_output."/receipt/" . $objectref;
-				$file = $dir . "/" . $objectref . ".pdf";
+			// Definition of $dir and $file
+			if ($object->specimen)
+			{
+				$dir = $conf->expedition->dir_output."/receipt";
+				$file = $dir . "/SPECIMEN.pdf";
+			}
+			else
+			{
+				$objectref = dol_sanitizeFileName($object->ref);
+				$dir = $conf->expedition->dir_output."/receipt/" . $objectref;
+				$file = $dir . "/" . $objectref . ".pdf";
 			}
 			
 			if (! file_exists($dir))
@@ -287,39 +287,39 @@ class pdf_typhon extends ModelePDFDeliveryOrder
 					// Description of product line
 					$curX = $this->posxdesc-1;
 
-                    $showpricebeforepagebreak=1;
-                    
-                    $pdf->startTransaction();
-                    pdf_writelinedesc($pdf,$object,$i,$outputlangs,$this->posxcomm-$curX,3,$curX,$curY,$hideref,$hidedesc);
-                    $pageposafter=$pdf->getPage();
-                    if ($pageposafter > $pageposbefore)	// There is a pagebreak
-                    {
-                    	$pdf->rollbackTransaction(true);
-                    	$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->posxcomm-$curX,4,$curX,$curY,$hideref,$hidedesc);
-                    	$posyafter=$pdf->GetY();
-                    	if ($posyafter > ($this->page_hauteur - ($heightforfooter+$heightforfreetext+$heightforinfotot)))	// There is no space left for total+free text
-                    	{
-                    		if ($i == ($nblines-1))	// No more lines, and no space left to show total, so we create a new page
-                    		{
-                    			$pdf->AddPage('','',true);
-                    			if (! empty($tplidx)) $pdf->useTemplate($tplidx);
-                    			if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) $this->_pagehead($pdf, $object, 0, $outputlangs);
-                    			$pdf->setPage($pagenb+1);
-                    		}
-                    	}
-                    	else
-                    	{
-                    		// We found a page break
-                    		$showpricebeforepagebreak=0;
-                    	}
-                    }
-                    else	// No pagebreak
-                    {
-                    	$pdf->commitTransaction();
-                    }
+                    $showpricebeforepagebreak=1;
+                    
+                    $pdf->startTransaction();
+                    pdf_writelinedesc($pdf,$object,$i,$outputlangs,$this->posxcomm-$curX,3,$curX,$curY,$hideref,$hidedesc);
+                    $pageposafter=$pdf->getPage();
+                    if ($pageposafter > $pageposbefore)	// There is a pagebreak
+                    {
+                    	$pdf->rollbackTransaction(true);
+                    	$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->posxcomm-$curX,4,$curX,$curY,$hideref,$hidedesc);
+                    	$posyafter=$pdf->GetY();
+                    	if ($posyafter > ($this->page_hauteur - ($heightforfooter+$heightforfreetext+$heightforinfotot)))	// There is no space left for total+free text
+                    	{
+                    		if ($i == ($nblines-1))	// No more lines, and no space left to show total, so we create a new page
+                    		{
+                    			$pdf->AddPage('','',true);
+                    			if (! empty($tplidx)) $pdf->useTemplate($tplidx);
+                    			if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) $this->_pagehead($pdf, $object, 0, $outputlangs);
+                    			$pdf->setPage($pagenb+1);
+                    		}
+                    	}
+                    	else
+                    	{
+                    		// We found a page break
+                    		$showpricebeforepagebreak=0;
+                    	}
+                    }
+                    else	// No pagebreak
+                    {
+                    	$pdf->commitTransaction();
+                    }
                     
 					$nexY = $pdf->GetY();
                     $pageposafter=$pdf->getPage();
@@ -526,31 +526,31 @@ class pdf_typhon extends ModelePDFDeliveryOrder
 		return 0;
 	}
 
-	/**
-	 *   Show miscellaneous information (payment mode, payment term, ...)
-	 *
-	 *   @param		PDF			&$pdf     		Object PDF
-	 *   @param		Object		$object			Object to show
-	 *   @param		int			$posy			Y
-	 *   @param		Translate	$outputlangs	Langs object
-	 *   @return	void
-	 */
-	function _tableau_info(&$pdf, $object, $posy, $outputlangs)
-	{
-		global $conf;
-		$default_font_size = pdf_getPDFFontSize($outputlangs);
+	/**
+	 *   Show miscellaneous information (payment mode, payment term, ...)
+	 *
+	 *   @param		PDF			&$pdf     		Object PDF
+	 *   @param		Object		$object			Object to show
+	 *   @param		int			$posy			Y
+	 *   @param		Translate	$outputlangs	Langs object
+	 *   @return	void
+	 */
+	function _tableau_info(&$pdf, $object, $posy, $outputlangs)
+	{
+		global $conf;
+		$default_font_size = pdf_getPDFFontSize($outputlangs);
 	
 		$pdf->SetFont('','', $default_font_size);
-		$pdf->SetXY($this->marge_gauche, $posy);
-		
-		$larg_sign = ($this->page_largeur-$this->marge_gauche-$this->marge_droite)/3;
-		$pdf->Rect($this->marge_gauche, $posy + 1, $larg_sign, 25);
-		$pdf->SetXY($this->marge_gauche + 2, $posy + 2);
-		$pdf->MultiCell($larg_sign,2, $outputlangs->trans("For").' '.$outputlangs->convToOutputCharset($mysoc->name).":",'','L');
-		
-		$pdf->Rect(2*$larg_sign+$this->marge_gauche, $posy + 1, $larg_sign, 25);
-		$pdf->SetXY(2*$larg_sign+$this->marge_gauche + 2, $posy + 2);
-		$pdf->MultiCell($larg_sign,2, $outputlangs->trans("ForCustomer").':','','L');
+		$pdf->SetXY($this->marge_gauche, $posy);
+		
+		$larg_sign = ($this->page_largeur-$this->marge_gauche-$this->marge_droite)/3;
+		$pdf->Rect($this->marge_gauche, $posy + 1, $larg_sign, 25);
+		$pdf->SetXY($this->marge_gauche + 2, $posy + 2);
+		$pdf->MultiCell($larg_sign,2, $outputlangs->trans("For").' '.$outputlangs->convToOutputCharset($mysoc->name).":",'','L');
+		
+		$pdf->Rect(2*$larg_sign+$this->marge_gauche, $posy + 1, $larg_sign, 25);
+		$pdf->SetXY(2*$larg_sign+$this->marge_gauche + 2, $posy + 2);
+		$pdf->MultiCell($larg_sign,2, $outputlangs->trans("ForCustomer").':','','L');
 	}
 	
 	/**
@@ -629,19 +629,19 @@ class pdf_typhon extends ModelePDFDeliveryOrder
 
 		pdf_pagehead($pdf,$outputlangs,$this->page_hauteur);
 
-		// Show Draft Watermark
-		if($object->statut==0 && (! empty($conf->global->COMMANDE_DRAFT_WATERMARK)) )
-		{
-			pdf_watermark($pdf,$outputlangs,$this->page_hauteur,$this->page_largeur,'mm',$conf->global->COMMANDE_DRAFT_WATERMARK);
+		// Show Draft Watermark
+		if($object->statut==0 && (! empty($conf->global->COMMANDE_DRAFT_WATERMARK)) )
+		{
+			pdf_watermark($pdf,$outputlangs,$this->page_hauteur,$this->page_largeur,'mm',$conf->global->COMMANDE_DRAFT_WATERMARK);
 		}
 		
-		$pdf->SetTextColor(0,0,60);
-		$pdf->SetFont('','B', $default_font_size + 3);
-		
-		$posy=$this->marge_haute;
-		$posx=$this->page_largeur-$this->marge_droite-100;
-		
-		$pdf->SetXY($this->marge_gauche,$posy);
+		$pdf->SetTextColor(0,0,60);
+		$pdf->SetFont('','B', $default_font_size + 3);
+		
+		$posy=$this->marge_haute;
+		$posx=$this->page_largeur-$this->marge_droite-100;
+		
+		$pdf->SetXY($this->marge_gauche,$posy);
 		
 		// Logo
 		$logo=$conf->mycompany->dir_output.'/logos/'.$this->emetteur->logo;
@@ -695,8 +695,8 @@ class pdf_typhon extends ModelePDFDeliveryOrder
 
 		$posy+=2;
 		
-		// Show list of linked objects
-		$posy = pdf_writeLinkedObjects($pdf, $object, $outputlangs, $posx, $posy, 100, 3, 'R', $default_font_size);
+		// Show list of linked objects
+		$posy = pdf_writeLinkedObjects($pdf, $object, $outputlangs, $posx, $posy, 100, 3, 'R', $default_font_size);
 		
 		if ($showaddress)
 		{
@@ -724,10 +724,10 @@ class pdf_typhon extends ModelePDFDeliveryOrder
 			$pdf->SetFont('','B',$default_font_size);
 			$pdf->MultiCell(80, 4, $outputlangs->convToOutputCharset($this->emetteur->name), 0, 'L');
 
-			// Show sender information
-			$pdf->SetXY($posx+2,$posy+8);
-			$pdf->SetFont('','', $default_font_size - 1);
-			$pdf->MultiCell(80, 4, $carac_emetteur, 0, 'L');
+			// Show sender information
+			$pdf->SetXY($posx+2,$posy+8);
+			$pdf->SetFont('','', $default_font_size - 1);
+			$pdf->MultiCell(80, 4, $carac_emetteur, 0, 'L');
 			
 			// Client destinataire
 			$posy=42;
diff --git a/htdocs/core/modules/modOpenSurvey.class.php b/htdocs/core/modules/modOpenSurvey.class.php
index 2d4b267a8e3..f016b5d6cf6 100755
--- a/htdocs/core/modules/modOpenSurvey.class.php
+++ b/htdocs/core/modules/modOpenSurvey.class.php
@@ -114,14 +114,14 @@ class modOpenSurvey extends DolibarrModules
 		$this->rights[$r][5] = 'read';				// In php code, permission will be checked by test if ($user->rights->permkey->level1->level2)
 		$r++;
 
-		// Add here list of permission defined by an id, a label, a boolean and two constant strings.
-		// Example:
-		$this->rights[$r][0] = 55002; 				// Permission id (must not be already used)
-		$this->rights[$r][1] = 'Create/modify surveys';	// Permission label
-		$this->rights[$r][2] = 'w'; 					// Permission by default for new user (0/1)
-		$this->rights[$r][3] = 0; 					// Permission by default for new user (0/1)
-		$this->rights[$r][4] = 'survey';				// In php code, permission will be checked by test if ($user->rights->permkey->level1->level2)
-		$this->rights[$r][5] = 'write';				// In php code, permission will be checked by test if ($user->rights->permkey->level1->level2)
+		// Add here list of permission defined by an id, a label, a boolean and two constant strings.
+		// Example:
+		$this->rights[$r][0] = 55002; 				// Permission id (must not be already used)
+		$this->rights[$r][1] = 'Create/modify surveys';	// Permission label
+		$this->rights[$r][2] = 'w'; 					// Permission by default for new user (0/1)
+		$this->rights[$r][3] = 0; 					// Permission by default for new user (0/1)
+		$this->rights[$r][4] = 'survey';				// In php code, permission will be checked by test if ($user->rights->permkey->level1->level2)
+		$this->rights[$r][5] = 'write';				// In php code, permission will be checked by test if ($user->rights->permkey->level1->level2)
 		$r++;
 
 
@@ -195,7 +195,7 @@ class modOpenSurvey extends DolibarrModules
 	 */
 	function init($options='')
 	{
-		// Permissions
+		// Permissions
 		$this->remove($options);
 		
 		$sql = array();
diff --git a/htdocs/core/modules/supplier_invoice/mod_facture_fournisseur_cactus.php b/htdocs/core/modules/supplier_invoice/mod_facture_fournisseur_cactus.php
index 01f1a481f86..f05a324ae84 100644
--- a/htdocs/core/modules/supplier_invoice/mod_facture_fournisseur_cactus.php
+++ b/htdocs/core/modules/supplier_invoice/mod_facture_fournisseur_cactus.php
@@ -107,60 +107,60 @@ class mod_facture_fournisseur_cactus extends ModeleNumRefSuppliersInvoices
     {
         global $db,$conf;
 
-        if ($object->type == 2) $prefix=$this->prefixcreditnote;
-        else $prefix=$this->prefixinvoice;
+        if ($object->type == 2) $prefix=$this->prefixcreditnote;
+        else $prefix=$this->prefixinvoice;
 
-        // D'abord on recupere la valeur max
-        $posindice=8;
-        $sql = "SELECT MAX(SUBSTRING(ref FROM ".$posindice.")) as max";	// This is standard SQL
-        $sql.= " FROM ".MAIN_DB_PREFIX."facture_fourn";
-        $sql.= " WHERE ref LIKE '".$prefix."____-%'";
-        $sql.= " AND entity = ".$conf->entity;
-
-        $resql=$db->query($sql);
-        dol_syslog(get_class($this)."::getNextValue sql=".$sql);
-        if ($resql)
-        {
-        	$obj = $db->fetch_object($resql);
-        	if ($obj) $max = intval($obj->max);
-        	else $max=0;
-        }
-        else
-        {
-        	dol_syslog(get_class($this)."::getNextValue sql=".$sql, LOG_ERR);
-        	return -1;
-        }
-
-        if ($mode == 'last')
-        {
-        	$num = sprintf("%04s",$max);
-
-        	$ref='';
-        	$sql = "SELECT ref as ref";
-        	$sql.= " FROM ".MAIN_DB_PREFIX."facture_fourn";
-        	$sql.= " WHERE ref LIKE '".$prefix."____-".$num."'";
-        	$sql.= " AND entity = ".$conf->entity;
-
-        	dol_syslog(get_class($this)."::getNextValue sql=".$sql);
-        	$resql=$db->query($sql);
-        	if ($resql)
-        	{
-        		$obj = $db->fetch_object($resql);
-        		if ($obj) $ref = $obj->ref;
-        	}
-        	else dol_print_error($db);
-
-        	return $ref;
-        }
-        else if ($mode == 'next')
-        {
-        	$date=$object->date;	// This is invoice date (not creation date)
-        	$yymm = strftime("%y%m",$date);
-        	$num = sprintf("%04s",$max+1);
-
-        	dol_syslog(get_class($this)."::getNextValue return ".$prefix.$yymm."-".$num);
-        	return $prefix.$yymm."-".$num;
-        }
+        // D'abord on recupere la valeur max
+        $posindice=8;
+        $sql = "SELECT MAX(SUBSTRING(ref FROM ".$posindice.")) as max";	// This is standard SQL
+        $sql.= " FROM ".MAIN_DB_PREFIX."facture_fourn";
+        $sql.= " WHERE ref LIKE '".$prefix."____-%'";
+        $sql.= " AND entity = ".$conf->entity;
+
+        $resql=$db->query($sql);
+        dol_syslog(get_class($this)."::getNextValue sql=".$sql);
+        if ($resql)
+        {
+        	$obj = $db->fetch_object($resql);
+        	if ($obj) $max = intval($obj->max);
+        	else $max=0;
+        }
+        else
+        {
+        	dol_syslog(get_class($this)."::getNextValue sql=".$sql, LOG_ERR);
+        	return -1;
+        }
+
+        if ($mode == 'last')
+        {
+        	$num = sprintf("%04s",$max);
+
+        	$ref='';
+        	$sql = "SELECT ref as ref";
+        	$sql.= " FROM ".MAIN_DB_PREFIX."facture_fourn";
+        	$sql.= " WHERE ref LIKE '".$prefix."____-".$num."'";
+        	$sql.= " AND entity = ".$conf->entity;
+
+        	dol_syslog(get_class($this)."::getNextValue sql=".$sql);
+        	$resql=$db->query($sql);
+        	if ($resql)
+        	{
+        		$obj = $db->fetch_object($resql);
+        		if ($obj) $ref = $obj->ref;
+        	}
+        	else dol_print_error($db);
+
+        	return $ref;
+        }
+        else if ($mode == 'next')
+        {
+        	$date=$object->date;	// This is invoice date (not creation date)
+        	$yymm = strftime("%y%m",$date);
+        	$num = sprintf("%04s",$max+1);
+
+        	dol_syslog(get_class($this)."::getNextValue return ".$prefix.$yymm."-".$num);
+        	return $prefix.$yymm."-".$num;
+        }
         else dol_print_error('','Bad parameter for getNextValue');
     }
 
diff --git a/htdocs/core/search_page.php b/htdocs/core/search_page.php
index a2516c160a3..0819b4fa6c2 100644
--- a/htdocs/core/search_page.php
+++ b/htdocs/core/search_page.php
@@ -49,8 +49,8 @@ $title=$langs->trans("Search");
 
 // URL http://mydolibarr/core/search_page?dol_use_jmobile=1 can be used for tests
 $head='<!-- Quick access -->'."\n";
-$arrayofjs=array();
-$arrayofcss=array();
+$arrayofjs=array();
+$arrayofcss=array();
 top_htmlhead($head, $title, 0, 0, $arrayofjs, $arrayofcss);
 
 
diff --git a/htdocs/core/tpl/login.tpl.php b/htdocs/core/tpl/login.tpl.php
index 58710d9f0e4..f0f3feec65b 100644
--- a/htdocs/core/tpl/login.tpl.php
+++ b/htdocs/core/tpl/login.tpl.php
@@ -127,8 +127,8 @@ if ($forgetpasslink || $helpcenterlink)
 {
 	$moreparam='';
 	if ($dol_hide_topmenu)   $moreparam.=(strpos($moreparam,'?')===false?'?':'&').'dol_hide_topmenu='.$dol_hide_topmenu;
-	if ($dol_hide_leftmenu)  $moreparam.=(strpos($moreparam,'?')===false?'?':'&').'dol_hide_leftmenu='.$dol_hide_leftmenu;
-	if ($dol_no_mouse_hover) $moreparam.=(strpos($moreparam,'?')===false?'?':'&').'dol_no_mouse_hover='.$dol_no_mouse_hover;
+	if ($dol_hide_leftmenu)  $moreparam.=(strpos($moreparam,'?')===false?'?':'&').'dol_hide_leftmenu='.$dol_hide_leftmenu;
+	if ($dol_no_mouse_hover) $moreparam.=(strpos($moreparam,'?')===false?'?':'&').'dol_no_mouse_hover='.$dol_no_mouse_hover;
 	if ($dol_use_jmobile)    $moreparam.=(strpos($moreparam,'?')===false?'?':'&').'dol_use_jmobile='.$dol_use_jmobile;
 
 	echo '<br>';
diff --git a/htdocs/core/tpl/passwordforgotten.tpl.php b/htdocs/core/tpl/passwordforgotten.tpl.php
index 29df45e6ebc..7d78d0947da 100644
--- a/htdocs/core/tpl/passwordforgotten.tpl.php
+++ b/htdocs/core/tpl/passwordforgotten.tpl.php
@@ -19,13 +19,13 @@
 header('Cache-Control: Public, must-revalidate');
 header("Content-type: text/html; charset=".$conf->file->character_set_client);
 
-if (GETPOST('dol_hide_topmenu')) $conf->dol_use_jmobile=1;
-if (GETPOST('dol_hide_leftmenu')) $conf->dol_hide_leftmenu=1;
-if (GETPOST('dol_optimize_smallscreen')) $conf->dol_optimize_smallscreen=1;
-if (GETPOST('dol_no_mouse_hover')) $conf->dol_no_mouse_hover=1;
-if (GETPOST('dol_use_jmobile')) $conf->dol_use_jmobile=1;
+if (GETPOST('dol_hide_topmenu')) $conf->dol_use_jmobile=1;
+if (GETPOST('dol_hide_leftmenu')) $conf->dol_hide_leftmenu=1;
+if (GETPOST('dol_optimize_smallscreen')) $conf->dol_optimize_smallscreen=1;
+if (GETPOST('dol_no_mouse_hover')) $conf->dol_no_mouse_hover=1;
+if (GETPOST('dol_use_jmobile')) $conf->dol_use_jmobile=1;
 
-print top_htmlhead('',$langs->trans('Login').' '.$title);
+print top_htmlhead('',$langs->trans('Login').' '.$title);
 ?>
 <!-- BEGIN PHP TEMPLATE PASSWORDFORGOTTEN.TPL.PHP -->
 
@@ -111,11 +111,11 @@ if (! empty($hookmanager->resArray['options'])) {
 <br>
 <div align="center" style="margin-top: 4px;">
 	<?php
-	$moreparam='';
-	if (! empty($conf->dol_hide_topmenu))   $moreparam.=(strpos($moreparam,'?')===false?'?':'&').'dol_hide_topmenu='.$conf->dol_hide_topmenu;
-	if (! empty($conf->dol_hide_leftmenu))  $moreparam.=(strpos($moreparam,'?')===false?'?':'&').'dol_hide_leftmenu='.$conf->dol_hide_leftmenu;
-	if (! empty($conf->dol_no_mouse_hover)) $moreparam.=(strpos($moreparam,'?')===false?'?':'&').'dol_no_mouse_hover='.$conf->dol_no_mouse_hover;
-	if (! empty($conf->dol_use_jmobile))    $moreparam.=(strpos($moreparam,'?')===false?'?':'&').'dol_use_jmobile='.$conf->dol_use_jmobile;
+	$moreparam='';
+	if (! empty($conf->dol_hide_topmenu))   $moreparam.=(strpos($moreparam,'?')===false?'?':'&').'dol_hide_topmenu='.$conf->dol_hide_topmenu;
+	if (! empty($conf->dol_hide_leftmenu))  $moreparam.=(strpos($moreparam,'?')===false?'?':'&').'dol_hide_leftmenu='.$conf->dol_hide_leftmenu;
+	if (! empty($conf->dol_no_mouse_hover)) $moreparam.=(strpos($moreparam,'?')===false?'?':'&').'dol_no_mouse_hover='.$conf->dol_no_mouse_hover;
+	if (! empty($conf->dol_use_jmobile))    $moreparam.=(strpos($moreparam,'?')===false?'?':'&').'dol_use_jmobile='.$conf->dol_use_jmobile;
 
 	print '<a style="color: #888888; font-size: 10px" href="'.$dol_url_root.'/index.php'.$moreparam.'">('.$langs->trans('BackToLoginPage').')</a>';
 	?>
diff --git a/htdocs/cron/list.php b/htdocs/cron/list.php
index 42b41d0ed4f..f75fcb5754b 100644
--- a/htdocs/cron/list.php
+++ b/htdocs/cron/list.php
@@ -119,16 +119,16 @@ print_fiche_titre($pagetitle,'','setup');
 print $langs->trans('CronInfo');
 
 
-if ($action == 'delete')
-{
-	$ret=$form->form_confirm($_SERVER['PHP_SELF']."?id=".$id.'&status='.$status,$langs->trans("CronDelete"),$langs->trans("CronConfirmDelete"),"confirm_delete",'','',1);
-	if ($ret == 'html') print '<br>';
-}
-
-if ($action == 'execute'){
-	$ret=$form->form_confirm($_SERVER['PHP_SELF']."?id=".$id.'&status='.$status,$langs->trans("CronExecute"),$langs->trans("CronConfirmExecute"),"confirm_execute",'','',1);
-	if ($ret == 'html') print '<br>';
-}
+if ($action == 'delete')
+{
+	$ret=$form->form_confirm($_SERVER['PHP_SELF']."?id=".$id.'&status='.$status,$langs->trans("CronDelete"),$langs->trans("CronConfirmDelete"),"confirm_delete",'','',1);
+	if ($ret == 'html') print '<br>';
+}
+
+if ($action == 'execute'){
+	$ret=$form->form_confirm($_SERVER['PHP_SELF']."?id=".$id.'&status='.$status,$langs->trans("CronExecute"),$langs->trans("CronConfirmExecute"),"confirm_execute",'','',1);
+	if ($ret == 'html') print '<br>';
+}
 
 
 // liste des jobs creer
@@ -181,7 +181,7 @@ if (count($object->lines)>0) {
 	print '<td class="liste_titre" align="center">';
 	print $form->selectarray('status', array('0'=>$langs->trans("No"),'1'=>$langs->trans("Yes")), GETPOST('status'), 1);
 	print '</td><td class="liste_titre" align="right">';
-	print '&nbsp;';
+	print '&nbsp;';
 	print '<input class="liste_titre" type="image" src="'.DOL_URL_ROOT.'/theme/'.$conf->theme.'/img/search.png" value="'.dol_escape_htmltag($langs->trans("Search")).'" title="'.dol_escape_htmltag($langs->trans("Search")).'">';
 	print '&nbsp; ';
 	print '<input type="image" class="liste_titre" name="button_removefilter" src="'.DOL_URL_ROOT.'/theme/'.$conf->theme.'/img/searchclear.png" value="'.dol_escape_htmltag($langs->trans("RemoveFilter")).'" title="'.dol_escape_htmltag($langs->trans("RemoveFilter")).'">';
@@ -265,7 +265,7 @@ if (count($object->lines)>0) {
 		print '</td>';
 
 		print '<td align="center">';
-		print yn($line->status);
+		print yn($line->status);
 		print '</td>';
 
 		print '<td align="right">';
diff --git a/htdocs/exports/index.php b/htdocs/exports/index.php
index d37f9ad336e..c68d793185d 100644
--- a/htdocs/exports/index.php
+++ b/htdocs/exports/index.php
@@ -52,7 +52,7 @@ print $langs->trans("FormatedExportDesc3").'<br>';
 print '<br>';
 
 
-print '<div class="fichecenter"><div class="fichethirdleft">';
+print '<div class="fichecenter"><div class="fichethirdleft">';
 
 
 // List export set
@@ -108,7 +108,7 @@ if (count($export->array_export_code))
 	*/
 }
 print '</center>';
-print '<br>';
+print '<br>';
 
 print '</div><div class="fichetwothirdright"><div class="ficheaddleft">';
 
diff --git a/htdocs/fichinter/fiche.php b/htdocs/fichinter/fiche.php
index 86eeb69febe..2f8cdc6ed22 100644
--- a/htdocs/fichinter/fiche.php
+++ b/htdocs/fichinter/fiche.php
@@ -1,1812 +1,1812 @@
-<?php
-/* Copyright (C) 2002-2007	Rodolphe Quiedeville	<rodolphe@quiedeville.org>
- * Copyright (C) 2004-2012	Laurent Destailleur		<eldy@users.sourceforge.net>
-* Copyright (C) 2005-2012	Regis Houssin			<regis.houssin@capnetworks.com>
-* Copyright (C) 2011-2013  Juanjo Menent			<jmenent@2byte.es>
-* Copyright (C) 2013       Florian Henry        <florian.henry@open-concept.pro>
-*
-* 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
-* the Free Software Foundation; either version 3 of the License, or
-* (at your option) any later version.
-*
-* This program is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-* GNU General Public License for more details.
-*
-* You should have received a copy of the GNU General Public License
-* along with this program. If not, see <http://www.gnu.org/licenses/>.
-*/
-
-/**
- *	\file       htdocs/fichinter/fiche.php
-*	\brief      Fichier fiche intervention
-*	\ingroup    ficheinter
-*/
-
-require '../main.inc.php';
-require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php';
-require_once DOL_DOCUMENT_ROOT.'/fichinter/class/fichinter.class.php';
-require_once DOL_DOCUMENT_ROOT.'/core/modules/fichinter/modules_fichinter.php';
-require_once DOL_DOCUMENT_ROOT.'/core/lib/fichinter.lib.php';
-require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
-if (! empty($conf->projet->enabled))
-{
-	require_once DOL_DOCUMENT_ROOT.'/core/lib/project.lib.php';
-	require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
-}
-if (! empty($conf->global->FICHEINTER_ADDON) && is_readable(DOL_DOCUMENT_ROOT ."/core/modules/fichinter/mod_".$conf->global->FICHEINTER_ADDON.".php"))
-{
-	require_once DOL_DOCUMENT_ROOT ."/core/modules/fichinter/mod_".$conf->global->FICHEINTER_ADDON.'.php';
-}
-require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
-require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
-
-$langs->load("companies");
-$langs->load("interventions");
-
-$id			= GETPOST('id','int');
-$ref		= GETPOST('ref','alpha');
-$socid		= GETPOST('socid','int');
-$contratid	= GETPOST('contratid','int');
-$action		= GETPOST('action','alpha');
-$confirm	= GETPOST('confirm','alpha');
-$mesg		= GETPOST('msg','alpha');
-$origin=GETPOST('origin','alpha');
-$originid=(GETPOST('originid','int')?GETPOST('originid','int'):GETPOST('origin_id','int')); // For backward compatibility
-
-//PDF
-$hidedetails = (GETPOST('hidedetails','int') ? GETPOST('hidedetails','int') : (! empty($conf->global->MAIN_GENERATE_DOCUMENTS_HIDE_DETAILS) ? 1 : 0));
-$hidedesc 	 = (GETPOST('hidedesc','int') ? GETPOST('hidedesc','int') : (! empty($conf->global->MAIN_GENERATE_DOCUMENTS_HIDE_DESC) ?  1 : 0));
-$hideref 	 = (GETPOST('hideref','int') ? GETPOST('hideref','int') : (! empty($conf->global->MAIN_GENERATE_DOCUMENTS_HIDE_REF) ? 1 : 0));
-
-// Security check
-if ($user->societe_id) $socid=$user->societe_id;
-$result = restrictedArea($user, 'ficheinter', $id, 'fichinter');
-
-// Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array
-$hookmanager->initHooks(array('interventioncard'));
-
-$object = new Fichinter($db);
-$extrafields = new ExtraFields($db);
-$extralabels=$extrafields->fetch_name_optionals_label($object->table_element);
-
-
-/*
- * Actions
-*/
-
-if ($action == 'confirm_validate' && $confirm == 'yes' && $user->rights->ficheinter->creer)
-{
-	$object->fetch($id);
-	$object->fetch_thirdparty();
-
-	$result = $object->setValid($user);
-	if ($result >= 0)
-	{
-		// Define output language
-		$outputlangs = $langs;
-		$newlang='';
-		if ($conf->global->MAIN_MULTILANGS && empty($newlang) && GETPOST('lang_id','alpha')) $newlang=GETPOST('lang_id','alpha');
-		if ($conf->global->MAIN_MULTILANGS && empty($newlang)) $newlang=$object->client->default_lang;
-		if (! empty($newlang))
-		{
-			$outputlangs = new Translate("",$conf);
-			$outputlangs->setDefaultLang($newlang);
-		}
-		$result=fichinter_create($db, $object, GETPOST('model','alpha'), $outputlangs);
-		header('Location: '.$_SERVER["PHP_SELF"].'?id='.$object->id);
-		exit;
-	}
-	else
-	{
-		$mesg='<div class="error">'.$object->error.'</div>';
-	}
-}
-
-else if ($action == 'confirm_modify' && $confirm == 'yes' && $user->rights->ficheinter->creer)
-{
-	$object->fetch($id);
-	$object->fetch_thirdparty();
-
-	$result = $object->setDraft($user);
-	if ($result >= 0)
-	{
-		// Define output language
-		$outputlangs = $langs;
-		$newlang='';
-		if ($conf->global->MAIN_MULTILANGS && empty($newlang) && GETPOST('lang_id','alpha')) $newlang=GETPOST('lang_id','alpha');
-		if ($conf->global->MAIN_MULTILANGS && empty($newlang)) $newlang=$object->client->default_lang;
-		if (! empty($newlang))
-		{
-			$outputlangs = new Translate("",$conf);
-			$outputlangs->setDefaultLang($newlang);
-		}
-		$result=fichinter_create($db, $object, (!GETPOST('model','alpha'))?$object->model:GETPOST('model','apha'), $outputlangs);
-		header('Location: '.$_SERVER["PHP_SELF"].'?id='.$object->id);
-		exit;
-	}
-	else
-	{
-		$mesg='<div class="error">'.$object->error.'</div>';
-	}
-}
-
-else if ($action == 'add' && $user->rights->ficheinter->creer)
-{
-    $object->socid			= $socid;
-    $object->duree			= GETPOST('duree','int');
-    $object->fk_project		= GETPOST('projectid','int');
-    $object->fk_contrat		= GETPOST('contratid','int');
-    $object->author			= $user->id;
-    $object->description	= GETPOST('description');
-    $object->ref			= $ref;
-    $object->modelpdf		= GETPOST('model','alpha');
-    $object->note_private	= GETPOST('note_private');
-    $object->note_public	= GETPOST('note_public');
-
-	if ($object->socid > 0)
-	{
-		// If creation from another object of another module (Example: origin=propal, originid=1)
-		if (!empty($origin) && !empty($originid) )
-		{
-			// Parse element/subelement (ex: project_task)
-			$element = $subelement = $_POST['origin'];
-			if (preg_match('/^([^_]+)_([^_]+)/i',$_POST['origin'],$regs))
-			{
-				$element = $regs[1];
-				$subelement = $regs[2];
-			}
-
-			// For compatibility
-			if ($element == 'order')    {
-				$element = $subelement = 'commande';
-			}
-			if ($element == 'propal')   {
-				$element = 'comm/propal'; $subelement = 'propal';
-			}
-			if ($element == 'contract') {
-				$element = $subelement = 'contrat';
-			}
-
-			$object->origin    = $origin;
-			$object->origin_id = $originid;
-
-			// Possibility to add external linked objects with hooks
-			$object->linked_objects[$object->origin] = $object->origin_id;
-			if (is_array($_POST['other_linked_objects']) && ! empty($_POST['other_linked_objects']))
-			{
-				$object->linked_objects = array_merge($object->linked_objects, $_POST['other_linked_objects']);
-			}
-
-			$id = $object->create($user);
-
-			if ($id > 0)
-			{
-				dol_include_once('/'.$element.'/class/'.$subelement.'.class.php');
-
-				$classname = ucfirst($subelement);
-				$srcobject = new $classname($db);
-
-				dol_syslog("Try to find source object origin=".$object->origin." originid=".$object->origin_id." to add lines");
-				$result=$srcobject->fetch($object->origin_id);
-				if ($result > 0)
-				{
-					$srcobject->fetch_thirdparty();
-					$lines = $srcobject->lines;
-					if (empty($lines) && method_exists($srcobject,'fetch_lines'))  $lines = $srcobject->fetch_lines();
-
-					$fk_parent_line=0;
-					$num=count($lines);
-
-					for ($i=0;$i<$num;$i++)
-					{
-						$product_type=($lines[$i]->product_type?$lines[$i]->product_type:0);
-
-						if ($product_type == 1 || !empty($conf->global->FICHINTER_PRINT_PRODUCTS)) { //only services except if config includes products
-							// service prédéfini
-							if ($lines[$i]->fk_product > 0)
-							{
-								// Define output language
-								if (! empty($conf->global->MAIN_MULTILANGS) && ! empty($conf->global->PRODUIT_TEXTS_IN_THIRDPARTY_LANGUAGE))
-								{
-									$prod = new Product($db, $lines[$i]->fk_product);
-
-									$outputlangs = $langs;
-									$newlang='';
-									if (empty($newlang) && GETPOST('lang_id')) $newlang=GETPOST('lang_id');
-									if (empty($newlang)) $newlang=$srcobject->client->default_lang;
-									if (! empty($newlang))
-									{
-										$outputlangs = new Translate("",$conf);
-										$outputlangs->setDefaultLang($newlang);
-									}
-
-									$label = (! empty($prod->multilangs[$outputlangs->defaultlang]["libelle"])) ? $prod->multilangs[$outputlangs->defaultlang]["libelle"] : $lines[$i]->product_label;
-								}
-								else
-								{
-									$label = $lines[$i]->product_label;
-								}
-
-								$desc = $label;
-								$desc .= ' ('.$langs->trans('Quantity').': '.$lines[$i]->qty.')';
-							}
-							else {
-								$desc = dol_htmlentitiesbr($lines[$i]->desc);
-								$desc .= ' ('.$langs->trans('Quantity').': '.$lines[$i]->qty.')';
-							}
-							$timearray=dol_getdate(mktime());
-							$date_intervention=dol_mktime(0,0,0,$timearray['mon'],$timearray['mday'],$timearray['year']);
-							if ($product_type == 1)
-							{ //service
-								$duration = 3600;
-							}
-							else
-							{ //product
-							    $duration = 0;
-							}
-
-		                    $result = $object->addline(
-								$user,
-		                        $id,
-		                        $desc,
-					            $date_intervention,
-                 				$duration
-		                    );
-
-							if ($result < 0)
-							{
-								$error++;
-								break;
-							}
-
-						}
-					}
-
-	            }
-	            else
-	            {
-	                $mesg=$srcobject->error;
-	                $error++;
-	            }
-	        }
-	        else
-	        {
-	            $mesg=$object->error;
-	            $error++;
-	        }
-	    }
-	    else
-	    {
-			$result = $object->create($user);
-	        if ($result > 0)
-	        {
-	            $id=$result;      // Force raffraichissement sur fiche venant d'etre cree
-	        }
-	        else
-	        {
-	            $langs->load("errors");
-	            $mesg='<div class="error">'.$langs->trans($object->error).'</div>';
-	            $action = 'create';
-	        }
-        }
-    }
-    else
-    {
-        $mesg='<div class="error">'.$langs->trans("ErrorFieldRequired",$langs->trans("ThirdParty")).'</div>';
-        $action = 'create';
-    }
-}
-
-else if ($action == 'update' && $user->rights->ficheinter->creer)
-{
-	$object->fetch($id);
-
-	$object->socid			= $socid;
-	$object->fk_project		= GETPOST('projectid','int');
-	$object->fk_contrat		= GETPOST('contratid','int');
-	$object->author			= $user->id;
-	$object->description	= GETPOST('description','alpha');
-	$object->ref			= $ref;
-
-	$result=$object->update($user);
-	if ($result<0) {
-		setEventMessage($object->error,'errors');
-	}
-}
-
-/*
- * Build doc
-*/
-else if ($action == 'builddoc' && $user->rights->ficheinter->creer)	// En get ou en post
-{
-	$object->fetch($id);
-	$object->fetch_thirdparty();
-	$object->fetch_lines();
-
-	if (GETPOST('model','alpha'))
-	{
-		$object->setDocModel($user, GETPOST('model','alpha'));
-	}
-
-	// Define output language
-	$outputlangs = $langs;
-	$newlang='';
-	if ($conf->global->MAIN_MULTILANGS && empty($newlang) && GETPOST('lang_id','alpha')) $newlang=GETPOST('lang_id','alpha');
-	if ($conf->global->MAIN_MULTILANGS && empty($newlang)) $newlang=$object->client->default_lang;
-	if (! empty($newlang))
-	{
-		$outputlangs = new Translate("",$conf);
-		$outputlangs->setDefaultLang($newlang);
-	}
-	$result=fichinter_create($db, $object, GETPOST('model','alpha'), $outputlangs);
-	if ($result <= 0)
-	{
-		dol_print_error($db,$result);
-		exit;
-	}
-}
-
-// Remove file in doc form
-else if ($action == 'remove_file')
-{
-	if ($object->fetch($id))
-	{
-		require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
-
-		$object->fetch_thirdparty();
-
-		$langs->load("other");
-		$upload_dir = $conf->ficheinter->dir_output;
-		$file = $upload_dir . '/' . GETPOST('file');
-		$ret=dol_delete_file($file,0,0,0,$object);
-		if ($ret) setEventMessage($langs->trans("FileWasRemoved", GETPOST('urlfile')));
-		else setEventMessage($langs->trans("ErrorFailToDeleteFile", GETPOST('urlfile')), 'errors');
-	}
-}
-
-// Set into a project
-else if ($action == 'classin' && $user->rights->ficheinter->creer)
-{
-	$object->fetch($id);
-	$result=$object->setProject(GETPOST('projectid','int'));
-	if ($result < 0) dol_print_error($db,$object->error);
-}
-
-// Set into a contract
-else if ($action == 'setcontrat' && $user->rights->contrat->creer)
-{
-	$object->fetch($id);
-	$result=$object->set_contrat($user,GETPOST('contratid','int'));
-	if ($result < 0) dol_print_error($db,$object->error);
-}
-
-else if ($action == 'confirm_delete' && $confirm == 'yes' && $user->rights->ficheinter->supprimer)
-{
-	$object->fetch($id);
-	$object->fetch_thirdparty();
-	$result=$object->delete($user);
-	if ($result<0) {
-		setEventMessage($object->error,'errors');
-	}
-
-	header('Location: '.DOL_URL_ROOT.'/fichinter/list.php?leftmenu=ficheinter');
-	exit;
-}
-
-else if ($action == 'setdescription' && $user->rights->ficheinter->creer)
-{
-	$object->fetch($id);
-	$result=$object->set_description($user,GETPOST('description'));
-	if ($result < 0) dol_print_error($db,$object->error);
-}
-else if ($action == 'setnote_public' && $user->rights->ficheinter->creer)
-{
-	$object->fetch($id);
-	$result=$object->update_note(dol_html_entity_decode(GETPOST('note_public'), ENT_QUOTES),'_public');
-	if ($result < 0) dol_print_error($db,$object->error);
-}
-else if ($action == 'setnote_private' && $user->rights->ficheinter->creer)
-{
-	$object->fetch($id);
-	$result=$object->update_note(dol_html_entity_decode(GETPOST('note_private'), ENT_QUOTES), '_private');
-	if ($result < 0) dol_print_error($db,$object->error);
-}
-
-// Add line
-else if ($action == "addline" && $user->rights->ficheinter->creer)
-{
-	if (!GETPOST('np_desc'))
-	{
-		$mesg='<div class="error">'.$langs->trans("ErrorFieldRequired",$langs->transnoentitiesnoconv("Description")).'</div>';
-		$error++;
-	}
-	if (!GETPOST('durationhour','int') && !GETPOST('durationmin','int'))
-	{
-		$mesg='<div class="error">'.$langs->trans("ErrorFieldRequired",$langs->transnoentitiesnoconv("Duration")).'</div>';
-		$error++;
-	}
-	if (! $error)
-	{
-		$db->begin();
-
-		$ret=$object->fetch($id);
-		$object->fetch_thirdparty();
-
-		$desc=GETPOST('np_desc');
-		$date_intervention = dol_mktime(GETPOST('dihour','int'), GETPOST('dimin','int'), 0, GETPOST('dimonth','int'), GETPOST('diday','int'), GETPOST('diyear','int'));
-		$duration = convertTime2Seconds(GETPOST('durationhour','int'), GETPOST('durationmin','int'));
-
-        $result=$object->addline(
-			$user,
-            $id,
-            $desc,
-            $date_intervention,
-            $duration
-        );
-
-		// Define output language
-		$outputlangs = $langs;
-		$newlang='';
-		if ($conf->global->MAIN_MULTILANGS && empty($newlang) && GETPOST('lang_id','alpha')) $newlang=GETPOST('lang_id','alpha');
-		if ($conf->global->MAIN_MULTILANGS && empty($newlang)) $newlang=$object->client->default_lang;
-		if (! empty($newlang))
-		{
-			$outputlangs = new Translate("",$conf);
-			$outputlangs->setDefaultLang($newlang);
-		}
-
-		if ($result >= 0)
-		{
-			$db->commit();
-
-			fichinter_create($db, $object, $object->modelpdf, $outputlangs);
-			header('Location: '.$_SERVER["PHP_SELF"].'?id='.$object->id);
-			exit;
-		}
-		else
-		{
-			$mesg=$object->error;
-			$db->rollback();
-		}
-	}
-}
-
-// Classify Billed
-else if ($action == 'classifybilled' && $user->rights->ficheinter->creer)
-{
-	$object->fetch($id);
-	$result=$object->setBilled();
-	if ($result > 0)
-	{
-		header('Location: '.$_SERVER["PHP_SELF"].'?id='.$object->id);
-		exit;
-	}
-	else
-	{
-		$mesg='<div class="error">'.$object->error.'</div>';
-	}
-}
-
-/*
- *  Mise a jour d'une ligne d'intervention
-*/
-else if ($action == 'updateline' && $user->rights->ficheinter->creer && GETPOST('save','alpha') == $langs->trans("Save"))
-{
-	$objectline = new FichinterLigne($db);
-	if ($objectline->fetch(GETPOST('line_id','int')) <= 0)
-	{
-		dol_print_error($db);
-		exit;
-	}
-
-	if ($object->fetch($objectline->fk_fichinter) <= 0)
-	{
-		dol_print_error($db);
-		exit;
-	}
-	$object->fetch_thirdparty();
-
-	$desc		= GETPOST('np_desc');
-	$date_inter	= dol_mktime(GETPOST('dihour','int'), GETPOST('dimin','int'), 0, GETPOST('dimonth','int'), GETPOST('diday','int'), GETPOST('diyear','int'));
-	$duration	= convertTime2Seconds(GETPOST('durationhour','int'),GETPOST('durationmin','int'));
-
-    $objectline->datei		= $date_inter;
-    $objectline->desc		= $desc;
-    $objectline->duration	= $duration;
-	$result = $objectline->update($user);
-    if ($result < 0)
-    {
-        dol_print_error($db);
-        exit;
-    }
-
-	// Define output language
-	$outputlangs = $langs;
-	$newlang='';
-	if ($conf->global->MAIN_MULTILANGS && empty($newlang) && GETPOST('lang_id','alpha')) $newlang=GETPOST('lang_id','alpha');
-	if ($conf->global->MAIN_MULTILANGS && empty($newlang)) $newlang=$object->client->default_lang;
-	if (! empty($newlang))
-	{
-		$outputlangs = new Translate("",$conf);
-		$outputlangs->setDefaultLang($newlang);
-	}
-	fichinter_create($db, $object, $object->modelpdf, $outputlangs);
-
-	header('Location: '.$_SERVER["PHP_SELF"].'?id='.$object->id);
-	exit;
-}
-
-/*
- *  Supprime une ligne d'intervention AVEC confirmation
-*/
-else if ($action == 'confirm_deleteline' && $confirm == 'yes' && $user->rights->ficheinter->creer)
-{
-	$objectline = new FichinterLigne($db);
-	if ($objectline->fetch(GETPOST('line_id','int')) <= 0)
-	{
-		dol_print_error($db);
-		exit;
-	}
-	$result=$objectline->deleteline($user);
-
-	if ($object->fetch($objectline->fk_fichinter) <= 0)
-	{
-		dol_print_error($db);
-		exit;
-	}
-
-	// Define output language
-	$outputlangs = $langs;
-	$newlang='';
-	if ($conf->global->MAIN_MULTILANGS && empty($newlang) && GETPOST('lang_id','alpha')) $newlang=GETPOST('lang_id','alpha');
-	if ($conf->global->MAIN_MULTILANGS && empty($newlang)) $newlang=$object->client->default_lang;
-	if (! empty($newlang))
-	{
-		$outputlangs = new Translate("",$conf);
-		$outputlangs->setDefaultLang($newlang);
-	}
-	fichinter_create($db, $object, $object->modelpdf, $outputlangs);
-}
-
-/*
- * Ordonnancement des lignes
-*/
-
-else if ($action == 'up' && $user->rights->ficheinter->creer)
-{
-	$object->fetch($id);
-	$object->fetch_thirdparty();
-	$object->line_up(GETPOST('line_id','int'));
-
-	// Define output language
-	$outputlangs = $langs;
-	$newlang='';
-	if ($conf->global->MAIN_MULTILANGS && empty($newlang) && GETPOST('lang_id','alpha')) $newlang=GETPOST('lang_id','alpha');
-	if ($conf->global->MAIN_MULTILANGS && empty($newlang)) $newlang=$object->client->default_lang;
-	if (! empty($newlang))
-	{
-		$outputlangs = new Translate("",$conf);
-		$outputlangs->setDefaultLang($newlang);
-	}
-	fichinter_create($db, $object, $object->modelpdf, $outputlangs);
-	header('Location: '.$_SERVER["PHP_SELF"].'?id='.$object->id.'#'.GETPOST('line_id','int'));
-	exit;
-}
-
-else if ($action == 'down' && $user->rights->ficheinter->creer)
-{
-	$object->fetch($id);
-	$object->fetch_thirdparty();
-	$object->line_down(GETPOST('line_id','int'));
-
-	// Define output language
-	$outputlangs = $langs;
-	$newlang='';
-	if ($conf->global->MAIN_MULTILANGS && empty($newlang) && GETPOST('lang_id','alpha')) $newlang=GETPOST('lang_id','alpha');
-	if ($conf->global->MAIN_MULTILANGS && empty($newlang)) $newlang=$object->client->default_lang;
-	if (! empty($newlang))
-	{
-		$outputlangs = new Translate("",$conf);
-		$outputlangs->setDefaultLang($newlang);
-	}
-	fichinter_create($db, $object, $object->modelpdf, $outputlangs);
-	header('Location: '.$_SERVER["PHP_SELF"].'?id='.$object->id.'#'.GETPOST('line_id','int'));
-	exit;
-}
-
-
-/*
- * Add file in email form
-*/
-if (GETPOST('addfile','alpha'))
-{
-	require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
-
-	// Set tmp user directory TODO Use a dedicated directory for temp mails files
-	$vardir=$conf->user->dir_output."/".$user->id;
-	$upload_dir_tmp = $vardir.'/temp';
-
-	dol_add_file_process($upload_dir_tmp,0,0);
-	$action='presend';
-}
-
-/*
- * Remove file in email form
-*/
-if (GETPOST('removedfile','alpha'))
-{
-	require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
-
-	// Set tmp user directory
-	$vardir=$conf->user->dir_output."/".$user->id;
-	$upload_dir_tmp = $vardir.'/temp';
-
-	// TODO Delete only files that was uploaded from email form
-	dol_remove_file_process(GETPOST('removedfile','alpha'),0);
-	$action='presend';
-}
-
-/*
- * Send mail
-*/
-if ($action == 'send' && ! GETPOST('cancel','alpha') && (empty($conf->global->MAIN_USE_ADVANCED_PERMS) || $user->rights->ficheinter->ficheinter_advance->send))
-{
-	$langs->load('mails');
-
-	if ($object->fetch($id) > 0)
-	{
-        $object->fetch_thirdparty();
-
-		if (GETPOST('sendto','alpha'))
-		{
-			// Le destinataire a ete fourni via le champ libre
-			$sendto = GETPOST('sendto','alpha');
-			$sendtoid = 0;
-		}
-		elseif (GETPOST('receiver','alpha') != '-1')
-		{
-			// Recipient was provided from combo list
-			if (GETPOST('receiver','alpha') == 'thirdparty') // Id of third party
-			{
-				$sendto = $object->client->email;
-				$sendtoid = 0;
-			}
-			else    // Id du contact
-			{
-				$sendto = $object->client->contact_get_property(GETPOST('receiver'),'email');
-				$sendtoid = GETPOST('receiver','alpha');
-			}
-		}
-
-		if (dol_strlen($sendto))
-		{
-			$langs->load("commercial");
-
-			$from				= GETPOST('fromname','alpha') . ' <' . GETPOST('frommail','alpha') .'>';
-			$replyto			= GETPOST('replytoname','alpha'). ' <' . GETPOST('replytomail','alpha').'>';
-			$message			= GETPOST('message');
-			$sendtocc			= GETPOST('sendtocc','alpha');
-			$deliveryreceipt	= GETPOST('deliveryreceipt','alpha');
-
-			if ($action == 'send')
-			{
-				if (strlen(GETPOST('subject','alphs'))) $subject = GETPOST('subject','alpha');
-				else $subject = $langs->transnoentities('Intervention').' '.$object->ref;
-				$actiontypecode='AC_OTH_AUTO';
-				$actionmsg = $langs->transnoentities('MailSentBy').' '.$from.' '.$langs->transnoentities('To').' '.$sendto.".\n";
-				if ($message)
-				{
-					$actionmsg.=$langs->transnoentities('MailTopic').": ".$subject."\n";
-					$actionmsg.=$langs->transnoentities('TextUsedInTheMessageBody').":\n";
-					$actionmsg.=$message;
-				}
-				$actionmsg2=$langs->transnoentities('Action'.$actiontypecode);
-			}
-
-			// Create form object
-			include_once DOL_DOCUMENT_ROOT.'/core/class/html.formmail.class.php';
-			$formmail = new FormMail($db);
-
-			$attachedfiles=$formmail->get_attached_files();
-			$filepath = $attachedfiles['paths'];
-			$filename = $attachedfiles['names'];
-			$mimetype = $attachedfiles['mimes'];
-
-			// Envoi de la propal
-			require_once DOL_DOCUMENT_ROOT.'/core/class/CMailFile.class.php';
-			$mailfile = new CMailFile($subject,$sendto,$from,$message,$filepath,$mimetype,$filename,$sendtocc,'',$deliveryreceipt,-1);
-			if ($mailfile->error)
-			{
-				$mesg='<div class="error">'.$mailfile->error.'</div>';
-			}
-			else
-			{
-				$result=$mailfile->sendfile();
-				if ($result)
-				{
-					$mesg=$langs->trans('MailSuccessfulySent',$mailfile->getValidAddress($from,2),$mailfile->getValidAddress($sendto,2));
-					setEventMessage($mesg);
-					$error=0;
-
-					// Initialisation donnees
-					$object->sendtoid		= $sendtoid;
-					$object->actiontypecode	= $actiontypecode;
-					$object->actionmsg 		= $actionmsg;
-					$object->actionmsg2		= $actionmsg2;
-					$object->fk_element		= $object->id;
-					$object->elementtype	= $object->element;
-
-                    // Appel des triggers
-                    include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
-                    $interface=new Interfaces($db);
-                    $result=$interface->run_triggers('FICHINTER_SENTBYMAIL',$object,$user,$langs,$conf);
-					if ($result < 0) {
-						$error++; $this->errors=$interface->errors;
-					}
-                    // Fin appel triggers
-
-                        if ($error)
-                        {
-                            dol_print_error($db);
-                        }
-                        else
-                        {
-                            // Redirect here
-                            // This avoid sending mail twice if going out and then back to page
-                            header('Location: '.$_SERVER["PHP_SELF"].'?id='.$object->id);
-                            exit;
-                        }
-                    }
-                    else
-                    {
-                        $langs->load("other");
-                        $mesg='<div class="error">';
-                        if ($mailfile->error)
-                        {
-                            $mesg.=$langs->trans('ErrorFailedToSendMail',$from,$sendto);
-                            $mesg.='<br>'.$mailfile->error;
-                        }
-                        else
-                        {
-                            $mesg.='No mail sent. Feature is disabled by option MAIN_DISABLE_ALL_MAILS';
-                        }
-                        $mesg.='</div>';
-                    }
-                }
-            }
-            else
-            {
-                $langs->load("other");
-                $mesg='<div class="error">'.$langs->trans('ErrorMailRecipientIsEmpty').' !</div>';
-                dol_syslog('Recipient email is empty');
-            }
-    }
-    else
-    {
-        $langs->load("other");
-        $mesg='<div class="error">'.$langs->trans('ErrorFailedToReadEntity',$langs->trans("Intervention")).'</div>';
-        dol_syslog('Impossible de lire les donnees de l\'intervention. Le fichier intervention n\'a peut-etre pas ete genere.');
-    }
-
-    $action='presend';
-}
-
-else if ($action == 'update_extras')
-{
-	$object->fetch($id);
-	// Fill array 'array_options' with data from update form
-	$extralabels=$extrafields->fetch_name_optionals_label($object->table_element);
-	$ret = $extrafields->setOptionalsFromPost($extralabels,$object);
-
-	// Actions on extra fields (by external module or standard code)
-	// FIXME le hook fait double emploi avec le trigger !!
-	$hookmanager->initHooks(array('interventiondao'));
-	$parameters=array('id'=>$object->id);
-	$reshook=$hookmanager->executeHooks('insertExtraFields',$parameters,$object,$action);    // Note that $action and $object may have been modified by some hooks
-	if (empty($reshook))
-	{
-		if (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED)) // For avoid conflicts if trigger used
-		{
-			$result=$object->insertExtraFields();
-			if ($result < 0)
-			{
-				$error++;
-			}
-		}
-	}
-	else if ($reshook < 0) $error++;
-}
-
-if (! empty($conf->global->MAIN_DISABLE_CONTACTS_TAB) && $user->rights->ficheinter->creer)
-{
-	if ($action == 'addcontact')
-	{
-		$result = $object->fetch($id);
-
-		if ($result > 0 && $id > 0)
-		{
-			$contactid = (GETPOST('userid','int') ? GETPOST('userid','int') : GETPOST('contactid','int'));
-			$result = $object->add_contact($contactid, GETPOST('type','int'), GETPOST('source','alpha'));
-		}
-
-		if ($result >= 0)
-		{
-			header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
-			exit;
-		}
-		else
-		{
-			if ($object->error == 'DB_ERROR_RECORD_ALREADY_EXISTS')
-			{
-				$langs->load("errors");
-				$mesg = '<div class="error">'.$langs->trans("ErrorThisContactIsAlreadyDefinedAsThisType").'</div>';
-			}
-			else
-			{
-				$mesg = '<div class="error">'.$object->error.'</div>';
-			}
-		}
-	}
-
-	// bascule du statut d'un contact
-	else if ($action == 'swapstatut')
-	{
-		if ($object->fetch($id))
-		{
-			$result=$object->swapContactStatus(GETPOST('ligne','int'));
-		}
-		else
-		{
-			dol_print_error($db);
-		}
-	}
-
-	// Efface un contact
-	else if ($action == 'deletecontact')
-	{
-		$object->fetch($id);
-		$result = $object->delete_contact(GETPOST('lineid','int'));
-
-		if ($result >= 0)
-		{
-			header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
-			exit;
-		}
-		else {
-			dol_print_error($db);
-		}
-	}
-}
-
-
-/*
- * View
-*/
-
-$form = new Form($db);
-$formfile = new FormFile($db);
-
-llxHeader();
-
-if ($action == 'create')
-{
-	/*
-	 * Mode creation
-	* Creation d'une nouvelle fiche d'intervention
-	*/
-
-	$soc=new Societe($db);
-
-	print_fiche_titre($langs->trans("AddIntervention"));
-
-	dol_htmloutput_mesg($mesg);
-
-	if ($socid) $res=$soc->fetch($socid);
-
-	if (GETPOST('origin') && GETPOST('originid'))
-	{
-		// Parse element/subelement (ex: project_task)
-		$element = $subelement = GETPOST('origin');
-		if (preg_match('/^([^_]+)_([^_]+)/i',GETPOST('origin'),$regs))
-		{
-			$element = $regs[1];
-			$subelement = $regs[2];
-		}
-
-        if ($element == 'project')
-        {
-            $projectid=GETPOST('originid');
-        }
-        else
-		{
-            // For compatibility
-			if ($element == 'order' || $element == 'commande')    {
-				$element = $subelement = 'commande';
-			}
-			if ($element == 'propal')   {
-				$element = 'comm/propal'; $subelement = 'propal';
-			}
-			if ($element == 'contract') {
-				$element = $subelement = 'contrat';
-			}
-
-			dol_include_once('/'.$element.'/class/'.$subelement.'.class.php');
-
-			$classname = ucfirst($subelement);
-			$objectsrc = new $classname($db);
-			$objectsrc->fetch(GETPOST('originid'));
-			if (empty($objectsrc->lines) && method_exists($objectsrc,'fetch_lines'))  $objectsrc->fetch_lines();
-			$objectsrc->fetch_thirdparty();
-
-			$projectid          = (!empty($objectsrc->fk_project)?$objectsrc->fk_project:'');
-
-			$soc = $objectsrc->client;
-
-			$note_private		= (! empty($objectsrc->note) ? $objectsrc->note : (! empty($objectsrc->note_private) ? $objectsrc->note_private : ''));
-			$note_public		= (! empty($objectsrc->note_public) ? $objectsrc->note_public : '');
-
-			// Object source contacts list
-			$srccontactslist = $objectsrc->liste_contact(-1,'external',1);
-		}
-	}
-	else {
-		$projectid = GETPOST('projectid','int');
-		$note_private = '';
-		$note_public = '';
-	}
-
-	if (! $conf->global->FICHEINTER_ADDON)
-	{
-		dol_print_error($db,$langs->trans("Error")." ".$langs->trans("Error_FICHEINTER_ADDON_NotDefined"));
-		exit;
-	}
-
-	$object->date = dol_now();
-
-	$obj = $conf->global->FICHEINTER_ADDON;
-	$obj = "mod_".$obj;
-
-	//$modFicheinter = new $obj;
-	//$numpr = $modFicheinter->getNextValue($soc, $object);
-
-	if ($socid > 0)
-	{
-		$soc->fetch($socid);
-
-		print '<form name="fichinter" action="'.$_SERVER['PHP_SELF'].'" method="POST">';
-		print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
-
-		print '<table class="border" width="100%">';
-
-		print '<input type="hidden" name="socid" value='.$soc->id.'>';
-		print '<tr><td class="fieldrequired">'.$langs->trans("ThirdParty").'</td><td>'.$soc->getNomUrl(1).'</td></tr>';
-
-		print '<input type="hidden" name="action" value="add">';
-
-		// Ref
-		print '<tr><td class="fieldrequired">'.$langs->trans('Ref').'</td><td colspan="2">'.$langs->trans("Draft").'</td></tr>';
-
-		// Description (must be a textarea and not html must be allowed (used in list view)
-		print '<tr><td valign="top">'.$langs->trans("Description").'</td>';
-		print '<td>';
-		print '<textarea name="description" cols="80" rows="'.ROWS_3.'"></textarea>';
-		print '</td></tr>';
-
-		// Project
-		if (! empty($conf->projet->enabled))
-		{
-			$langs->load("project");
-
-            print '<tr><td valign="top">'.$langs->trans("Project").'</td><td>';
-            /* Fix: If a project must be linked to any companies (suppliers or not), project must be not be set as limited to customer but must be not linked to any particular thirdparty
-            if ($societe->fournisseur==1)
-            	$numprojet=select_projects(-1,$_POST["projectid"],'projectid');
-            else
-            	$numprojet=select_projects($societe->id,$_POST["projectid"],'projectid');
-            	*/
-            $numprojet=select_projects($soc->id,GETPOST('projectid','int'),'projectid');
-            if ($numprojet==0)
-            {
-                print ' &nbsp; <a href="'.DOL_DOCUMENT_ROOT.'/projet/fiche.php?socid='.$soc->id.'&action=create">'.$langs->trans("AddProject").'</a>';
-            }
-            print '</td></tr>';
-        }
-
-	// Contrat
-	if ($conf->contrat->enabled)
-	{
-		$langs->load("contrat");
-		print '<tr><td valign="top">'.$langs->trans("Contrat").'</td><td>';
-		$numcontrat=select_contrats($soc->id,GETPOST('contratid','int'),'contratid');
-		if ($numcontrat==0)
-		{
-			print ' &nbsp; <a href="'.DOL_URL_ROOT.'/contrat/fiche.php?socid='.$soc->id.'&action=create">'.$langs->trans("AddContract").'</a>';
-		}
-		print '</td></tr>';
-	}
-
-        // Model
-        print '<tr>';
-        print '<td>'.$langs->trans("DefaultModel").'</td>';
-        print '<td colspan="2">';
-        $liste=ModelePDFFicheinter::liste_modeles($db);
-        print $form->selectarray('model',$liste,$conf->global->FICHEINTER_ADDON_PDF);
-        print "</td></tr>";
-
-        // Public note
-        print '<tr>';
-        print '<td class="border" valign="top">'.$langs->trans('NotePublic').'</td>';
-        print '<td valign="top" colspan="2">';
-        $doleditor = new DolEditor('note_public', $note_public, '', 80, 'dolibarr_notes', 'In', 0, false, true, ROWS_3, 70);
-        print $doleditor->Create(1);
-        //print '<textarea name="note_public" cols="80" rows="'.ROWS_3.'">'.$note_public.'</textarea>';
-        print '</td></tr>';
-
-        // Private note
-        if (!empty($user->societe_id))
-        {
-        	print '<tr>';
-        	print '<td class="border" valign="top">'.$langs->trans('NotePrivate').'</td>';
-        	print '<td valign="top" colspan="2">';
-        	$doleditor = new DolEditor('note_private', $note_private, '', 80, 'dolibarr_notes', 'In', 0, false, true, ROWS_3, 70);
-        	print $doleditor->Create(1);
-        	//print '<textarea name="note_private" cols="80" rows="'.ROWS_3.'">'.$note_private.'</textarea>';
-        	print '</td></tr>';
-        }
-
-        // Other attributes
-        $parameters=array('colspan' => ' colspan="2"');
-        $reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$object,$action);    // Note that $action and $object may have been modified by hook
-		if (empty($reshook) && ! empty($extrafields->attribute_label))
-		{
-			print $object->showOptionals($extrafields,'edit');
-		}
-
-
-        // Show link to origin object
-        if (! empty($origin) && ! empty($originid) && is_object($objectsrc))
-        {
-        	$newclassname=$classname;
-        	if ($newclassname=='Propal') $newclassname='CommercialProposal';
-        	print '<tr><td>'.$langs->trans($newclassname).'</td><td colspan="2">'.$objectsrc->getNomUrl(1).'</td></tr>';
-        }
-
-        print '</table>';
-
-	    if (is_object($objectsrc))
-	    {
-	        print '<input type="hidden" name="origin"         value="'.$objectsrc->element.'">';
-	        print '<input type="hidden" name="originid"       value="'.$objectsrc->id.'">';
-		}
-
-		// Model
-		print '<tr>';
-		print '<td>'.$langs->trans("DefaultModel").'</td>';
-		print '<td colspan="2">';
-		$liste=ModelePDFFicheinter::liste_modeles($db);
-		print $form->selectarray('model',$liste,$conf->global->FICHEINTER_ADDON_PDF);
-		print "</td></tr>";
-
-		// Public note
-		print '<tr>';
-		print '<td class="border" valign="top">'.$langs->trans('NotePublic').'</td>';
-		print '<td valign="top" colspan="2">';
-		$doleditor = new DolEditor('note_public', $note_public, '', 80, 'dolibarr_notes', 'In', 0, false, true, ROWS_3, 70);
-		print $doleditor->Create(1);
-		//print '<textarea name="note_public" cols="80" rows="'.ROWS_3.'">'.$note_public.'</textarea>';
-		print '</td></tr>';
-
-		// Private note
-		if (!empty($user->societe_id))
-		{
-			print '<tr>';
-			print '<td class="border" valign="top">'.$langs->trans('NotePrivate').'</td>';
-			print '<td valign="top" colspan="2">';
-			$doleditor = new DolEditor('note_private', $note_private, '', 80, 'dolibarr_notes', 'In', 0, false, true, ROWS_3, 70);
-			print $doleditor->Create(1);
-			//print '<textarea name="note_private" cols="80" rows="'.ROWS_3.'">'.$note_private.'</textarea>';
-			print '</td></tr>';
-		}
-
-		// Other attributes
-		$parameters=array('colspan' => ' colspan="2"');
-		$reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$object,$action);    // Note that $action and $object may have been modified by hook
-
-
-		// Show link to origin object
-		if (! empty($origin) && ! empty($originid) && is_object($objectsrc))
-		{
-			$newclassname=$classname;
-			if ($newclassname=='Propal') $newclassname='CommercialProposal';
-			print '<tr><td>'.$langs->trans($newclassname).'</td><td colspan="2">'.$objectsrc->getNomUrl(1).'</td></tr>';
-		}
-
-		print '</table>';
-
-		if (is_object($objectsrc))
-		{
-			print '<input type="hidden" name="origin"         value="'.$objectsrc->element.'">';
-			print '<input type="hidden" name="originid"       value="'.$objectsrc->id.'">';
-		}
-
-		print '<center><br>';
-		print '<input type="submit" class="button" value="'.$langs->trans("CreateDraftIntervention").'">';
-		print '</center>';
-
-		print '</form>';
-	}
-	else
-	{
-		print '<form name="fichinter" action="'.$_SERVER['PHP_SELF'].'" method="POST">';
-		print '<table class="border" width="100%">';
-		print '<tr><td class="fieldrequired">'.$langs->trans("ThirdParty").'</td><td>';
-		print $form->select_company('','socid','',1,1);
-		print '</td></tr>';
-		print '</table>';
-
-		print '<br><center>';
-		print '<input type="hidden" name="action" value="create">';
-		print '<input type="submit" class="button" value="'.$langs->trans("CreateDraftIntervention").'">';
-		print '</center>';
-
-		print '</form>';
-	}
-
-}
-else if ($id > 0 || ! empty($ref))
-{
-	/*
-	 * Affichage en mode visu
-	*/
-
-	$object->fetch($id, $ref);
-	$object->fetch_thirdparty();
-
-	$soc=new Societe($db);
-	$soc->fetch($object->socid);
-
-	dol_htmloutput_mesg($mesg);
-
-	$head = fichinter_prepare_head($object);
-
-	dol_fiche_head($head, 'card', $langs->trans("InterventionCard"), 0, 'intervention');
-
-	// Confirmation de la suppression de la fiche d'intervention
-	if ($action == 'delete')
-	{
-		$ret=$form->form_confirm($_SERVER["PHP_SELF"].'?id='.$object->id, $langs->trans('DeleteIntervention'), $langs->trans('ConfirmDeleteIntervention'), 'confirm_delete','',0,1);
-		if ($ret == 'html') print '<br>';
-	}
-
-	// Confirmation validation
-	if ($action == 'validate')
-	{
-		// on verifie si l'objet est en numerotation provisoire
-		$ref = substr($object->ref, 1, 4);
-		if ($ref == 'PROV')
-		{
-			$numref = $object->getNextNumRef($soc);
-			if (empty($numref))
-			{
-				$error++;
-				dol_htmloutput_errors($object->error);
-			}
-		}
-		else
-		{
-			$numref = $object->ref;
-		}
-		$text=$langs->trans('ConfirmValidateIntervention',$numref);
-
-		$ret=$form->form_confirm($_SERVER["PHP_SELF"].'?id='.$object->id, $langs->trans('ValidateIntervention'), $text, 'confirm_validate','',0,1);
-		if ($ret == 'html') print '<br>';
-	}
-
-	// Confirmation de la validation de la fiche d'intervention
-	if ($action == 'modify')
-	{
-		$ret=$form->form_confirm($_SERVER["PHP_SELF"].'?id='.$object->id, $langs->trans('ModifyIntervention'), $langs->trans('ConfirmModifyIntervention'), 'confirm_modify','',0,1);
-		if ($ret == 'html') print '<br>';
-	}
-
-	// Confirmation de la suppression d'une ligne d'intervention
-	if ($action == 'ask_deleteline')
-	{
-		$ret=$form->form_confirm($_SERVER["PHP_SELF"].'?id='.$object->id.'&line_id='.GETPOST('line_id','int'), $langs->trans('DeleteInterventionLine'), $langs->trans('ConfirmDeleteInterventionLine'), 'confirm_deleteline','',0,1);
-		if ($ret == 'html') print '<br>';
-	}
-
-	print '<table class="border" width="100%">';
-
-	$linkback = '<a href="'.DOL_URL_ROOT.'/fichinter/list.php'.(! empty($socid)?'?socid='.$socid:'').'">'.$langs->trans("BackToList").'</a>';
-
-	// Ref
-	print '<tr><td width="25%">'.$langs->trans("Ref").'</td><td>';
-	print $form->showrefnav($object, 'ref', $linkback, 1, 'ref', 'ref');
-	print '</td></tr>';
-
-	// Third party
-	print "<tr><td>".$langs->trans("Company")."</td><td>".$object->client->getNomUrl(1)."</td></tr>";
-
-	// Duration
-	print '<tr><td>'.$langs->trans("TotalDuration").'</td>';
-	print '<td>'.convertSecondToTime($object->duree, 'all', $conf->global->MAIN_DURATION_OF_WORKDAY).'</td>';
-	print '</tr>';
-
-	// Description (must be a textarea and not html must be allowed (used in list view)
-	print '<tr><td valign="top">';
-	print $form->editfieldkey("Description",'description',$object->description,$object,$user->rights->ficheinter->creer,'textarea');
-	print '</td><td colspan="3">';
-	print $form->editfieldval("Description",'description',$object->description,$object,$user->rights->ficheinter->creer,'textarea:8:80');
-	print '</td>';
-	print '</tr>';
-
-	// Project
-	if (! empty($conf->projet->enabled))
-	{
-		$langs->load('projects');
-		print '<tr>';
-		print '<td>';
-
-		print '<table class="nobordernopadding" width="100%"><tr><td>';
-		print $langs->trans('Project');
-		print '</td>';
-		if ($action != 'classify')
-		{
-			print '<td align="right"><a href="'.$_SERVER["PHP_SELF"].'?action=classify&amp;id='.$object->id.'">';
-			print img_edit($langs->trans('SetProject'),1);
-			print '</a></td>';
-		}
-		print '</tr></table>';
-		print '</td><td colspan="3">';
-		if ($action == 'classify')
-		{
-			$form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, $object->socid, $object->fk_project,'projectid');
-		}
-		else
-		{
-			$form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, $object->socid, $object->fk_project,'none');
-		}
-		print '</td>';
-		print '</tr>';
-	}
-
-	// Contrat
-	if ($conf->contrat->enabled)
-	{
-		$langs->load('contrat');
-		print '<tr>';
-		print '<td>';
-
-		print '<table class="nobordernopadding" width="100%"><tr><td>';
-		print $langs->trans('Contract');
-		print '</td>';
-		if ($action != 'contrat')
-		{
-			print '<td align="right"><a href="'.$_SERVER["PHP_SELF"].'?action=contrat&amp;id='.$object->id.'">';
-			print img_edit($langs->trans('SetContrat'),1);
-			print '</a></td>';
-		}
-		print '</tr></table>';
-		print '</td><td colspan="3">';
-		if ($action == 'contrat')
-		{
-			print '<form method="post" action="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'">';
-			print '<input type="hidden" name="action" value="setcontrat">';
-			print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
-			print '<table class="nobordernopadding" cellpadding="0" cellspacing="0">';
-			print '<tr><td>';
-			//print "$socid,$selected,$htmlname";
-			select_contrats($object->socid,$object->fk_contrat,'contratid');
-			print '</td>';
-			print '<td align="left"><input type="submit" class="button" value="'.$langs->trans("Modify").'"></td>';
-			print '</tr></table></form>';
-		}
-		else
-		{
-			if ($object->fk_contrat)
-            {
-                $contratstatic = new Contrat($db);
-                $contratstatic->fetch($object->fk_contrat);
-                //print '<a href="'.DOL_URL_ROOT.'/projet/fiche.php?id='.$selected.'">'.$projet->title.'</a>';
-                print $contratstatic->getNomUrl(0,'',1);
-            }
-            else
-            {
-                print "&nbsp;";
-            }
-		}
-		print '</td>';
-		print '</tr>';
-	}
-	
-	// Statut
-	print '<tr><td>'.$langs->trans("Status").'</td><td>'.$object->getLibStatut(4).'</td></tr>';
-
-    // Other attributes
-    $parameters=array('colspan' => ' colspan="3"');
-    $reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$object,$action);    // Note that $action and $object may have been modified by hook
-	if (empty($reshook) && ! empty($extrafields->attribute_label))
-	{
-		if ($action == 'edit_extras')
-		{
-			print '<form enctype="multipart/form-data" action="'.$_SERVER["PHP_SELF"].'" method="post" name="formfichinter">';
-			print '<input type="hidden" name="action" value="update_extras">';
-			print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
-			print '<input type="hidden" name="id" value="'.$object->id.'">';
-		}
-
-		foreach($extrafields->attribute_label as $key=>$label)
-		{
-			if ($action == 'edit_extras') {
-				$value=(isset($_POST["options_".$key])?$_POST["options_".$key]:$object->array_options["options_".$key]);
-			} else {
-				$value=$object->array_options["options_".$key];
-			}
-			if ($extrafields->attribute_type[$key] == 'separate')
-			{
-				print $extrafields->showSeparator($key);
-			}
-			else
-			{
-				print '<tr><td';
-				if (! empty($extrafields->attribute_required[$key])) print ' class="fieldrequired"';
-				print '>'.$label.'</td><td colspan="3">';
-				// Convert date into timestamp format
-				if (in_array($extrafields->attribute_type[$key],array('date','datetime')))
-				{
-					$value = isset($_POST["options_".$key])?dol_mktime($_POST["options_".$key."hour"], $_POST["options_".$key."min"], 0, $_POST["options_".$key."month"], $_POST["options_".$key."day"], $_POST["options_".$key."year"]):$db->jdate($object->array_options['options_'.$key]);
-				}
-				if ($action == 'edit_extras' && $user->rights->ficheinter->creer)
-				{
-					print $extrafields->showInputField($key,$value);
-				}
-				else
-				{
-					print $extrafields->showOutputField($key,$value);
-				}
-				print '</td></tr>'."\n";
-			}
-		}
-
-		if(count($extrafields->attribute_label) > 0) {
-
-			if ($action == 'edit_extras' && $user->rights->ficheinter->creer)
-			{
-				print '<tr><td></td><td colspan="3">';
-				print '<input type="submit" class="button" value="'.$langs->trans('Modify').'">';
-				print '</form>';
-				print '</td></tr>';
-
-			}
-			else {
-				if ($object->statut == 0 && $user->rights->ficheinter->creer)
-				{
-					print '<tr><td></td><td><a href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&action=edit_extras">'.img_picto('','edit').' '.$langs->trans('Modify').'</a></td></tr>';
-				}
-			}
-		}
-	}
-
-	print "</table><br>";
-
-	if (! empty($conf->global->MAIN_DISABLE_CONTACTS_TAB))
-	{
-		$blocname = 'contacts';
-		$title = $langs->trans('ContactsAddresses');
-		include DOL_DOCUMENT_ROOT.'/core/tpl/bloc_showhide.tpl.php';
-	}
-
-	if (! empty($conf->global->MAIN_DISABLE_NOTES_TAB))
-	{
-		$blocname = 'notes';
-		$title = $langs->trans('Notes');
-		include DOL_DOCUMENT_ROOT.'/core/tpl/bloc_showhide.tpl.php';
-	}
-
-	/*
-	 * Lignes d'intervention
-	*/
-	$sql = 'SELECT ft.rowid, ft.description, ft.fk_fichinter, ft.duree, ft.rang,';
-	$sql.= ' ft.date as date_intervention';
-	$sql.= ' FROM '.MAIN_DB_PREFIX.'fichinterdet as ft';
-	$sql.= ' WHERE ft.fk_fichinter = '.$object->id;
-	$sql.= ' ORDER BY ft.rang ASC, ft.rowid';
-
-	$resql = $db->query($sql);
-	if ($resql)
-	{
-		$num = $db->num_rows($resql);
-		$i = 0;
-
-		if ($num)
-		{
-			print '<table class="noborder" width="100%">';
-
-			print '<tr class="liste_titre">';
-			print '<td>'.$langs->trans('Description').'</td>';
-			print '<td align="center">'.$langs->trans('Date').'</td>';
-			print '<td align="right">'.$langs->trans('Duration').'</td>';
-			print '<td width="48" colspan="3">&nbsp;</td>';
-			print "</tr>\n";
-		}
-		$var=true;
-		while ($i < $num)
-		{
-			$objp = $db->fetch_object($resql);
-			$var=!$var;
-
-			// Ligne en mode visu
-			if ($action != 'editline' || GETPOST('line_id','int') != $objp->rowid)
-			{
-				print '<tr '.$bc[$var].'>';
-				print '<td>';
-				print '<a name="'.$objp->rowid.'"></a>'; // ancre pour retourner sur la ligne
-				print dol_htmlentitiesbr($objp->description);
-
-				// Date
-				print '<td align="center" width="150">'.dol_print_date($db->jdate($objp->date_intervention),'dayhour').'</td>';
-
-				// Duration
-				print '<td align="right" width="150">'.convertSecondToTime($objp->duree).'</td>';
-
-				print "</td>\n";
-
-
-				// Icone d'edition et suppression
-				if ($object->statut == 0  && $user->rights->ficheinter->creer)
-				{
-					print '<td align="center">';
-					print '<a href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=editline&amp;line_id='.$objp->rowid.'#'.$objp->rowid.'">';
-					print img_edit();
-					print '</a>';
-					print '</td>';
-					print '<td align="center">';
-					print '<a href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=ask_deleteline&amp;line_id='.$objp->rowid.'">';
-					print img_delete();
-					print '</a></td>';
-					if ($num > 1)
-					{
-						print '<td align="center">';
-						if ($i > 0)
-						{
-							print '<a href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=up&amp;line_id='.$objp->rowid.'">';
-							print img_up();
-							print '</a>';
-						}
-						if ($i < $num-1)
-						{
-							print '<a href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=down&amp;line_id='.$objp->rowid.'">';
-							print img_down();
-							print '</a>';
-						}
-						print '</td>';
-					}
-				}
-				else
-				{
-					print '<td colspan="3">&nbsp;</td>';
-				}
-
-				print '</tr>';
-			}
-
-			// Ligne en mode update
-			if ($object->statut == 0 && $action == 'editline' && $user->rights->ficheinter->creer && GETPOST('line_id','int') == $objp->rowid)
-			{
-				print '<form action="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'#'.$objp->rowid.'" method="post">';
-				print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
-				print '<input type="hidden" name="action" value="updateline">';
-				print '<input type="hidden" name="id" value="'.$object->id.'">';
-				print '<input type="hidden" name="line_id" value="'.GETPOST('line_id','int').'">';
-				print '<tr '.$bc[$var].'>';
-				print '<td>';
-				print '<a name="'.$objp->rowid.'"></a>'; // ancre pour retourner sur la ligne
-
-				// Editeur wysiwyg
-				require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
-				$doleditor=new DolEditor('np_desc',$objp->description,'',164,'dolibarr_details','',false,true,$conf->global->FCKEDITOR_ENABLE_DETAILS,ROWS_2,70);
-				$doleditor->Create();
-				print '</td>';
-
-				// Date d'intervention
-				print '<td align="center" class="nowrap">';
-				$form->select_date($db->jdate($objp->date_intervention),'di',1,1,0,"date_intervention");
-				print '</td>';
-
-				// Duration
-				print '<td align="right">';
-				$form->select_duration('duration',$objp->duree);
-				print '</td>';
-
-				print '<td align="center" colspan="5" valign="center"><input type="submit" class="button" name="save" value="'.$langs->trans("Save").'">';
-				print '<br><input type="submit" class="button" name="cancel" value="'.$langs->trans("Cancel").'"></td>';
-				print '</tr>' . "\n";
-
-				print "</form>\n";
-			}
-
-			$i++;
-		}
-
-		$db->free($resql);
-
-		/*
-		 * Add line
-		*/
-		if ($object->statut == 0 && $user->rights->ficheinter->creer && $action <> 'editline')
-		{
-			if (! $num) print '<br><table class="noborder" width="100%">';
-
-			print '<tr class="liste_titre">';
-			print '<td>';
-			print '<a name="add"></a>'; // ancre
-			print $langs->trans('Description').'</td>';
-			print '<td align="center">'.$langs->trans('Date').'</td>';
-			print '<td align="right">'.$langs->trans('Duration').'</td>';
-
-			print '<td colspan="4">&nbsp;</td>';
-			print "</tr>\n";
-
-			// Ajout ligne d'intervention
-			print '<form action="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'#add" name="addinter" method="post">';
-			print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
-			print '<input type="hidden" name="id" value="'.$object->id.'">';
-			print '<input type="hidden" name="action" value="addline">';
-
-			$var=false;
-
-			print '<tr '.$bc[$var].">\n";
-			print '<td>';
-			// editeur wysiwyg
-			require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
-			$doleditor=new DolEditor('np_desc',GETPOST('np_desc','alpha'),'',100,'dolibarr_details','',false,true,$conf->global->FCKEDITOR_ENABLE_DETAILS,ROWS_2,70);
-			$doleditor->Create();
-			print '</td>';
-
-			// Date intervention
-			print '<td align="center" class="nowrap">';
-			$now=dol_now();
-			$timearray=dol_getdate($now);
-			if (!GETPOST('diday','int')) $timewithnohour=dol_mktime(0,0,0,$timearray['mon'],$timearray['mday'],$timearray['year']);
-			else $timewithnohour=dol_mktime(GETPOST('dihour','int'),GETPOST('dimin','int'), 0,GETPOST('dimonth','int'),GETPOST('diday','int'),GETPOST('diyear','int'));
-			$form->select_date($timewithnohour,'di',1,1,0,"addinter");
-			print '</td>';
-
-			// Duration
-			print '<td align="right">';
-			$form->select_duration('duration',(!GETPOST('durationhour','int') && !GETPOST('durationmin','int'))?3600:(60*60*GETPOST('durationhour','int')+60*GETPOST('durationmin','int')));
-			print '</td>';
-
-			print '<td align="center" valign="middle" colspan="4"><input type="submit" class="button" value="'.$langs->trans('Add').'" name="addline"></td>';
-			print '</tr>';
-
-			print '</form>';
-
-			if (! $num) print '</table>';
-		}
-
-		if ($num) print '</table>';
-	}
-	else
-	{
-		dol_print_error($db);
-	}
-
-	print '</div>';
-	print "\n";
-
-
-	/*
-	 * Barre d'actions
-	*/
-	print '<div class="tabsAction">';
-
-	if ($user->societe_id == 0)
-	{
-		if ($action != 'editdescription' && ($action != 'presend'))
-		{
-			// Validate
-			if ($object->statut == 0 && $user->rights->ficheinter->creer && count($object->lines) > 0)
-			{
-				print '<div class="inline-block divButAction"><a class="butAction" href="fiche.php?id='.$object->id.'&action=validate"';
-				print '>'.$langs->trans("Valid").'</a></div>';
-			}
-
-			// Modify
-			if ($object->statut == 1 && $user->rights->ficheinter->creer)
-			{
-				print '<div class="inline-block divButAction"><a class="butAction" href="fiche.php?id='.$object->id.'&action=modify"';
-				print '>'.$langs->trans("Modify").'</a></div>';
-			}
-
-			// Send
-			if ($object->statut > 0)
-			{
-				if (empty($conf->global->MAIN_USE_ADVANCED_PERMS) || $user->rights->ficheinter->ficheinter_advance->send)
-				{
-					print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=presend&amp;mode=init">'.$langs->trans('SendByMail').'</a></div>';
-				}
-				else print '<div class="inline-block divButAction"><a class="butActionRefused" href="#">'.$langs->trans('SendByMail').'</a></div>';
-			}
-
-			// Invoicing
-			if (! empty($conf->facture->enabled) && $object->statut > 0)
-			{
-				$langs->load("bills");
-				if ($object->statut < 2)
-				{
-					if ($user->rights->facture->creer) print '<div class="inline-block divButAction"><a class="butAction" href="'.DOL_URL_ROOT.'/compta/facture.php?action=create&amp;origin='.$object->element.'&amp;originid='.$object->id.'&amp;socid='.$object->socid.'">'.$langs->trans("CreateBill").'</a></div>';
-					else print '<div class="inline-block divButAction"><a class="butActionRefused" href="#" title="'.$langs->trans("NotEnoughPermissions").'">'.$langs->trans("CreateBill").'</a></div>';
-				}
-
-				if (! empty($conf->global->FICHINTER_CLASSIFY_BILLED))
-				{
-					if ($object->statut != 2)
-					{
-						print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=classifybilled">'.$langs->trans("ClassifyBilled").'</a></div>';
-					}
-				}
-			}
-
-			// Delete
-			if (($object->statut == 0 && $user->rights->ficheinter->creer) || $user->rights->ficheinter->supprimer)
-			{
-				print '<div class="inline-block divButAction"><a class="butActionDelete" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=delete"';
-				print '>'.$langs->trans('Delete').'</a></div>';
-			}
-
-		}
-	}
-
-	print '</div>';
-	print '<br>';
-
-	if ($action != 'presend')
-	{
-		print '<div class="fichecenter"><div class="fichehalfleft">';
-		//print '<table width="100%"><tr><td width="50%" valign="top">';
-
-		/*
-		 * Built documents
-		*/
-		$filename=dol_sanitizeFileName($object->ref);
-		$filedir=$conf->ficheinter->dir_output . "/".$object->ref;
-		$urlsource=$_SERVER["PHP_SELF"]."?id=".$object->id;
-		$genallowed=$user->rights->ficheinter->creer;
-		$delallowed=$user->rights->ficheinter->supprimer;
-		$genallowed=1;
-		$delallowed=1;
-
-		$var=true;
-
-		//print "<br>\n";
-		$somethingshown=$formfile->show_documents('ficheinter',$filename,$filedir,$urlsource,$genallowed,$delallowed,$object->modelpdf,1,0,0,28,0,'','','',$soc->default_lang);
-
-		/*
-		 * Linked object block
-		*/
-		$somethingshown=$object->showLinkedObjectBlock();
-
-		//print '</td><td valign="top" width="50%">';
-		print '</div><div class="fichehalfright"><div class="ficheaddleft">';
-
-		// List of actions on element
-		include_once DOL_DOCUMENT_ROOT.'/core/class/html.formactions.class.php';
-		$formactions=new FormActions($db);
-		$somethingshown=$formactions->showactions($object,'fichinter',$socid);
-
-		print '</div></div></div>';
-		//print "</td></tr></table>\n";
-	}
-
-
-	/*
-	 * Action presend
-	*/
-	if ($action == 'presend')
-	{
-		$ref = dol_sanitizeFileName($object->ref);
-		include_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
-		$fileparams = dol_most_recent_file($conf->ficheinter->dir_output . '/' . $ref, preg_quote($ref,'/'));
-		$file=$fileparams['fullname'];
-
-		// Build document if it not exists
-		if (! $file || ! is_readable($file))
-		{
-			// Define output language
-			$outputlangs = $langs;
-			$newlang='';
-			if ($conf->global->MAIN_MULTILANGS && empty($newlang) && ! empty($_REQUEST['lang_id'])) $newlang=$_REQUEST['lang_id'];
-			if ($conf->global->MAIN_MULTILANGS && empty($newlang)) $newlang=$object->client->default_lang;
-			if (! empty($newlang))
-			{
-				$outputlangs = new Translate("",$conf);
-				$outputlangs->setDefaultLang($newlang);
-			}
-
-			$result=fichinter_create($db, $object, GETPOST('model')?GETPOST('model'):$object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref);
-			if ($result <= 0)
-			{
-				dol_print_error($db,$result);
-				exit;
-			}
-			$fileparams = dol_most_recent_file($conf->ficheinter->dir_output . '/' . $ref, preg_quote($ref,'/'));
-			$file=$fileparams['fullname'];
-		}
-
-		print '<br>';
-		print_titre($langs->trans('SendInterventionByMail'));
-
-		// Create form object
-		include_once DOL_DOCUMENT_ROOT.'/core/class/html.formmail.class.php';
-		$formmail = new FormMail($db);
-		$formmail->fromtype = 'user';
-		$formmail->fromid   = $user->id;
-		$formmail->fromname = $user->getFullName($langs);
-		$formmail->frommail = $user->email;
-		$formmail->withfrom=1;
-		$liste=array();
-		foreach ($object->thirdparty->thirdparty_and_contact_email_array(1) as $key=>$value)	$liste[$key]=$value;
-		$formmail->withto=GETPOST("sendto")?GETOST("sendto"):$liste;
-		$formmail->withtocc=$liste;
-		$formmail->withtoccc=$conf->global->MAIN_EMAIL_USECCC;
-		$formmail->withtopic=$langs->trans('SendInterventionRef','__FICHINTERREF__');
-		$formmail->withfile=2;
-		$formmail->withbody=1;
-		$formmail->withdeliveryreceipt=1;
-		$formmail->withcancel=1;
-
-		// Tableau des substitutions
-		$formmail->substit['__FICHINTERREF__']=$object->ref;
-		$formmail->substit['__SIGNATURE__']=$user->signature;
-		$formmail->substit['__PERSONALIZED__']='';
-		$formmail->substit['__CONTACTCIVNAME__']='';
-
-		//Find the good contact adress
-		$custcontact='';
-		$contactarr=array();
-		$contactarr=$object->liste_contact(-1,'external');
-
-		if (is_array($contactarr) && count($contactarr)>0) {
-			foreach($contactarr as $contact) {
-				if ($contact['libelle']==$langs->trans('TypeContact_fichinter_external_CUSTOMER')) {
-					require_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php';
-					$contactstatic=new Contact($db);
-					$contactstatic->fetch($contact['id']);
-					$custcontact=$contactstatic->getFullName($langs,1);
-				}
-			}
-
-			if (!empty($custcontact)) {
-				$formmail->substit['__CONTACTCIVNAME__']=$custcontact;
-			}
-		}
-
-		// Tableau des parametres complementaires
-		$formmail->param['action']='send';
-		$formmail->param['models']='fichinter_send';
-		$formmail->param['fichinter_id']=$object->id;
-		$formmail->param['returnurl']=$_SERVER["PHP_SELF"].'?id='.$object->id;
-
-		// Init list of files
-		if (GETPOST("mode")=='init')
-		{
-			$formmail->clear_attached_files();
-			$formmail->add_attached_files($file,basename($file),dol_mimetype($file));
-		}
-
-		$formmail->show_form();
-
-		print '<br>';
-	}
-}
-
-
-llxFooter();
-
-$db->close();
-?>
+<?php
+/* Copyright (C) 2002-2007	Rodolphe Quiedeville	<rodolphe@quiedeville.org>
+ * Copyright (C) 2004-2012	Laurent Destailleur		<eldy@users.sourceforge.net>
+* Copyright (C) 2005-2012	Regis Houssin			<regis.houssin@capnetworks.com>
+* Copyright (C) 2011-2013  Juanjo Menent			<jmenent@2byte.es>
+* Copyright (C) 2013       Florian Henry        <florian.henry@open-concept.pro>
+*
+* 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
+* the Free Software Foundation; either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program. If not, see <http://www.gnu.org/licenses/>.
+*/
+
+/**
+ *	\file       htdocs/fichinter/fiche.php
+*	\brief      Fichier fiche intervention
+*	\ingroup    ficheinter
+*/
+
+require '../main.inc.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php';
+require_once DOL_DOCUMENT_ROOT.'/fichinter/class/fichinter.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/modules/fichinter/modules_fichinter.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/fichinter.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
+if (! empty($conf->projet->enabled))
+{
+	require_once DOL_DOCUMENT_ROOT.'/core/lib/project.lib.php';
+	require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
+}
+if (! empty($conf->global->FICHEINTER_ADDON) && is_readable(DOL_DOCUMENT_ROOT ."/core/modules/fichinter/mod_".$conf->global->FICHEINTER_ADDON.".php"))
+{
+	require_once DOL_DOCUMENT_ROOT ."/core/modules/fichinter/mod_".$conf->global->FICHEINTER_ADDON.'.php';
+}
+require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
+
+$langs->load("companies");
+$langs->load("interventions");
+
+$id			= GETPOST('id','int');
+$ref		= GETPOST('ref','alpha');
+$socid		= GETPOST('socid','int');
+$contratid	= GETPOST('contratid','int');
+$action		= GETPOST('action','alpha');
+$confirm	= GETPOST('confirm','alpha');
+$mesg		= GETPOST('msg','alpha');
+$origin=GETPOST('origin','alpha');
+$originid=(GETPOST('originid','int')?GETPOST('originid','int'):GETPOST('origin_id','int')); // For backward compatibility
+
+//PDF
+$hidedetails = (GETPOST('hidedetails','int') ? GETPOST('hidedetails','int') : (! empty($conf->global->MAIN_GENERATE_DOCUMENTS_HIDE_DETAILS) ? 1 : 0));
+$hidedesc 	 = (GETPOST('hidedesc','int') ? GETPOST('hidedesc','int') : (! empty($conf->global->MAIN_GENERATE_DOCUMENTS_HIDE_DESC) ?  1 : 0));
+$hideref 	 = (GETPOST('hideref','int') ? GETPOST('hideref','int') : (! empty($conf->global->MAIN_GENERATE_DOCUMENTS_HIDE_REF) ? 1 : 0));
+
+// Security check
+if ($user->societe_id) $socid=$user->societe_id;
+$result = restrictedArea($user, 'ficheinter', $id, 'fichinter');
+
+// Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array
+$hookmanager->initHooks(array('interventioncard'));
+
+$object = new Fichinter($db);
+$extrafields = new ExtraFields($db);
+$extralabels=$extrafields->fetch_name_optionals_label($object->table_element);
+
+
+/*
+ * Actions
+*/
+
+if ($action == 'confirm_validate' && $confirm == 'yes' && $user->rights->ficheinter->creer)
+{
+	$object->fetch($id);
+	$object->fetch_thirdparty();
+
+	$result = $object->setValid($user);
+	if ($result >= 0)
+	{
+		// Define output language
+		$outputlangs = $langs;
+		$newlang='';
+		if ($conf->global->MAIN_MULTILANGS && empty($newlang) && GETPOST('lang_id','alpha')) $newlang=GETPOST('lang_id','alpha');
+		if ($conf->global->MAIN_MULTILANGS && empty($newlang)) $newlang=$object->client->default_lang;
+		if (! empty($newlang))
+		{
+			$outputlangs = new Translate("",$conf);
+			$outputlangs->setDefaultLang($newlang);
+		}
+		$result=fichinter_create($db, $object, GETPOST('model','alpha'), $outputlangs);
+		header('Location: '.$_SERVER["PHP_SELF"].'?id='.$object->id);
+		exit;
+	}
+	else
+	{
+		$mesg='<div class="error">'.$object->error.'</div>';
+	}
+}
+
+else if ($action == 'confirm_modify' && $confirm == 'yes' && $user->rights->ficheinter->creer)
+{
+	$object->fetch($id);
+	$object->fetch_thirdparty();
+
+	$result = $object->setDraft($user);
+	if ($result >= 0)
+	{
+		// Define output language
+		$outputlangs = $langs;
+		$newlang='';
+		if ($conf->global->MAIN_MULTILANGS && empty($newlang) && GETPOST('lang_id','alpha')) $newlang=GETPOST('lang_id','alpha');
+		if ($conf->global->MAIN_MULTILANGS && empty($newlang)) $newlang=$object->client->default_lang;
+		if (! empty($newlang))
+		{
+			$outputlangs = new Translate("",$conf);
+			$outputlangs->setDefaultLang($newlang);
+		}
+		$result=fichinter_create($db, $object, (!GETPOST('model','alpha'))?$object->model:GETPOST('model','apha'), $outputlangs);
+		header('Location: '.$_SERVER["PHP_SELF"].'?id='.$object->id);
+		exit;
+	}
+	else
+	{
+		$mesg='<div class="error">'.$object->error.'</div>';
+	}
+}
+
+else if ($action == 'add' && $user->rights->ficheinter->creer)
+{
+    $object->socid			= $socid;
+    $object->duree			= GETPOST('duree','int');
+    $object->fk_project		= GETPOST('projectid','int');
+    $object->fk_contrat		= GETPOST('contratid','int');
+    $object->author			= $user->id;
+    $object->description	= GETPOST('description');
+    $object->ref			= $ref;
+    $object->modelpdf		= GETPOST('model','alpha');
+    $object->note_private	= GETPOST('note_private');
+    $object->note_public	= GETPOST('note_public');
+
+	if ($object->socid > 0)
+	{
+		// If creation from another object of another module (Example: origin=propal, originid=1)
+		if (!empty($origin) && !empty($originid) )
+		{
+			// Parse element/subelement (ex: project_task)
+			$element = $subelement = $_POST['origin'];
+			if (preg_match('/^([^_]+)_([^_]+)/i',$_POST['origin'],$regs))
+			{
+				$element = $regs[1];
+				$subelement = $regs[2];
+			}
+
+			// For compatibility
+			if ($element == 'order')    {
+				$element = $subelement = 'commande';
+			}
+			if ($element == 'propal')   {
+				$element = 'comm/propal'; $subelement = 'propal';
+			}
+			if ($element == 'contract') {
+				$element = $subelement = 'contrat';
+			}
+
+			$object->origin    = $origin;
+			$object->origin_id = $originid;
+
+			// Possibility to add external linked objects with hooks
+			$object->linked_objects[$object->origin] = $object->origin_id;
+			if (is_array($_POST['other_linked_objects']) && ! empty($_POST['other_linked_objects']))
+			{
+				$object->linked_objects = array_merge($object->linked_objects, $_POST['other_linked_objects']);
+			}
+
+			$id = $object->create($user);
+
+			if ($id > 0)
+			{
+				dol_include_once('/'.$element.'/class/'.$subelement.'.class.php');
+
+				$classname = ucfirst($subelement);
+				$srcobject = new $classname($db);
+
+				dol_syslog("Try to find source object origin=".$object->origin." originid=".$object->origin_id." to add lines");
+				$result=$srcobject->fetch($object->origin_id);
+				if ($result > 0)
+				{
+					$srcobject->fetch_thirdparty();
+					$lines = $srcobject->lines;
+					if (empty($lines) && method_exists($srcobject,'fetch_lines'))  $lines = $srcobject->fetch_lines();
+
+					$fk_parent_line=0;
+					$num=count($lines);
+
+					for ($i=0;$i<$num;$i++)
+					{
+						$product_type=($lines[$i]->product_type?$lines[$i]->product_type:0);
+
+						if ($product_type == 1 || !empty($conf->global->FICHINTER_PRINT_PRODUCTS)) { //only services except if config includes products
+							// service prédéfini
+							if ($lines[$i]->fk_product > 0)
+							{
+								// Define output language
+								if (! empty($conf->global->MAIN_MULTILANGS) && ! empty($conf->global->PRODUIT_TEXTS_IN_THIRDPARTY_LANGUAGE))
+								{
+									$prod = new Product($db, $lines[$i]->fk_product);
+
+									$outputlangs = $langs;
+									$newlang='';
+									if (empty($newlang) && GETPOST('lang_id')) $newlang=GETPOST('lang_id');
+									if (empty($newlang)) $newlang=$srcobject->client->default_lang;
+									if (! empty($newlang))
+									{
+										$outputlangs = new Translate("",$conf);
+										$outputlangs->setDefaultLang($newlang);
+									}
+
+									$label = (! empty($prod->multilangs[$outputlangs->defaultlang]["libelle"])) ? $prod->multilangs[$outputlangs->defaultlang]["libelle"] : $lines[$i]->product_label;
+								}
+								else
+								{
+									$label = $lines[$i]->product_label;
+								}
+
+								$desc = $label;
+								$desc .= ' ('.$langs->trans('Quantity').': '.$lines[$i]->qty.')';
+							}
+							else {
+								$desc = dol_htmlentitiesbr($lines[$i]->desc);
+								$desc .= ' ('.$langs->trans('Quantity').': '.$lines[$i]->qty.')';
+							}
+							$timearray=dol_getdate(mktime());
+							$date_intervention=dol_mktime(0,0,0,$timearray['mon'],$timearray['mday'],$timearray['year']);
+							if ($product_type == 1)
+							{ //service
+								$duration = 3600;
+							}
+							else
+							{ //product
+							    $duration = 0;
+							}
+
+		                    $result = $object->addline(
+								$user,
+		                        $id,
+		                        $desc,
+					            $date_intervention,
+                 				$duration
+		                    );
+
+							if ($result < 0)
+							{
+								$error++;
+								break;
+							}
+
+						}
+					}
+
+	            }
+	            else
+	            {
+	                $mesg=$srcobject->error;
+	                $error++;
+	            }
+	        }
+	        else
+	        {
+	            $mesg=$object->error;
+	            $error++;
+	        }
+	    }
+	    else
+	    {
+			$result = $object->create($user);
+	        if ($result > 0)
+	        {
+	            $id=$result;      // Force raffraichissement sur fiche venant d'etre cree
+	        }
+	        else
+	        {
+	            $langs->load("errors");
+	            $mesg='<div class="error">'.$langs->trans($object->error).'</div>';
+	            $action = 'create';
+	        }
+        }
+    }
+    else
+    {
+        $mesg='<div class="error">'.$langs->trans("ErrorFieldRequired",$langs->trans("ThirdParty")).'</div>';
+        $action = 'create';
+    }
+}
+
+else if ($action == 'update' && $user->rights->ficheinter->creer)
+{
+	$object->fetch($id);
+
+	$object->socid			= $socid;
+	$object->fk_project		= GETPOST('projectid','int');
+	$object->fk_contrat		= GETPOST('contratid','int');
+	$object->author			= $user->id;
+	$object->description	= GETPOST('description','alpha');
+	$object->ref			= $ref;
+
+	$result=$object->update($user);
+	if ($result<0) {
+		setEventMessage($object->error,'errors');
+	}
+}
+
+/*
+ * Build doc
+*/
+else if ($action == 'builddoc' && $user->rights->ficheinter->creer)	// En get ou en post
+{
+	$object->fetch($id);
+	$object->fetch_thirdparty();
+	$object->fetch_lines();
+
+	if (GETPOST('model','alpha'))
+	{
+		$object->setDocModel($user, GETPOST('model','alpha'));
+	}
+
+	// Define output language
+	$outputlangs = $langs;
+	$newlang='';
+	if ($conf->global->MAIN_MULTILANGS && empty($newlang) && GETPOST('lang_id','alpha')) $newlang=GETPOST('lang_id','alpha');
+	if ($conf->global->MAIN_MULTILANGS && empty($newlang)) $newlang=$object->client->default_lang;
+	if (! empty($newlang))
+	{
+		$outputlangs = new Translate("",$conf);
+		$outputlangs->setDefaultLang($newlang);
+	}
+	$result=fichinter_create($db, $object, GETPOST('model','alpha'), $outputlangs);
+	if ($result <= 0)
+	{
+		dol_print_error($db,$result);
+		exit;
+	}
+}
+
+// Remove file in doc form
+else if ($action == 'remove_file')
+{
+	if ($object->fetch($id))
+	{
+		require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
+
+		$object->fetch_thirdparty();
+
+		$langs->load("other");
+		$upload_dir = $conf->ficheinter->dir_output;
+		$file = $upload_dir . '/' . GETPOST('file');
+		$ret=dol_delete_file($file,0,0,0,$object);
+		if ($ret) setEventMessage($langs->trans("FileWasRemoved", GETPOST('urlfile')));
+		else setEventMessage($langs->trans("ErrorFailToDeleteFile", GETPOST('urlfile')), 'errors');
+	}
+}
+
+// Set into a project
+else if ($action == 'classin' && $user->rights->ficheinter->creer)
+{
+	$object->fetch($id);
+	$result=$object->setProject(GETPOST('projectid','int'));
+	if ($result < 0) dol_print_error($db,$object->error);
+}
+
+// Set into a contract
+else if ($action == 'setcontrat' && $user->rights->contrat->creer)
+{
+	$object->fetch($id);
+	$result=$object->set_contrat($user,GETPOST('contratid','int'));
+	if ($result < 0) dol_print_error($db,$object->error);
+}
+
+else if ($action == 'confirm_delete' && $confirm == 'yes' && $user->rights->ficheinter->supprimer)
+{
+	$object->fetch($id);
+	$object->fetch_thirdparty();
+	$result=$object->delete($user);
+	if ($result<0) {
+		setEventMessage($object->error,'errors');
+	}
+
+	header('Location: '.DOL_URL_ROOT.'/fichinter/list.php?leftmenu=ficheinter');
+	exit;
+}
+
+else if ($action == 'setdescription' && $user->rights->ficheinter->creer)
+{
+	$object->fetch($id);
+	$result=$object->set_description($user,GETPOST('description'));
+	if ($result < 0) dol_print_error($db,$object->error);
+}
+else if ($action == 'setnote_public' && $user->rights->ficheinter->creer)
+{
+	$object->fetch($id);
+	$result=$object->update_note(dol_html_entity_decode(GETPOST('note_public'), ENT_QUOTES),'_public');
+	if ($result < 0) dol_print_error($db,$object->error);
+}
+else if ($action == 'setnote_private' && $user->rights->ficheinter->creer)
+{
+	$object->fetch($id);
+	$result=$object->update_note(dol_html_entity_decode(GETPOST('note_private'), ENT_QUOTES), '_private');
+	if ($result < 0) dol_print_error($db,$object->error);
+}
+
+// Add line
+else if ($action == "addline" && $user->rights->ficheinter->creer)
+{
+	if (!GETPOST('np_desc'))
+	{
+		$mesg='<div class="error">'.$langs->trans("ErrorFieldRequired",$langs->transnoentitiesnoconv("Description")).'</div>';
+		$error++;
+	}
+	if (!GETPOST('durationhour','int') && !GETPOST('durationmin','int'))
+	{
+		$mesg='<div class="error">'.$langs->trans("ErrorFieldRequired",$langs->transnoentitiesnoconv("Duration")).'</div>';
+		$error++;
+	}
+	if (! $error)
+	{
+		$db->begin();
+
+		$ret=$object->fetch($id);
+		$object->fetch_thirdparty();
+
+		$desc=GETPOST('np_desc');
+		$date_intervention = dol_mktime(GETPOST('dihour','int'), GETPOST('dimin','int'), 0, GETPOST('dimonth','int'), GETPOST('diday','int'), GETPOST('diyear','int'));
+		$duration = convertTime2Seconds(GETPOST('durationhour','int'), GETPOST('durationmin','int'));
+
+        $result=$object->addline(
+			$user,
+            $id,
+            $desc,
+            $date_intervention,
+            $duration
+        );
+
+		// Define output language
+		$outputlangs = $langs;
+		$newlang='';
+		if ($conf->global->MAIN_MULTILANGS && empty($newlang) && GETPOST('lang_id','alpha')) $newlang=GETPOST('lang_id','alpha');
+		if ($conf->global->MAIN_MULTILANGS && empty($newlang)) $newlang=$object->client->default_lang;
+		if (! empty($newlang))
+		{
+			$outputlangs = new Translate("",$conf);
+			$outputlangs->setDefaultLang($newlang);
+		}
+
+		if ($result >= 0)
+		{
+			$db->commit();
+
+			fichinter_create($db, $object, $object->modelpdf, $outputlangs);
+			header('Location: '.$_SERVER["PHP_SELF"].'?id='.$object->id);
+			exit;
+		}
+		else
+		{
+			$mesg=$object->error;
+			$db->rollback();
+		}
+	}
+}
+
+// Classify Billed
+else if ($action == 'classifybilled' && $user->rights->ficheinter->creer)
+{
+	$object->fetch($id);
+	$result=$object->setBilled();
+	if ($result > 0)
+	{
+		header('Location: '.$_SERVER["PHP_SELF"].'?id='.$object->id);
+		exit;
+	}
+	else
+	{
+		$mesg='<div class="error">'.$object->error.'</div>';
+	}
+}
+
+/*
+ *  Mise a jour d'une ligne d'intervention
+*/
+else if ($action == 'updateline' && $user->rights->ficheinter->creer && GETPOST('save','alpha') == $langs->trans("Save"))
+{
+	$objectline = new FichinterLigne($db);
+	if ($objectline->fetch(GETPOST('line_id','int')) <= 0)
+	{
+		dol_print_error($db);
+		exit;
+	}
+
+	if ($object->fetch($objectline->fk_fichinter) <= 0)
+	{
+		dol_print_error($db);
+		exit;
+	}
+	$object->fetch_thirdparty();
+
+	$desc		= GETPOST('np_desc');
+	$date_inter	= dol_mktime(GETPOST('dihour','int'), GETPOST('dimin','int'), 0, GETPOST('dimonth','int'), GETPOST('diday','int'), GETPOST('diyear','int'));
+	$duration	= convertTime2Seconds(GETPOST('durationhour','int'),GETPOST('durationmin','int'));
+
+    $objectline->datei		= $date_inter;
+    $objectline->desc		= $desc;
+    $objectline->duration	= $duration;
+	$result = $objectline->update($user);
+    if ($result < 0)
+    {
+        dol_print_error($db);
+        exit;
+    }
+
+	// Define output language
+	$outputlangs = $langs;
+	$newlang='';
+	if ($conf->global->MAIN_MULTILANGS && empty($newlang) && GETPOST('lang_id','alpha')) $newlang=GETPOST('lang_id','alpha');
+	if ($conf->global->MAIN_MULTILANGS && empty($newlang)) $newlang=$object->client->default_lang;
+	if (! empty($newlang))
+	{
+		$outputlangs = new Translate("",$conf);
+		$outputlangs->setDefaultLang($newlang);
+	}
+	fichinter_create($db, $object, $object->modelpdf, $outputlangs);
+
+	header('Location: '.$_SERVER["PHP_SELF"].'?id='.$object->id);
+	exit;
+}
+
+/*
+ *  Supprime une ligne d'intervention AVEC confirmation
+*/
+else if ($action == 'confirm_deleteline' && $confirm == 'yes' && $user->rights->ficheinter->creer)
+{
+	$objectline = new FichinterLigne($db);
+	if ($objectline->fetch(GETPOST('line_id','int')) <= 0)
+	{
+		dol_print_error($db);
+		exit;
+	}
+	$result=$objectline->deleteline($user);
+
+	if ($object->fetch($objectline->fk_fichinter) <= 0)
+	{
+		dol_print_error($db);
+		exit;
+	}
+
+	// Define output language
+	$outputlangs = $langs;
+	$newlang='';
+	if ($conf->global->MAIN_MULTILANGS && empty($newlang) && GETPOST('lang_id','alpha')) $newlang=GETPOST('lang_id','alpha');
+	if ($conf->global->MAIN_MULTILANGS && empty($newlang)) $newlang=$object->client->default_lang;
+	if (! empty($newlang))
+	{
+		$outputlangs = new Translate("",$conf);
+		$outputlangs->setDefaultLang($newlang);
+	}
+	fichinter_create($db, $object, $object->modelpdf, $outputlangs);
+}
+
+/*
+ * Ordonnancement des lignes
+*/
+
+else if ($action == 'up' && $user->rights->ficheinter->creer)
+{
+	$object->fetch($id);
+	$object->fetch_thirdparty();
+	$object->line_up(GETPOST('line_id','int'));
+
+	// Define output language
+	$outputlangs = $langs;
+	$newlang='';
+	if ($conf->global->MAIN_MULTILANGS && empty($newlang) && GETPOST('lang_id','alpha')) $newlang=GETPOST('lang_id','alpha');
+	if ($conf->global->MAIN_MULTILANGS && empty($newlang)) $newlang=$object->client->default_lang;
+	if (! empty($newlang))
+	{
+		$outputlangs = new Translate("",$conf);
+		$outputlangs->setDefaultLang($newlang);
+	}
+	fichinter_create($db, $object, $object->modelpdf, $outputlangs);
+	header('Location: '.$_SERVER["PHP_SELF"].'?id='.$object->id.'#'.GETPOST('line_id','int'));
+	exit;
+}
+
+else if ($action == 'down' && $user->rights->ficheinter->creer)
+{
+	$object->fetch($id);
+	$object->fetch_thirdparty();
+	$object->line_down(GETPOST('line_id','int'));
+
+	// Define output language
+	$outputlangs = $langs;
+	$newlang='';
+	if ($conf->global->MAIN_MULTILANGS && empty($newlang) && GETPOST('lang_id','alpha')) $newlang=GETPOST('lang_id','alpha');
+	if ($conf->global->MAIN_MULTILANGS && empty($newlang)) $newlang=$object->client->default_lang;
+	if (! empty($newlang))
+	{
+		$outputlangs = new Translate("",$conf);
+		$outputlangs->setDefaultLang($newlang);
+	}
+	fichinter_create($db, $object, $object->modelpdf, $outputlangs);
+	header('Location: '.$_SERVER["PHP_SELF"].'?id='.$object->id.'#'.GETPOST('line_id','int'));
+	exit;
+}
+
+
+/*
+ * Add file in email form
+*/
+if (GETPOST('addfile','alpha'))
+{
+	require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
+
+	// Set tmp user directory TODO Use a dedicated directory for temp mails files
+	$vardir=$conf->user->dir_output."/".$user->id;
+	$upload_dir_tmp = $vardir.'/temp';
+
+	dol_add_file_process($upload_dir_tmp,0,0);
+	$action='presend';
+}
+
+/*
+ * Remove file in email form
+*/
+if (GETPOST('removedfile','alpha'))
+{
+	require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
+
+	// Set tmp user directory
+	$vardir=$conf->user->dir_output."/".$user->id;
+	$upload_dir_tmp = $vardir.'/temp';
+
+	// TODO Delete only files that was uploaded from email form
+	dol_remove_file_process(GETPOST('removedfile','alpha'),0);
+	$action='presend';
+}
+
+/*
+ * Send mail
+*/
+if ($action == 'send' && ! GETPOST('cancel','alpha') && (empty($conf->global->MAIN_USE_ADVANCED_PERMS) || $user->rights->ficheinter->ficheinter_advance->send))
+{
+	$langs->load('mails');
+
+	if ($object->fetch($id) > 0)
+	{
+        $object->fetch_thirdparty();
+
+		if (GETPOST('sendto','alpha'))
+		{
+			// Le destinataire a ete fourni via le champ libre
+			$sendto = GETPOST('sendto','alpha');
+			$sendtoid = 0;
+		}
+		elseif (GETPOST('receiver','alpha') != '-1')
+		{
+			// Recipient was provided from combo list
+			if (GETPOST('receiver','alpha') == 'thirdparty') // Id of third party
+			{
+				$sendto = $object->client->email;
+				$sendtoid = 0;
+			}
+			else    // Id du contact
+			{
+				$sendto = $object->client->contact_get_property(GETPOST('receiver'),'email');
+				$sendtoid = GETPOST('receiver','alpha');
+			}
+		}
+
+		if (dol_strlen($sendto))
+		{
+			$langs->load("commercial");
+
+			$from				= GETPOST('fromname','alpha') . ' <' . GETPOST('frommail','alpha') .'>';
+			$replyto			= GETPOST('replytoname','alpha'). ' <' . GETPOST('replytomail','alpha').'>';
+			$message			= GETPOST('message');
+			$sendtocc			= GETPOST('sendtocc','alpha');
+			$deliveryreceipt	= GETPOST('deliveryreceipt','alpha');
+
+			if ($action == 'send')
+			{
+				if (strlen(GETPOST('subject','alphs'))) $subject = GETPOST('subject','alpha');
+				else $subject = $langs->transnoentities('Intervention').' '.$object->ref;
+				$actiontypecode='AC_OTH_AUTO';
+				$actionmsg = $langs->transnoentities('MailSentBy').' '.$from.' '.$langs->transnoentities('To').' '.$sendto.".\n";
+				if ($message)
+				{
+					$actionmsg.=$langs->transnoentities('MailTopic').": ".$subject."\n";
+					$actionmsg.=$langs->transnoentities('TextUsedInTheMessageBody').":\n";
+					$actionmsg.=$message;
+				}
+				$actionmsg2=$langs->transnoentities('Action'.$actiontypecode);
+			}
+
+			// Create form object
+			include_once DOL_DOCUMENT_ROOT.'/core/class/html.formmail.class.php';
+			$formmail = new FormMail($db);
+
+			$attachedfiles=$formmail->get_attached_files();
+			$filepath = $attachedfiles['paths'];
+			$filename = $attachedfiles['names'];
+			$mimetype = $attachedfiles['mimes'];
+
+			// Envoi de la propal
+			require_once DOL_DOCUMENT_ROOT.'/core/class/CMailFile.class.php';
+			$mailfile = new CMailFile($subject,$sendto,$from,$message,$filepath,$mimetype,$filename,$sendtocc,'',$deliveryreceipt,-1);
+			if ($mailfile->error)
+			{
+				$mesg='<div class="error">'.$mailfile->error.'</div>';
+			}
+			else
+			{
+				$result=$mailfile->sendfile();
+				if ($result)
+				{
+					$mesg=$langs->trans('MailSuccessfulySent',$mailfile->getValidAddress($from,2),$mailfile->getValidAddress($sendto,2));
+					setEventMessage($mesg);
+					$error=0;
+
+					// Initialisation donnees
+					$object->sendtoid		= $sendtoid;
+					$object->actiontypecode	= $actiontypecode;
+					$object->actionmsg 		= $actionmsg;
+					$object->actionmsg2		= $actionmsg2;
+					$object->fk_element		= $object->id;
+					$object->elementtype	= $object->element;
+
+                    // Appel des triggers
+                    include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
+                    $interface=new Interfaces($db);
+                    $result=$interface->run_triggers('FICHINTER_SENTBYMAIL',$object,$user,$langs,$conf);
+					if ($result < 0) {
+						$error++; $this->errors=$interface->errors;
+					}
+                    // Fin appel triggers
+
+                        if ($error)
+                        {
+                            dol_print_error($db);
+                        }
+                        else
+                        {
+                            // Redirect here
+                            // This avoid sending mail twice if going out and then back to page
+                            header('Location: '.$_SERVER["PHP_SELF"].'?id='.$object->id);
+                            exit;
+                        }
+                    }
+                    else
+                    {
+                        $langs->load("other");
+                        $mesg='<div class="error">';
+                        if ($mailfile->error)
+                        {
+                            $mesg.=$langs->trans('ErrorFailedToSendMail',$from,$sendto);
+                            $mesg.='<br>'.$mailfile->error;
+                        }
+                        else
+                        {
+                            $mesg.='No mail sent. Feature is disabled by option MAIN_DISABLE_ALL_MAILS';
+                        }
+                        $mesg.='</div>';
+                    }
+                }
+            }
+            else
+            {
+                $langs->load("other");
+                $mesg='<div class="error">'.$langs->trans('ErrorMailRecipientIsEmpty').' !</div>';
+                dol_syslog('Recipient email is empty');
+            }
+    }
+    else
+    {
+        $langs->load("other");
+        $mesg='<div class="error">'.$langs->trans('ErrorFailedToReadEntity',$langs->trans("Intervention")).'</div>';
+        dol_syslog('Impossible de lire les donnees de l\'intervention. Le fichier intervention n\'a peut-etre pas ete genere.');
+    }
+
+    $action='presend';
+}
+
+else if ($action == 'update_extras')
+{
+	$object->fetch($id);
+	// Fill array 'array_options' with data from update form
+	$extralabels=$extrafields->fetch_name_optionals_label($object->table_element);
+	$ret = $extrafields->setOptionalsFromPost($extralabels,$object);
+
+	// Actions on extra fields (by external module or standard code)
+	// FIXME le hook fait double emploi avec le trigger !!
+	$hookmanager->initHooks(array('interventiondao'));
+	$parameters=array('id'=>$object->id);
+	$reshook=$hookmanager->executeHooks('insertExtraFields',$parameters,$object,$action);    // Note that $action and $object may have been modified by some hooks
+	if (empty($reshook))
+	{
+		if (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED)) // For avoid conflicts if trigger used
+		{
+			$result=$object->insertExtraFields();
+			if ($result < 0)
+			{
+				$error++;
+			}
+		}
+	}
+	else if ($reshook < 0) $error++;
+}
+
+if (! empty($conf->global->MAIN_DISABLE_CONTACTS_TAB) && $user->rights->ficheinter->creer)
+{
+	if ($action == 'addcontact')
+	{
+		$result = $object->fetch($id);
+
+		if ($result > 0 && $id > 0)
+		{
+			$contactid = (GETPOST('userid','int') ? GETPOST('userid','int') : GETPOST('contactid','int'));
+			$result = $object->add_contact($contactid, GETPOST('type','int'), GETPOST('source','alpha'));
+		}
+
+		if ($result >= 0)
+		{
+			header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
+			exit;
+		}
+		else
+		{
+			if ($object->error == 'DB_ERROR_RECORD_ALREADY_EXISTS')
+			{
+				$langs->load("errors");
+				$mesg = '<div class="error">'.$langs->trans("ErrorThisContactIsAlreadyDefinedAsThisType").'</div>';
+			}
+			else
+			{
+				$mesg = '<div class="error">'.$object->error.'</div>';
+			}
+		}
+	}
+
+	// bascule du statut d'un contact
+	else if ($action == 'swapstatut')
+	{
+		if ($object->fetch($id))
+		{
+			$result=$object->swapContactStatus(GETPOST('ligne','int'));
+		}
+		else
+		{
+			dol_print_error($db);
+		}
+	}
+
+	// Efface un contact
+	else if ($action == 'deletecontact')
+	{
+		$object->fetch($id);
+		$result = $object->delete_contact(GETPOST('lineid','int'));
+
+		if ($result >= 0)
+		{
+			header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
+			exit;
+		}
+		else {
+			dol_print_error($db);
+		}
+	}
+}
+
+
+/*
+ * View
+*/
+
+$form = new Form($db);
+$formfile = new FormFile($db);
+
+llxHeader();
+
+if ($action == 'create')
+{
+	/*
+	 * Mode creation
+	* Creation d'une nouvelle fiche d'intervention
+	*/
+
+	$soc=new Societe($db);
+
+	print_fiche_titre($langs->trans("AddIntervention"));
+
+	dol_htmloutput_mesg($mesg);
+
+	if ($socid) $res=$soc->fetch($socid);
+
+	if (GETPOST('origin') && GETPOST('originid'))
+	{
+		// Parse element/subelement (ex: project_task)
+		$element = $subelement = GETPOST('origin');
+		if (preg_match('/^([^_]+)_([^_]+)/i',GETPOST('origin'),$regs))
+		{
+			$element = $regs[1];
+			$subelement = $regs[2];
+		}
+
+        if ($element == 'project')
+        {
+            $projectid=GETPOST('originid');
+        }
+        else
+		{
+            // For compatibility
+			if ($element == 'order' || $element == 'commande')    {
+				$element = $subelement = 'commande';
+			}
+			if ($element == 'propal')   {
+				$element = 'comm/propal'; $subelement = 'propal';
+			}
+			if ($element == 'contract') {
+				$element = $subelement = 'contrat';
+			}
+
+			dol_include_once('/'.$element.'/class/'.$subelement.'.class.php');
+
+			$classname = ucfirst($subelement);
+			$objectsrc = new $classname($db);
+			$objectsrc->fetch(GETPOST('originid'));
+			if (empty($objectsrc->lines) && method_exists($objectsrc,'fetch_lines'))  $objectsrc->fetch_lines();
+			$objectsrc->fetch_thirdparty();
+
+			$projectid          = (!empty($objectsrc->fk_project)?$objectsrc->fk_project:'');
+
+			$soc = $objectsrc->client;
+
+			$note_private		= (! empty($objectsrc->note) ? $objectsrc->note : (! empty($objectsrc->note_private) ? $objectsrc->note_private : ''));
+			$note_public		= (! empty($objectsrc->note_public) ? $objectsrc->note_public : '');
+
+			// Object source contacts list
+			$srccontactslist = $objectsrc->liste_contact(-1,'external',1);
+		}
+	}
+	else {
+		$projectid = GETPOST('projectid','int');
+		$note_private = '';
+		$note_public = '';
+	}
+
+	if (! $conf->global->FICHEINTER_ADDON)
+	{
+		dol_print_error($db,$langs->trans("Error")." ".$langs->trans("Error_FICHEINTER_ADDON_NotDefined"));
+		exit;
+	}
+
+	$object->date = dol_now();
+
+	$obj = $conf->global->FICHEINTER_ADDON;
+	$obj = "mod_".$obj;
+
+	//$modFicheinter = new $obj;
+	//$numpr = $modFicheinter->getNextValue($soc, $object);
+
+	if ($socid > 0)
+	{
+		$soc->fetch($socid);
+
+		print '<form name="fichinter" action="'.$_SERVER['PHP_SELF'].'" method="POST">';
+		print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+
+		print '<table class="border" width="100%">';
+
+		print '<input type="hidden" name="socid" value='.$soc->id.'>';
+		print '<tr><td class="fieldrequired">'.$langs->trans("ThirdParty").'</td><td>'.$soc->getNomUrl(1).'</td></tr>';
+
+		print '<input type="hidden" name="action" value="add">';
+
+		// Ref
+		print '<tr><td class="fieldrequired">'.$langs->trans('Ref').'</td><td colspan="2">'.$langs->trans("Draft").'</td></tr>';
+
+		// Description (must be a textarea and not html must be allowed (used in list view)
+		print '<tr><td valign="top">'.$langs->trans("Description").'</td>';
+		print '<td>';
+		print '<textarea name="description" cols="80" rows="'.ROWS_3.'"></textarea>';
+		print '</td></tr>';
+
+		// Project
+		if (! empty($conf->projet->enabled))
+		{
+			$langs->load("project");
+
+            print '<tr><td valign="top">'.$langs->trans("Project").'</td><td>';
+            /* Fix: If a project must be linked to any companies (suppliers or not), project must be not be set as limited to customer but must be not linked to any particular thirdparty
+            if ($societe->fournisseur==1)
+            	$numprojet=select_projects(-1,$_POST["projectid"],'projectid');
+            else
+            	$numprojet=select_projects($societe->id,$_POST["projectid"],'projectid');
+            	*/
+            $numprojet=select_projects($soc->id,GETPOST('projectid','int'),'projectid');
+            if ($numprojet==0)
+            {
+                print ' &nbsp; <a href="'.DOL_DOCUMENT_ROOT.'/projet/fiche.php?socid='.$soc->id.'&action=create">'.$langs->trans("AddProject").'</a>';
+            }
+            print '</td></tr>';
+        }
+
+	// Contrat
+	if ($conf->contrat->enabled)
+	{
+		$langs->load("contrat");
+		print '<tr><td valign="top">'.$langs->trans("Contrat").'</td><td>';
+		$numcontrat=select_contrats($soc->id,GETPOST('contratid','int'),'contratid');
+		if ($numcontrat==0)
+		{
+			print ' &nbsp; <a href="'.DOL_URL_ROOT.'/contrat/fiche.php?socid='.$soc->id.'&action=create">'.$langs->trans("AddContract").'</a>';
+		}
+		print '</td></tr>';
+	}
+
+        // Model
+        print '<tr>';
+        print '<td>'.$langs->trans("DefaultModel").'</td>';
+        print '<td colspan="2">';
+        $liste=ModelePDFFicheinter::liste_modeles($db);
+        print $form->selectarray('model',$liste,$conf->global->FICHEINTER_ADDON_PDF);
+        print "</td></tr>";
+
+        // Public note
+        print '<tr>';
+        print '<td class="border" valign="top">'.$langs->trans('NotePublic').'</td>';
+        print '<td valign="top" colspan="2">';
+        $doleditor = new DolEditor('note_public', $note_public, '', 80, 'dolibarr_notes', 'In', 0, false, true, ROWS_3, 70);
+        print $doleditor->Create(1);
+        //print '<textarea name="note_public" cols="80" rows="'.ROWS_3.'">'.$note_public.'</textarea>';
+        print '</td></tr>';
+
+        // Private note
+        if (!empty($user->societe_id))
+        {
+        	print '<tr>';
+        	print '<td class="border" valign="top">'.$langs->trans('NotePrivate').'</td>';
+        	print '<td valign="top" colspan="2">';
+        	$doleditor = new DolEditor('note_private', $note_private, '', 80, 'dolibarr_notes', 'In', 0, false, true, ROWS_3, 70);
+        	print $doleditor->Create(1);
+        	//print '<textarea name="note_private" cols="80" rows="'.ROWS_3.'">'.$note_private.'</textarea>';
+        	print '</td></tr>';
+        }
+
+        // Other attributes
+        $parameters=array('colspan' => ' colspan="2"');
+        $reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$object,$action);    // Note that $action and $object may have been modified by hook
+		if (empty($reshook) && ! empty($extrafields->attribute_label))
+		{
+			print $object->showOptionals($extrafields,'edit');
+		}
+
+
+        // Show link to origin object
+        if (! empty($origin) && ! empty($originid) && is_object($objectsrc))
+        {
+        	$newclassname=$classname;
+        	if ($newclassname=='Propal') $newclassname='CommercialProposal';
+        	print '<tr><td>'.$langs->trans($newclassname).'</td><td colspan="2">'.$objectsrc->getNomUrl(1).'</td></tr>';
+        }
+
+        print '</table>';
+
+	    if (is_object($objectsrc))
+	    {
+	        print '<input type="hidden" name="origin"         value="'.$objectsrc->element.'">';
+	        print '<input type="hidden" name="originid"       value="'.$objectsrc->id.'">';
+		}
+
+		// Model
+		print '<tr>';
+		print '<td>'.$langs->trans("DefaultModel").'</td>';
+		print '<td colspan="2">';
+		$liste=ModelePDFFicheinter::liste_modeles($db);
+		print $form->selectarray('model',$liste,$conf->global->FICHEINTER_ADDON_PDF);
+		print "</td></tr>";
+
+		// Public note
+		print '<tr>';
+		print '<td class="border" valign="top">'.$langs->trans('NotePublic').'</td>';
+		print '<td valign="top" colspan="2">';
+		$doleditor = new DolEditor('note_public', $note_public, '', 80, 'dolibarr_notes', 'In', 0, false, true, ROWS_3, 70);
+		print $doleditor->Create(1);
+		//print '<textarea name="note_public" cols="80" rows="'.ROWS_3.'">'.$note_public.'</textarea>';
+		print '</td></tr>';
+
+		// Private note
+		if (!empty($user->societe_id))
+		{
+			print '<tr>';
+			print '<td class="border" valign="top">'.$langs->trans('NotePrivate').'</td>';
+			print '<td valign="top" colspan="2">';
+			$doleditor = new DolEditor('note_private', $note_private, '', 80, 'dolibarr_notes', 'In', 0, false, true, ROWS_3, 70);
+			print $doleditor->Create(1);
+			//print '<textarea name="note_private" cols="80" rows="'.ROWS_3.'">'.$note_private.'</textarea>';
+			print '</td></tr>';
+		}
+
+		// Other attributes
+		$parameters=array('colspan' => ' colspan="2"');
+		$reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$object,$action);    // Note that $action and $object may have been modified by hook
+
+
+		// Show link to origin object
+		if (! empty($origin) && ! empty($originid) && is_object($objectsrc))
+		{
+			$newclassname=$classname;
+			if ($newclassname=='Propal') $newclassname='CommercialProposal';
+			print '<tr><td>'.$langs->trans($newclassname).'</td><td colspan="2">'.$objectsrc->getNomUrl(1).'</td></tr>';
+		}
+
+		print '</table>';
+
+		if (is_object($objectsrc))
+		{
+			print '<input type="hidden" name="origin"         value="'.$objectsrc->element.'">';
+			print '<input type="hidden" name="originid"       value="'.$objectsrc->id.'">';
+		}
+
+		print '<center><br>';
+		print '<input type="submit" class="button" value="'.$langs->trans("CreateDraftIntervention").'">';
+		print '</center>';
+
+		print '</form>';
+	}
+	else
+	{
+		print '<form name="fichinter" action="'.$_SERVER['PHP_SELF'].'" method="POST">';
+		print '<table class="border" width="100%">';
+		print '<tr><td class="fieldrequired">'.$langs->trans("ThirdParty").'</td><td>';
+		print $form->select_company('','socid','',1,1);
+		print '</td></tr>';
+		print '</table>';
+
+		print '<br><center>';
+		print '<input type="hidden" name="action" value="create">';
+		print '<input type="submit" class="button" value="'.$langs->trans("CreateDraftIntervention").'">';
+		print '</center>';
+
+		print '</form>';
+	}
+
+}
+else if ($id > 0 || ! empty($ref))
+{
+	/*
+	 * Affichage en mode visu
+	*/
+
+	$object->fetch($id, $ref);
+	$object->fetch_thirdparty();
+
+	$soc=new Societe($db);
+	$soc->fetch($object->socid);
+
+	dol_htmloutput_mesg($mesg);
+
+	$head = fichinter_prepare_head($object);
+
+	dol_fiche_head($head, 'card', $langs->trans("InterventionCard"), 0, 'intervention');
+
+	// Confirmation de la suppression de la fiche d'intervention
+	if ($action == 'delete')
+	{
+		$ret=$form->form_confirm($_SERVER["PHP_SELF"].'?id='.$object->id, $langs->trans('DeleteIntervention'), $langs->trans('ConfirmDeleteIntervention'), 'confirm_delete','',0,1);
+		if ($ret == 'html') print '<br>';
+	}
+
+	// Confirmation validation
+	if ($action == 'validate')
+	{
+		// on verifie si l'objet est en numerotation provisoire
+		$ref = substr($object->ref, 1, 4);
+		if ($ref == 'PROV')
+		{
+			$numref = $object->getNextNumRef($soc);
+			if (empty($numref))
+			{
+				$error++;
+				dol_htmloutput_errors($object->error);
+			}
+		}
+		else
+		{
+			$numref = $object->ref;
+		}
+		$text=$langs->trans('ConfirmValidateIntervention',$numref);
+
+		$ret=$form->form_confirm($_SERVER["PHP_SELF"].'?id='.$object->id, $langs->trans('ValidateIntervention'), $text, 'confirm_validate','',0,1);
+		if ($ret == 'html') print '<br>';
+	}
+
+	// Confirmation de la validation de la fiche d'intervention
+	if ($action == 'modify')
+	{
+		$ret=$form->form_confirm($_SERVER["PHP_SELF"].'?id='.$object->id, $langs->trans('ModifyIntervention'), $langs->trans('ConfirmModifyIntervention'), 'confirm_modify','',0,1);
+		if ($ret == 'html') print '<br>';
+	}
+
+	// Confirmation de la suppression d'une ligne d'intervention
+	if ($action == 'ask_deleteline')
+	{
+		$ret=$form->form_confirm($_SERVER["PHP_SELF"].'?id='.$object->id.'&line_id='.GETPOST('line_id','int'), $langs->trans('DeleteInterventionLine'), $langs->trans('ConfirmDeleteInterventionLine'), 'confirm_deleteline','',0,1);
+		if ($ret == 'html') print '<br>';
+	}
+
+	print '<table class="border" width="100%">';
+
+	$linkback = '<a href="'.DOL_URL_ROOT.'/fichinter/list.php'.(! empty($socid)?'?socid='.$socid:'').'">'.$langs->trans("BackToList").'</a>';
+
+	// Ref
+	print '<tr><td width="25%">'.$langs->trans("Ref").'</td><td>';
+	print $form->showrefnav($object, 'ref', $linkback, 1, 'ref', 'ref');
+	print '</td></tr>';
+
+	// Third party
+	print "<tr><td>".$langs->trans("Company")."</td><td>".$object->client->getNomUrl(1)."</td></tr>";
+
+	// Duration
+	print '<tr><td>'.$langs->trans("TotalDuration").'</td>';
+	print '<td>'.convertSecondToTime($object->duree, 'all', $conf->global->MAIN_DURATION_OF_WORKDAY).'</td>';
+	print '</tr>';
+
+	// Description (must be a textarea and not html must be allowed (used in list view)
+	print '<tr><td valign="top">';
+	print $form->editfieldkey("Description",'description',$object->description,$object,$user->rights->ficheinter->creer,'textarea');
+	print '</td><td colspan="3">';
+	print $form->editfieldval("Description",'description',$object->description,$object,$user->rights->ficheinter->creer,'textarea:8:80');
+	print '</td>';
+	print '</tr>';
+
+	// Project
+	if (! empty($conf->projet->enabled))
+	{
+		$langs->load('projects');
+		print '<tr>';
+		print '<td>';
+
+		print '<table class="nobordernopadding" width="100%"><tr><td>';
+		print $langs->trans('Project');
+		print '</td>';
+		if ($action != 'classify')
+		{
+			print '<td align="right"><a href="'.$_SERVER["PHP_SELF"].'?action=classify&amp;id='.$object->id.'">';
+			print img_edit($langs->trans('SetProject'),1);
+			print '</a></td>';
+		}
+		print '</tr></table>';
+		print '</td><td colspan="3">';
+		if ($action == 'classify')
+		{
+			$form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, $object->socid, $object->fk_project,'projectid');
+		}
+		else
+		{
+			$form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, $object->socid, $object->fk_project,'none');
+		}
+		print '</td>';
+		print '</tr>';
+	}
+
+	// Contrat
+	if ($conf->contrat->enabled)
+	{
+		$langs->load('contrat');
+		print '<tr>';
+		print '<td>';
+
+		print '<table class="nobordernopadding" width="100%"><tr><td>';
+		print $langs->trans('Contract');
+		print '</td>';
+		if ($action != 'contrat')
+		{
+			print '<td align="right"><a href="'.$_SERVER["PHP_SELF"].'?action=contrat&amp;id='.$object->id.'">';
+			print img_edit($langs->trans('SetContrat'),1);
+			print '</a></td>';
+		}
+		print '</tr></table>';
+		print '</td><td colspan="3">';
+		if ($action == 'contrat')
+		{
+			print '<form method="post" action="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'">';
+			print '<input type="hidden" name="action" value="setcontrat">';
+			print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+			print '<table class="nobordernopadding" cellpadding="0" cellspacing="0">';
+			print '<tr><td>';
+			//print "$socid,$selected,$htmlname";
+			select_contrats($object->socid,$object->fk_contrat,'contratid');
+			print '</td>';
+			print '<td align="left"><input type="submit" class="button" value="'.$langs->trans("Modify").'"></td>';
+			print '</tr></table></form>';
+		}
+		else
+		{
+			if ($object->fk_contrat)
+            {
+                $contratstatic = new Contrat($db);
+                $contratstatic->fetch($object->fk_contrat);
+                //print '<a href="'.DOL_URL_ROOT.'/projet/fiche.php?id='.$selected.'">'.$projet->title.'</a>';
+                print $contratstatic->getNomUrl(0,'',1);
+            }
+            else
+            {
+                print "&nbsp;";
+            }
+		}
+		print '</td>';
+		print '</tr>';
+	}
+	
+	// Statut
+	print '<tr><td>'.$langs->trans("Status").'</td><td>'.$object->getLibStatut(4).'</td></tr>';
+
+    // Other attributes
+    $parameters=array('colspan' => ' colspan="3"');
+    $reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$object,$action);    // Note that $action and $object may have been modified by hook
+	if (empty($reshook) && ! empty($extrafields->attribute_label))
+	{
+		if ($action == 'edit_extras')
+		{
+			print '<form enctype="multipart/form-data" action="'.$_SERVER["PHP_SELF"].'" method="post" name="formfichinter">';
+			print '<input type="hidden" name="action" value="update_extras">';
+			print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+			print '<input type="hidden" name="id" value="'.$object->id.'">';
+		}
+
+		foreach($extrafields->attribute_label as $key=>$label)
+		{
+			if ($action == 'edit_extras') {
+				$value=(isset($_POST["options_".$key])?$_POST["options_".$key]:$object->array_options["options_".$key]);
+			} else {
+				$value=$object->array_options["options_".$key];
+			}
+			if ($extrafields->attribute_type[$key] == 'separate')
+			{
+				print $extrafields->showSeparator($key);
+			}
+			else
+			{
+				print '<tr><td';
+				if (! empty($extrafields->attribute_required[$key])) print ' class="fieldrequired"';
+				print '>'.$label.'</td><td colspan="3">';
+				// Convert date into timestamp format
+				if (in_array($extrafields->attribute_type[$key],array('date','datetime')))
+				{
+					$value = isset($_POST["options_".$key])?dol_mktime($_POST["options_".$key."hour"], $_POST["options_".$key."min"], 0, $_POST["options_".$key."month"], $_POST["options_".$key."day"], $_POST["options_".$key."year"]):$db->jdate($object->array_options['options_'.$key]);
+				}
+				if ($action == 'edit_extras' && $user->rights->ficheinter->creer)
+				{
+					print $extrafields->showInputField($key,$value);
+				}
+				else
+				{
+					print $extrafields->showOutputField($key,$value);
+				}
+				print '</td></tr>'."\n";
+			}
+		}
+
+		if(count($extrafields->attribute_label) > 0) {
+
+			if ($action == 'edit_extras' && $user->rights->ficheinter->creer)
+			{
+				print '<tr><td></td><td colspan="3">';
+				print '<input type="submit" class="button" value="'.$langs->trans('Modify').'">';
+				print '</form>';
+				print '</td></tr>';
+
+			}
+			else {
+				if ($object->statut == 0 && $user->rights->ficheinter->creer)
+				{
+					print '<tr><td></td><td><a href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&action=edit_extras">'.img_picto('','edit').' '.$langs->trans('Modify').'</a></td></tr>';
+				}
+			}
+		}
+	}
+
+	print "</table><br>";
+
+	if (! empty($conf->global->MAIN_DISABLE_CONTACTS_TAB))
+	{
+		$blocname = 'contacts';
+		$title = $langs->trans('ContactsAddresses');
+		include DOL_DOCUMENT_ROOT.'/core/tpl/bloc_showhide.tpl.php';
+	}
+
+	if (! empty($conf->global->MAIN_DISABLE_NOTES_TAB))
+	{
+		$blocname = 'notes';
+		$title = $langs->trans('Notes');
+		include DOL_DOCUMENT_ROOT.'/core/tpl/bloc_showhide.tpl.php';
+	}
+
+	/*
+	 * Lignes d'intervention
+	*/
+	$sql = 'SELECT ft.rowid, ft.description, ft.fk_fichinter, ft.duree, ft.rang,';
+	$sql.= ' ft.date as date_intervention';
+	$sql.= ' FROM '.MAIN_DB_PREFIX.'fichinterdet as ft';
+	$sql.= ' WHERE ft.fk_fichinter = '.$object->id;
+	$sql.= ' ORDER BY ft.rang ASC, ft.rowid';
+
+	$resql = $db->query($sql);
+	if ($resql)
+	{
+		$num = $db->num_rows($resql);
+		$i = 0;
+
+		if ($num)
+		{
+			print '<table class="noborder" width="100%">';
+
+			print '<tr class="liste_titre">';
+			print '<td>'.$langs->trans('Description').'</td>';
+			print '<td align="center">'.$langs->trans('Date').'</td>';
+			print '<td align="right">'.$langs->trans('Duration').'</td>';
+			print '<td width="48" colspan="3">&nbsp;</td>';
+			print "</tr>\n";
+		}
+		$var=true;
+		while ($i < $num)
+		{
+			$objp = $db->fetch_object($resql);
+			$var=!$var;
+
+			// Ligne en mode visu
+			if ($action != 'editline' || GETPOST('line_id','int') != $objp->rowid)
+			{
+				print '<tr '.$bc[$var].'>';
+				print '<td>';
+				print '<a name="'.$objp->rowid.'"></a>'; // ancre pour retourner sur la ligne
+				print dol_htmlentitiesbr($objp->description);
+
+				// Date
+				print '<td align="center" width="150">'.dol_print_date($db->jdate($objp->date_intervention),'dayhour').'</td>';
+
+				// Duration
+				print '<td align="right" width="150">'.convertSecondToTime($objp->duree).'</td>';
+
+				print "</td>\n";
+
+
+				// Icone d'edition et suppression
+				if ($object->statut == 0  && $user->rights->ficheinter->creer)
+				{
+					print '<td align="center">';
+					print '<a href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=editline&amp;line_id='.$objp->rowid.'#'.$objp->rowid.'">';
+					print img_edit();
+					print '</a>';
+					print '</td>';
+					print '<td align="center">';
+					print '<a href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=ask_deleteline&amp;line_id='.$objp->rowid.'">';
+					print img_delete();
+					print '</a></td>';
+					if ($num > 1)
+					{
+						print '<td align="center">';
+						if ($i > 0)
+						{
+							print '<a href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=up&amp;line_id='.$objp->rowid.'">';
+							print img_up();
+							print '</a>';
+						}
+						if ($i < $num-1)
+						{
+							print '<a href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=down&amp;line_id='.$objp->rowid.'">';
+							print img_down();
+							print '</a>';
+						}
+						print '</td>';
+					}
+				}
+				else
+				{
+					print '<td colspan="3">&nbsp;</td>';
+				}
+
+				print '</tr>';
+			}
+
+			// Ligne en mode update
+			if ($object->statut == 0 && $action == 'editline' && $user->rights->ficheinter->creer && GETPOST('line_id','int') == $objp->rowid)
+			{
+				print '<form action="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'#'.$objp->rowid.'" method="post">';
+				print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+				print '<input type="hidden" name="action" value="updateline">';
+				print '<input type="hidden" name="id" value="'.$object->id.'">';
+				print '<input type="hidden" name="line_id" value="'.GETPOST('line_id','int').'">';
+				print '<tr '.$bc[$var].'>';
+				print '<td>';
+				print '<a name="'.$objp->rowid.'"></a>'; // ancre pour retourner sur la ligne
+
+				// Editeur wysiwyg
+				require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
+				$doleditor=new DolEditor('np_desc',$objp->description,'',164,'dolibarr_details','',false,true,$conf->global->FCKEDITOR_ENABLE_DETAILS,ROWS_2,70);
+				$doleditor->Create();
+				print '</td>';
+
+				// Date d'intervention
+				print '<td align="center" class="nowrap">';
+				$form->select_date($db->jdate($objp->date_intervention),'di',1,1,0,"date_intervention");
+				print '</td>';
+
+				// Duration
+				print '<td align="right">';
+				$form->select_duration('duration',$objp->duree);
+				print '</td>';
+
+				print '<td align="center" colspan="5" valign="center"><input type="submit" class="button" name="save" value="'.$langs->trans("Save").'">';
+				print '<br><input type="submit" class="button" name="cancel" value="'.$langs->trans("Cancel").'"></td>';
+				print '</tr>' . "\n";
+
+				print "</form>\n";
+			}
+
+			$i++;
+		}
+
+		$db->free($resql);
+
+		/*
+		 * Add line
+		*/
+		if ($object->statut == 0 && $user->rights->ficheinter->creer && $action <> 'editline')
+		{
+			if (! $num) print '<br><table class="noborder" width="100%">';
+
+			print '<tr class="liste_titre">';
+			print '<td>';
+			print '<a name="add"></a>'; // ancre
+			print $langs->trans('Description').'</td>';
+			print '<td align="center">'.$langs->trans('Date').'</td>';
+			print '<td align="right">'.$langs->trans('Duration').'</td>';
+
+			print '<td colspan="4">&nbsp;</td>';
+			print "</tr>\n";
+
+			// Ajout ligne d'intervention
+			print '<form action="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'#add" name="addinter" method="post">';
+			print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+			print '<input type="hidden" name="id" value="'.$object->id.'">';
+			print '<input type="hidden" name="action" value="addline">';
+
+			$var=false;
+
+			print '<tr '.$bc[$var].">\n";
+			print '<td>';
+			// editeur wysiwyg
+			require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
+			$doleditor=new DolEditor('np_desc',GETPOST('np_desc','alpha'),'',100,'dolibarr_details','',false,true,$conf->global->FCKEDITOR_ENABLE_DETAILS,ROWS_2,70);
+			$doleditor->Create();
+			print '</td>';
+
+			// Date intervention
+			print '<td align="center" class="nowrap">';
+			$now=dol_now();
+			$timearray=dol_getdate($now);
+			if (!GETPOST('diday','int')) $timewithnohour=dol_mktime(0,0,0,$timearray['mon'],$timearray['mday'],$timearray['year']);
+			else $timewithnohour=dol_mktime(GETPOST('dihour','int'),GETPOST('dimin','int'), 0,GETPOST('dimonth','int'),GETPOST('diday','int'),GETPOST('diyear','int'));
+			$form->select_date($timewithnohour,'di',1,1,0,"addinter");
+			print '</td>';
+
+			// Duration
+			print '<td align="right">';
+			$form->select_duration('duration',(!GETPOST('durationhour','int') && !GETPOST('durationmin','int'))?3600:(60*60*GETPOST('durationhour','int')+60*GETPOST('durationmin','int')));
+			print '</td>';
+
+			print '<td align="center" valign="middle" colspan="4"><input type="submit" class="button" value="'.$langs->trans('Add').'" name="addline"></td>';
+			print '</tr>';
+
+			print '</form>';
+
+			if (! $num) print '</table>';
+		}
+
+		if ($num) print '</table>';
+	}
+	else
+	{
+		dol_print_error($db);
+	}
+
+	print '</div>';
+	print "\n";
+
+
+	/*
+	 * Barre d'actions
+	*/
+	print '<div class="tabsAction">';
+
+	if ($user->societe_id == 0)
+	{
+		if ($action != 'editdescription' && ($action != 'presend'))
+		{
+			// Validate
+			if ($object->statut == 0 && $user->rights->ficheinter->creer && count($object->lines) > 0)
+			{
+				print '<div class="inline-block divButAction"><a class="butAction" href="fiche.php?id='.$object->id.'&action=validate"';
+				print '>'.$langs->trans("Valid").'</a></div>';
+			}
+
+			// Modify
+			if ($object->statut == 1 && $user->rights->ficheinter->creer)
+			{
+				print '<div class="inline-block divButAction"><a class="butAction" href="fiche.php?id='.$object->id.'&action=modify"';
+				print '>'.$langs->trans("Modify").'</a></div>';
+			}
+
+			// Send
+			if ($object->statut > 0)
+			{
+				if (empty($conf->global->MAIN_USE_ADVANCED_PERMS) || $user->rights->ficheinter->ficheinter_advance->send)
+				{
+					print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=presend&amp;mode=init">'.$langs->trans('SendByMail').'</a></div>';
+				}
+				else print '<div class="inline-block divButAction"><a class="butActionRefused" href="#">'.$langs->trans('SendByMail').'</a></div>';
+			}
+
+			// Invoicing
+			if (! empty($conf->facture->enabled) && $object->statut > 0)
+			{
+				$langs->load("bills");
+				if ($object->statut < 2)
+				{
+					if ($user->rights->facture->creer) print '<div class="inline-block divButAction"><a class="butAction" href="'.DOL_URL_ROOT.'/compta/facture.php?action=create&amp;origin='.$object->element.'&amp;originid='.$object->id.'&amp;socid='.$object->socid.'">'.$langs->trans("CreateBill").'</a></div>';
+					else print '<div class="inline-block divButAction"><a class="butActionRefused" href="#" title="'.$langs->trans("NotEnoughPermissions").'">'.$langs->trans("CreateBill").'</a></div>';
+				}
+
+				if (! empty($conf->global->FICHINTER_CLASSIFY_BILLED))
+				{
+					if ($object->statut != 2)
+					{
+						print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=classifybilled">'.$langs->trans("ClassifyBilled").'</a></div>';
+					}
+				}
+			}
+
+			// Delete
+			if (($object->statut == 0 && $user->rights->ficheinter->creer) || $user->rights->ficheinter->supprimer)
+			{
+				print '<div class="inline-block divButAction"><a class="butActionDelete" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=delete"';
+				print '>'.$langs->trans('Delete').'</a></div>';
+			}
+
+		}
+	}
+
+	print '</div>';
+	print '<br>';
+
+	if ($action != 'presend')
+	{
+		print '<div class="fichecenter"><div class="fichehalfleft">';
+		//print '<table width="100%"><tr><td width="50%" valign="top">';
+
+		/*
+		 * Built documents
+		*/
+		$filename=dol_sanitizeFileName($object->ref);
+		$filedir=$conf->ficheinter->dir_output . "/".$object->ref;
+		$urlsource=$_SERVER["PHP_SELF"]."?id=".$object->id;
+		$genallowed=$user->rights->ficheinter->creer;
+		$delallowed=$user->rights->ficheinter->supprimer;
+		$genallowed=1;
+		$delallowed=1;
+
+		$var=true;
+
+		//print "<br>\n";
+		$somethingshown=$formfile->show_documents('ficheinter',$filename,$filedir,$urlsource,$genallowed,$delallowed,$object->modelpdf,1,0,0,28,0,'','','',$soc->default_lang);
+
+		/*
+		 * Linked object block
+		*/
+		$somethingshown=$object->showLinkedObjectBlock();
+
+		//print '</td><td valign="top" width="50%">';
+		print '</div><div class="fichehalfright"><div class="ficheaddleft">';
+
+		// List of actions on element
+		include_once DOL_DOCUMENT_ROOT.'/core/class/html.formactions.class.php';
+		$formactions=new FormActions($db);
+		$somethingshown=$formactions->showactions($object,'fichinter',$socid);
+
+		print '</div></div></div>';
+		//print "</td></tr></table>\n";
+	}
+
+
+	/*
+	 * Action presend
+	*/
+	if ($action == 'presend')
+	{
+		$ref = dol_sanitizeFileName($object->ref);
+		include_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
+		$fileparams = dol_most_recent_file($conf->ficheinter->dir_output . '/' . $ref, preg_quote($ref,'/'));
+		$file=$fileparams['fullname'];
+
+		// Build document if it not exists
+		if (! $file || ! is_readable($file))
+		{
+			// Define output language
+			$outputlangs = $langs;
+			$newlang='';
+			if ($conf->global->MAIN_MULTILANGS && empty($newlang) && ! empty($_REQUEST['lang_id'])) $newlang=$_REQUEST['lang_id'];
+			if ($conf->global->MAIN_MULTILANGS && empty($newlang)) $newlang=$object->client->default_lang;
+			if (! empty($newlang))
+			{
+				$outputlangs = new Translate("",$conf);
+				$outputlangs->setDefaultLang($newlang);
+			}
+
+			$result=fichinter_create($db, $object, GETPOST('model')?GETPOST('model'):$object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref);
+			if ($result <= 0)
+			{
+				dol_print_error($db,$result);
+				exit;
+			}
+			$fileparams = dol_most_recent_file($conf->ficheinter->dir_output . '/' . $ref, preg_quote($ref,'/'));
+			$file=$fileparams['fullname'];
+		}
+
+		print '<br>';
+		print_titre($langs->trans('SendInterventionByMail'));
+
+		// Create form object
+		include_once DOL_DOCUMENT_ROOT.'/core/class/html.formmail.class.php';
+		$formmail = new FormMail($db);
+		$formmail->fromtype = 'user';
+		$formmail->fromid   = $user->id;
+		$formmail->fromname = $user->getFullName($langs);
+		$formmail->frommail = $user->email;
+		$formmail->withfrom=1;
+		$liste=array();
+		foreach ($object->thirdparty->thirdparty_and_contact_email_array(1) as $key=>$value)	$liste[$key]=$value;
+		$formmail->withto=GETPOST("sendto")?GETOST("sendto"):$liste;
+		$formmail->withtocc=$liste;
+		$formmail->withtoccc=$conf->global->MAIN_EMAIL_USECCC;
+		$formmail->withtopic=$langs->trans('SendInterventionRef','__FICHINTERREF__');
+		$formmail->withfile=2;
+		$formmail->withbody=1;
+		$formmail->withdeliveryreceipt=1;
+		$formmail->withcancel=1;
+
+		// Tableau des substitutions
+		$formmail->substit['__FICHINTERREF__']=$object->ref;
+		$formmail->substit['__SIGNATURE__']=$user->signature;
+		$formmail->substit['__PERSONALIZED__']='';
+		$formmail->substit['__CONTACTCIVNAME__']='';
+
+		//Find the good contact adress
+		$custcontact='';
+		$contactarr=array();
+		$contactarr=$object->liste_contact(-1,'external');
+
+		if (is_array($contactarr) && count($contactarr)>0) {
+			foreach($contactarr as $contact) {
+				if ($contact['libelle']==$langs->trans('TypeContact_fichinter_external_CUSTOMER')) {
+					require_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php';
+					$contactstatic=new Contact($db);
+					$contactstatic->fetch($contact['id']);
+					$custcontact=$contactstatic->getFullName($langs,1);
+				}
+			}
+
+			if (!empty($custcontact)) {
+				$formmail->substit['__CONTACTCIVNAME__']=$custcontact;
+			}
+		}
+
+		// Tableau des parametres complementaires
+		$formmail->param['action']='send';
+		$formmail->param['models']='fichinter_send';
+		$formmail->param['fichinter_id']=$object->id;
+		$formmail->param['returnurl']=$_SERVER["PHP_SELF"].'?id='.$object->id;
+
+		// Init list of files
+		if (GETPOST("mode")=='init')
+		{
+			$formmail->clear_attached_files();
+			$formmail->add_attached_files($file,basename($file),dol_mimetype($file));
+		}
+
+		$formmail->show_form();
+
+		print '<br>';
+	}
+}
+
+
+llxFooter();
+
+$db->close();
+?>
diff --git a/htdocs/fourn/class/fournisseur.facture.class.php b/htdocs/fourn/class/fournisseur.facture.class.php
index e3bc1fadb8b..19912e3f58f 100644
--- a/htdocs/fourn/class/fournisseur.facture.class.php
+++ b/htdocs/fourn/class/fournisseur.facture.class.php
@@ -855,42 +855,42 @@ class FactureFournisseur extends CommonInvoice
                 }
             }
 
-            if (! $error)
-            {
-            	$this->oldref = '';
-
-            	// Rename directory if dir was a temporary ref
-            	if (preg_match('/^[\(]?PROV/i', $this->ref))
-            	{
-            		// On renomme repertoire facture ($this->ref = ancienne ref, $num = nouvelle ref)
-            		// afin de ne pas perdre les fichiers attaches
-            		$facref = dol_sanitizeFileName($this->ref);
+            if (! $error)
+            {
+            	$this->oldref = '';
+
+            	// Rename directory if dir was a temporary ref
+            	if (preg_match('/^[\(]?PROV/i', $this->ref))
+            	{
+            		// On renomme repertoire facture ($this->ref = ancienne ref, $num = nouvelle ref)
+            		// afin de ne pas perdre les fichiers attaches
+            		$facref = dol_sanitizeFileName($this->ref);
             		$snumfa = dol_sanitizeFileName($num);
 
-            		$dirsource = $conf->fournisseur->facture->dir_output.'/'.get_exdir($this->id,2).$facref;
+            		$dirsource = $conf->fournisseur->facture->dir_output.'/'.get_exdir($this->id,2).$facref;
             		$dirdest = $conf->fournisseur->facture->dir_output.'/'.get_exdir($this->id,2).$snumfa;
-            		if (file_exists($dirsource))
-            		{
-            			dol_syslog(get_class($this)."::validate rename dir ".$dirsource." into ".$dirdest);
-
-            			if (@rename($dirsource, $dirdest))
-            			{
-            				$this->oldref = $facref;
-
-            				dol_syslog("Rename ok");
-            				// Suppression ancien fichier PDF dans nouveau rep
-            				dol_delete_file($conf->fournisseur->facture->dir_output.'/'.get_exdir($this->id,2).$snumfa.'/'.$facref.'*.*');
-            			}
-            		}
-            	}
+            		if (file_exists($dirsource))
+            		{
+            			dol_syslog(get_class($this)."::validate rename dir ".$dirsource." into ".$dirdest);
+
+            			if (@rename($dirsource, $dirdest))
+            			{
+            				$this->oldref = $facref;
+
+            				dol_syslog("Rename ok");
+            				// Suppression ancien fichier PDF dans nouveau rep
+            				dol_delete_file($conf->fournisseur->facture->dir_output.'/'.get_exdir($this->id,2).$snumfa.'/'.$facref.'*.*');
+            			}
+            		}
+            	}
             }
 
-            // Set new ref and define current statut
-            if (! $error)
-            {
-            	$this->ref = $num;
-            	$this->statut=1;
-            	//$this->date_validation=$now; this is stored into log table
+            // Set new ref and define current statut
+            if (! $error)
+            {
+            	$this->ref = $num;
+            	$this->statut=1;
+            	//$this->date_validation=$now; this is stored into log table
             }
 
             // Triggers call
diff --git a/htdocs/fourn/facture/fiche.php b/htdocs/fourn/facture/fiche.php
index aa9658a9d84..c2dc17f798f 100644
--- a/htdocs/fourn/facture/fiche.php
+++ b/htdocs/fourn/facture/fiche.php
@@ -114,14 +114,14 @@ elseif ($action == 'confirm_valid' && $confirm == 'yes' && $user->rights->fourni
     $object->fetch($id);
     $object->fetch_thirdparty();
 
-    $qualified_for_stock_change=0;
-    if (empty($conf->global->STOCK_SUPPORTS_SERVICES))
-    {
-    	$qualified_for_stock_change=$object->hasProductsOrServices(2);
-    }
-    else
-    {
-    	$qualified_for_stock_change=$object->hasProductsOrServices(1);
+    $qualified_for_stock_change=0;
+    if (empty($conf->global->STOCK_SUPPORTS_SERVICES))
+    {
+    	$qualified_for_stock_change=$object->hasProductsOrServices(2);
+    }
+    else
+    {
+    	$qualified_for_stock_change=$object->hasProductsOrServices(1);
     }
 
     // Check parameters
diff --git a/htdocs/fourn/fiche.php b/htdocs/fourn/fiche.php
index 38ce1e648b3..1af03e83a01 100644
--- a/htdocs/fourn/fiche.php
+++ b/htdocs/fourn/fiche.php
@@ -219,7 +219,7 @@ if ($object->fetch($id))
 	print '</table>';
 
 
-	print '</div><div class="fichehalfright"><div class="ficheaddleft">';
+	print '</div><div class="fichehalfright"><div class="ficheaddleft">';
 	//print '</td><td valign="top" width="50%" class="notopnoleftnoright">';
 
 
diff --git a/htdocs/imports/import.php b/htdocs/imports/import.php
index 65ec397e242..f2681a936f7 100644
--- a/htdocs/imports/import.php
+++ b/htdocs/imports/import.php
@@ -1314,11 +1314,11 @@ if ($step == 5 && $datatoimport)
                 $sourcelinenb++;
                 // Read line and stor it into $arrayrecord
                 $arrayrecord=$obj->import_read_record();
-                if ($arrayrecord === false)
-                {
+                if ($arrayrecord === false)
+                {
 					$arrayofwarnings[$sourcelinenb][0]=array('lib'=>'File has '.$nboflines.' lines. However we reach end of file after record '.$sourcelinenb.'. This may occurs when some records are split onto several lines.','type'=>'EOF_RECORD_ON_SEVERAL_LINES');
-                	$endoffile++;
-                	continue;
+                	$endoffile++;
+                	continue;
                 }
                 if ($excludefirstline && $sourcelinenb == 1) continue;
 
diff --git a/htdocs/imports/index.php b/htdocs/imports/index.php
index ac9e9d645fa..19642c63378 100644
--- a/htdocs/imports/index.php
+++ b/htdocs/imports/index.php
@@ -98,7 +98,7 @@ if (count($import->array_import_code))
 	//}
 }
 print '</center>';
-print '<br>';
+print '<br>';
 
 
 print '</div><div class="fichetwothirdright"><div class="ficheaddleft">';
@@ -137,5 +137,5 @@ print '</div></div></div>';
 
 llxFooter();
 
-$db->close();
+$db->close();
 ?>
diff --git a/htdocs/install/upgrade2.php b/htdocs/install/upgrade2.php
index e477ec3b6a5..280d9c5b746 100644
--- a/htdocs/install/upgrade2.php
+++ b/htdocs/install/upgrade2.php
@@ -335,11 +335,11 @@ if (! GETPOST("action") || preg_match('/upgrade/i',GETPOST('action')))
         $beforeversionarray=explode('.','3.4.9');
         if (versioncompare($versiontoarray,$afterversionarray) >= 0 && versioncompare($versiontoarray,$beforeversionarray) <= 0)
         {
-        	// Reload modules (this must be always and only into last targeted version)
-        	migrate_reload_modules($db,$langs,$conf);
-
-        	// Reload menus (this must be always and only into last targeted version)
-        	migrate_reload_menu($db,$langs,$conf,$versionto);
+        	// Reload modules (this must be always and only into last targeted version)
+        	migrate_reload_modules($db,$langs,$conf);
+
+        	// Reload menus (this must be always and only into last targeted version)
+        	migrate_reload_menu($db,$langs,$conf,$versionto);
         }
 
         print '<tr><td colspan="4"><br>'.$langs->trans("MigrationFinished").'</td></tr>';
@@ -3526,9 +3526,9 @@ function migrate_delete_old_files($db,$langs,$conf)
     DOL_DOCUMENT_ROOT.'/core/menus/smartphone/iphone.lib.php',
     DOL_DOCUMENT_ROOT.'/core/menus/smartphone/iphone_backoffice.php',
     DOL_DOCUMENT_ROOT.'/core/menus/smartphone/iphone_frontoffice.php',
-    DOL_DOCUMENT_ROOT.'/core/menus/standard/auguria_backoffice.php',
-    DOL_DOCUMENT_ROOT.'/core/menus/standard/auguria_frontoffice.php',
-    DOL_DOCUMENT_ROOT.'/core/menus/standard/eldy_backoffice.php',
+    DOL_DOCUMENT_ROOT.'/core/menus/standard/auguria_backoffice.php',
+    DOL_DOCUMENT_ROOT.'/core/menus/standard/auguria_frontoffice.php',
+    DOL_DOCUMENT_ROOT.'/core/menus/standard/eldy_backoffice.php',
     DOL_DOCUMENT_ROOT.'/core/menus/standard/eldy_frontoffice.php',
     DOL_DOCUMENT_ROOT.'/core/modules/mailings/dolibarr_services_expired.modules.php',
     DOL_DOCUMENT_ROOT.'/core/modules/mailings/peche.modules.php',
diff --git a/htdocs/mailmanspip/class/mailmanspip.class.php b/htdocs/mailmanspip/class/mailmanspip.class.php
index 26c9cb3a24b..6d576ee2067 100644
--- a/htdocs/mailmanspip/class/mailmanspip.class.php
+++ b/htdocs/mailmanspip/class/mailmanspip.class.php
@@ -42,8 +42,8 @@ class MailmanSpip
 
     var $mladded_ok;
     var $mladded_ko;
-    var $mlremoved_ok;
-    var $mlremoved_ko;
+    var $mlremoved_ok;
+    var $mlremoved_ko;
 
 
     /**
diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php
index 48169cdfd31..af53c2460e3 100644
--- a/htdocs/main.inc.php
+++ b/htdocs/main.inc.php
@@ -345,17 +345,17 @@ if (! defined('NOLOGIN'))
         // It is not already authenticated and it requests the login / password
         include_once DOL_DOCUMENT_ROOT.'/core/lib/security2.lib.php';
 
-        $dol_dst_observed=GETPOST("dst_observed",3);
-        $dol_dst_first=GETPOST("dst_first",3);
-        $dol_dst_second=GETPOST("dst_second",3);
-        $dol_screenwidth=GETPOST("screenwidth",3);
-        $dol_screenheight=GETPOST("screenheight",3);
-        $dol_hide_topmenu=GETPOST('dol_hide_topmenu',3);
-        $dol_hide_leftmenu=GETPOST('dol_hide_leftmenu',3);
-        $dol_optimize_smallscreen=GETPOST('dol_optimize_smallscreen',3);
-        $dol_no_mouse_hover=GETPOST('dol_no_mouse_hover',3);
-        $dol_use_jmobile=GETPOST('dol_use_jmobile',3);
-        //dol_syslog("POST key=".join(array_keys($_POST),',').' value='.join($_POST,','));
+        $dol_dst_observed=GETPOST("dst_observed",3);
+        $dol_dst_first=GETPOST("dst_first",3);
+        $dol_dst_second=GETPOST("dst_second",3);
+        $dol_screenwidth=GETPOST("screenwidth",3);
+        $dol_screenheight=GETPOST("screenheight",3);
+        $dol_hide_topmenu=GETPOST('dol_hide_topmenu',3);
+        $dol_hide_leftmenu=GETPOST('dol_hide_leftmenu',3);
+        $dol_optimize_smallscreen=GETPOST('dol_optimize_smallscreen',3);
+        $dol_no_mouse_hover=GETPOST('dol_no_mouse_hover',3);
+        $dol_use_jmobile=GETPOST('dol_use_jmobile',3);
+        //dol_syslog("POST key=".join(array_keys($_POST),',').' value='.join($_POST,','));
 
         // If in demo mode, we check we go to home page through the public/demo/index.php page
         if (! empty($dolibarr_main_demo) && $_SERVER['PHP_SELF'] == DOL_URL_ROOT.'/index.php')  // We ask index page
@@ -589,7 +589,7 @@ if (! defined('NOLOGIN'))
         if (! empty($dol_hide_leftmenu))        $_SESSION['dol_hide_leftmenu']=$dol_hide_leftmenu;
         if (! empty($dol_optimize_smallscreen)) $_SESSION['dol_optimize_smallscreen']=$dol_optimize_smallscreen;
         if (! empty($dol_no_mouse_hover))       $_SESSION['dol_no_mouse_hover']=$dol_no_mouse_hover;
-        if (! empty($dol_use_jmobile))          $_SESSION['dol_use_jmobile']=$dol_use_jmobile;
+        if (! empty($dol_use_jmobile))          $_SESSION['dol_use_jmobile']=$dol_use_jmobile;
 
         dol_syslog("This is a new started user session. _SESSION['dol_login']=".$_SESSION["dol_login"]." Session id=".session_id());
 
@@ -680,15 +680,15 @@ if (GETPOST('theme'))
 	$conf->css  = "/theme/".$conf->theme."/style.css.php";
 }
 
-// Set javascript option
-if (! GETPOST('nojs'))   // If javascript was not disabled on URL
-{
-	if (! empty($user->conf->MAIN_DISABLE_JAVASCRIPT))
-	{
-		$conf->use_javascript_ajax=! $user->conf->MAIN_DISABLE_JAVASCRIPT;
-	}
-}
-else $conf->use_javascript_ajax=0;
+// Set javascript option
+if (! GETPOST('nojs'))   // If javascript was not disabled on URL
+{
+	if (! empty($user->conf->MAIN_DISABLE_JAVASCRIPT))
+	{
+		$conf->use_javascript_ajax=! $user->conf->MAIN_DISABLE_JAVASCRIPT;
+	}
+}
+else $conf->use_javascript_ajax=0;
 
 // Set terminal output option
 if (GETPOST('dol_hide_leftmenu') || ! empty($_SESSION['dol_hide_leftmenu']))               $conf->dol_hide_leftmenu=1;
@@ -937,9 +937,9 @@ function top_htmlhead($head, $title='', $disablejs=0, $disablehead=0, $arrayofjs
         print '<meta name="author" content="Dolibarr Development Team">'."\n";
         $favicon=dol_buildpath('/theme/'.$conf->theme.'/img/favicon.ico',1);
         print '<link rel="shortcut icon" type="image/x-icon" href="'.$favicon.'"/>'."\n";
-        if (empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) print '<link rel="top" title="'.$langs->trans("Home").'" href="'.(DOL_URL_ROOT?DOL_URL_ROOT:'/').'">'."\n";
-        if (empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) print '<link rel="copyright" title="GNU General Public License" href="http://www.gnu.org/copyleft/gpl.html#SEC1">'."\n";
-        if (empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) print '<link rel="author" title="Dolibarr Development Team" href="http://www.dolibarr.org">'."\n";
+        if (empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) print '<link rel="top" title="'.$langs->trans("Home").'" href="'.(DOL_URL_ROOT?DOL_URL_ROOT:'/').'">'."\n";
+        if (empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) print '<link rel="copyright" title="GNU General Public License" href="http://www.gnu.org/copyleft/gpl.html#SEC1">'."\n";
+        if (empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) print '<link rel="author" title="Dolibarr Development Team" href="http://www.dolibarr.org">'."\n";
 
         // Displays title
         $appli='Dolibarr';
@@ -980,9 +980,9 @@ function top_htmlhead($head, $title='', $disablejs=0, $disablehead=0, $arrayofjs
             {
             	print '<link rel="stylesheet" type="text/css" href="'.DOL_URL_ROOT.'/includes/jquery/plugins/timepicker/jquery-ui-timepicker-addon.css" />'."\n";
             }
-            // jQuery jMobile
-            if (! empty($conf->global->MAIN_USE_JQUERY_JMOBILE) || defined('REQUIRE_JQUERY_JMOBILE') || ! empty($conf->dol_use_jmobile))
-            {
+            // jQuery jMobile
+            if (! empty($conf->global->MAIN_USE_JQUERY_JMOBILE) || defined('REQUIRE_JQUERY_JMOBILE') || ! empty($conf->dol_use_jmobile))
+            {
             	print '<link rel="stylesheet" type="text/css" href="'.DOL_URL_ROOT.'/includes/jquery/plugins/mobile/jquery.mobile-latest.min.css" />'."\n";
             }
 
@@ -1145,30 +1145,30 @@ function top_htmlhead($head, $title='', $disablejs=0, $disablehead=0, $arrayofjs
             	print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/includes/jquery/plugins/timepicker/jquery-ui-timepicker-addon.js"></script>'."\n";
             	print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/core/js/timepicker.js.php?lang='.$langs->defaultlang.'"></script>'."\n";
             }
-            // jQuery jMobile
-            if (! empty($conf->global->MAIN_USE_JQUERY_JMOBILE) || defined('REQUIRE_JQUERY_JMOBILE') || (! empty($conf->dol_use_jmobile) && $conf->dol_use_jmobile > 0))
+            // jQuery jMobile
+            if (! empty($conf->global->MAIN_USE_JQUERY_JMOBILE) || defined('REQUIRE_JQUERY_JMOBILE') || (! empty($conf->dol_use_jmobile) && $conf->dol_use_jmobile > 0))
             {
             	// Note: We can force not using ajax because cache of jquery does not load js of other pages by setting ajaxEnabled.
             	if (empty($conf->dol_use_jmobile) || $conf->dol_use_jmobile != 2)
             	{
-            		print '<script type="text/javascript">
+            		print '<script type="text/javascript">
 	            		$(document).bind("mobileinit", function(){
            				$.extend(  $.mobile , {
            					autoInitializePage : true,	/* We need this to run jmobile */
            					/* loadingMessage : \'xxxxx\', */
            					touchOverflowEnabled : true,
            					defaultPageTransition : \'none\',
-           					defaultDialogTransition : \'none\',
-           					ajaxEnabled : false			/* old param was ajaxFormsEnabled and ajaxLinksEnabled */
-           					});
-           				});
+           					defaultDialogTransition : \'none\',
+           					ajaxEnabled : false			/* old param was ajaxFormsEnabled and ajaxLinksEnabled */
+           					});
+           				});
             			</script>';
             	}
-            	print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/includes/jquery/plugins/mobile/jquery.mobile-latest.min.js"></script>'."\n";
-            }
+            	print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/includes/jquery/plugins/mobile/jquery.mobile-latest.min.js"></script>'."\n";
+            }
         }
 
-        if (! $disablejs && ! empty($conf->use_javascript_ajax))
+        if (! $disablejs && ! empty($conf->use_javascript_ajax))
         {
             // CKEditor
             if (! empty($conf->fckeditor->enabled) && (empty($conf->global->FCKEDITOR_EDITORNAME) || $conf->global->FCKEDITOR_EDITORNAME == 'ckeditor'))
@@ -1579,19 +1579,19 @@ function left_menu($menu_array_before, $helppagename='', $moresearchform='', $me
 	        print "<!-- End Bookmarks -->\n";
 	    }
 
-	    //Dolibarr version
-	    $doliurl='http://www.dolibarr.org';
-	    $appli='Dolibarr';
-	    if (! empty($conf->global->MAIN_APPLICATION_TITLE)) {
-	    	$appli=$conf->global->MAIN_APPLICATION_TITLE; $doliurl='';
-	    }
-	    $appli.=" ".DOL_VERSION;
-	    print '<div id="blockvmenuhelp" class="blockvmenuhelp">';
-	    if ($doliurl) print '<a class="help" target="_blank" href="'.$doliurl.'">';
-	    print $appli;
-	    if ($doliurl) print '</a>';
-	    print '</div>';
-
+	    //Dolibarr version
+	    $doliurl='http://www.dolibarr.org';
+	    $appli='Dolibarr';
+	    if (! empty($conf->global->MAIN_APPLICATION_TITLE)) {
+	    	$appli=$conf->global->MAIN_APPLICATION_TITLE; $doliurl='';
+	    }
+	    $appli.=" ".DOL_VERSION;
+	    print '<div id="blockvmenuhelp" class="blockvmenuhelp">';
+	    if ($doliurl) print '<a class="help" target="_blank" href="'.$doliurl.'">';
+	    print $appli;
+	    if ($doliurl) print '</a>';
+	    print '</div>';
+
 	    // Link to Dolibarr wiki pages
 	    if ($helppagename && empty($conf->global->MAIN_HELP_DISABLELINK))
 	    {
diff --git a/htdocs/opensurvey/admin/index.php b/htdocs/opensurvey/admin/index.php
index 6ab9c74dc24..d22c3f03cde 100755
--- a/htdocs/opensurvey/admin/index.php
+++ b/htdocs/opensurvey/admin/index.php
@@ -22,14 +22,14 @@
  */
 
 require_once('../../main.inc.php');
-require_once(DOL_DOCUMENT_ROOT."/core/lib/admin.lib.php");
-require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php");
-require_once(DOL_DOCUMENT_ROOT."/opensurvey/fonctions.php");
-
-// Security check
+require_once(DOL_DOCUMENT_ROOT."/core/lib/admin.lib.php");
+require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php");
+require_once(DOL_DOCUMENT_ROOT."/opensurvey/fonctions.php");
+
+// Security check
 if (!$user->admin) accessforbidden();
 
-$langs->load("admin");
+$langs->load("admin");
 $langs->load("other");
 
 
@@ -39,7 +39,7 @@ $langs->load("other");
 
 $langs->load("opensurvey");
 
-llxHeader();
+llxHeader();
 
 $linkback='<a href="'.DOL_URL_ROOT.'/admin/modules.php">'.$langs->trans("BackToModuleList").'</a>';
 print_fiche_titre($langs->trans("OpenSurveyArea"),$linkback,'setup');
@@ -47,16 +47,16 @@ print '<br>';
 
 echo $langs->trans("OpenSurveyNothingToSetup").'<br><br>'."\n";
 
-// Link
-print img_picto('','object_globe.png').' '.$langs->trans("PublicLinkToCreateSurvey").':<br>';
-
-// Define $urlwithroot
-$urlwithouturlroot=preg_replace('/'.preg_quote(DOL_URL_ROOT,'/').'$/i','',trim($dolibarr_main_url_root));
-$urlwithroot=$urlwithouturlroot.DOL_URL_ROOT;		// This is to use external domain name found into config file
-//$urlwithroot=DOL_MAIN_URL_ROOT;					// This is to use same domain name than current
-
-$url=$urlwithouturlroot.dol_buildpath('/opensurvey/public/index.php',1);
-$urllink='<a href="'.$url.'" target="_blank">'.$url.'</a>';
+// Link
+print img_picto('','object_globe.png').' '.$langs->trans("PublicLinkToCreateSurvey").':<br>';
+
+// Define $urlwithroot
+$urlwithouturlroot=preg_replace('/'.preg_quote(DOL_URL_ROOT,'/').'$/i','',trim($dolibarr_main_url_root));
+$urlwithroot=$urlwithouturlroot.DOL_URL_ROOT;		// This is to use external domain name found into config file
+//$urlwithroot=DOL_MAIN_URL_ROOT;					// This is to use same domain name than current
+
+$url=$urlwithouturlroot.dol_buildpath('/opensurvey/public/index.php',1);
+$urllink='<a href="'.$url.'" target="_blank">'.$url.'</a>';
 print $urllink;
 
 
diff --git a/htdocs/opensurvey/adminstuds.php b/htdocs/opensurvey/adminstuds.php
index d3547a4ac51..39d804ee578 100755
--- a/htdocs/opensurvey/adminstuds.php
+++ b/htdocs/opensurvey/adminstuds.php
@@ -15,17 +15,17 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-/**
- *	\file       htdocs/opensurvey/adminstuds.php
- *	\ingroup    opensurvey
- *	\brief      Page to edit survey
+/**
+ *	\file       htdocs/opensurvey/adminstuds.php
+ *	\ingroup    opensurvey
+ *	\brief      Page to edit survey
  */
 
 require_once('../main.inc.php');
 require_once(DOL_DOCUMENT_ROOT."/core/lib/admin.lib.php");
 require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php");
 require_once(DOL_DOCUMENT_ROOT."/opensurvey/class/opensurveysondage.class.php");
-require_once(DOL_DOCUMENT_ROOT."/opensurvey/fonctions.php");
+require_once(DOL_DOCUMENT_ROOT."/opensurvey/fonctions.php");
 
 
 // Security check
@@ -44,14 +44,14 @@ if (GETPOST('sondage'))
 	}
 	else
 	{
-		$numsondageadmin='';
-		$numsondage=GETPOST("sondage",'alpha');
+		$numsondageadmin='';
+		$numsondage=GETPOST("sondage",'alpha');
 	}
 }
 
 $object=new Opensurveysondage($db);
 
-$expiredate=dol_mktime(0, 0, 0, GETPOST('expiremonth'), GETPOST('expireday'), GETPOST('expireyear'));
+$expiredate=dol_mktime(0, 0, 0, GETPOST('expiremonth'), GETPOST('expireday'), GETPOST('expireyear'));
 
 
 
@@ -94,7 +94,7 @@ if ($action == 'update')
 		$object->mail_admin = GETPOST('nouvelleadresse');
 		$object->date_fin = $expiredate;
 		$object->survey_link_visible = GETPOST('survey_link_visible')=='on'?1:0;
-		$object->canedit = GETPOST('canedit')=='on'?1:0;
+		$object->canedit = GETPOST('canedit')=='on'?1:0;
 
 		$res=$object->update($user);
 		if ($res < 0)
@@ -153,13 +153,13 @@ if ($idcomment)
 
 $form=new Form($db);
 
-$result=$object->fetch(0,$numsondage);
-if ($result <= 0)
-{
-	print $langs->trans("ErrorRecordNotFound");
-	llxFooter();
-	exit;
-}
+$result=$object->fetch(0,$numsondage);
+if ($result <= 0)
+{
+	print $langs->trans("ErrorRecordNotFound");
+	llxFooter();
+	exit;
+}
 
 $arrayofjs=array();
 $arrayofcss=array('/opensurvey/css/style.css');
@@ -248,24 +248,24 @@ if ($action == 'edit')
 else print dol_print_email($object->mail_admin);
 print '</td></tr>';
 
-// Can edit other votes
+// Can edit other votes
 print '<tr><td>'.$langs->trans('CanEditVotes').'</td><td colspan="2">';
 if ($action == 'edit')
 {
 	print '<input type="checkbox" name="canedit" size="40"'.($object->canedit?' checked="true"':'').'">';
 }
 else print yn($object->canedit);
-print '</td></tr>';
+print '</td></tr>';
 
-// Expire date
+// Expire date
 print '<tr><td>'.$langs->trans('ExpireDate').'</td><td colspan="2">';
 if ($action == 'edit') print $form->select_date($expiredate?$expiredate:$object->date_fin,'expire');
 else print dol_print_date($object->date_fin,'day');
-print '</td></tr>';
+print '</td></tr>';
 
 
 // Link
-print '<tr><td>'.img_picto('','object_globe.png').' '.$langs->trans("UrlForSurvey",'').'</td><td colspan="2">';
+print '<tr><td>'.img_picto('','object_globe.png').' '.$langs->trans("UrlForSurvey",'').'</td><td colspan="2">';
 
 // Define $urlwithroot
 $urlwithouturlroot=preg_replace('/'.preg_quote(DOL_URL_ROOT,'/').'$/i','',trim($dolibarr_main_url_root));
diff --git a/htdocs/opensurvey/adminstuds_preview.php b/htdocs/opensurvey/adminstuds_preview.php
index 27ca8814774..3e7ba2fd7e3 100755
--- a/htdocs/opensurvey/adminstuds_preview.php
+++ b/htdocs/opensurvey/adminstuds_preview.php
@@ -26,7 +26,7 @@ require_once('../main.inc.php');
 require_once(DOL_DOCUMENT_ROOT."/core/lib/admin.lib.php");
 require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php");
 require_once(DOL_DOCUMENT_ROOT."/opensurvey/class/opensurveysondage.class.php");
-require_once(DOL_DOCUMENT_ROOT."/opensurvey/fonctions.php");
+require_once(DOL_DOCUMENT_ROOT."/opensurvey/fonctions.php");
 
 
 // Security check
@@ -39,7 +39,7 @@ $numsondageadmin=GETPOST("sondage");
 $numsondage=substr($numsondageadmin, 0, 16);
 
 $object=new Opensurveysondage($db);
-$result=$object->fetch(0,$numsondage);
+$result=$object->fetch(0,$numsondage);
 if ($result <= 0) dol_print_error('','Failed to get survey id '.$numsondage);
 
 $nblignes=count($object->fetch_lines());
@@ -49,7 +49,7 @@ $nblignes=count($object->fetch_lines());
  * Actions
  */
 
-$nbcolonnes = substr_count($object->sujet, ',') + 1;
+$nbcolonnes = substr_count($object->sujet, ',') + 1;
 
 // Add vote
 if (isset($_POST["boutonp"]) || isset($_POST["boutonp_x"]))
@@ -74,7 +74,7 @@ if (isset($_POST["boutonp"]) || isset($_POST["boutonp_x"]))
 			}
 		}
 
-		$nom=substr(GETPOST("nom"),0,64);
+		$nom=substr(GETPOST("nom"),0,64);
 
 		// Check if vote already exists
 		$sql = 'SELECT id_users, nom';
@@ -147,23 +147,23 @@ if ($testmodifier)
 	if (! $resql) dol_print_error($db);
 }
 
-// Add column (not for date)
-if (GETPOST("ajoutercolonne") && GETPOST('nouvellecolonne') && ($object->format == "A" || $object->format == "A+"))
-{
-	$nouveauxsujets=$object->sujet;
-
-	//on rajoute la valeur a la fin de tous les sujets deja entrés
-	$nouveauxsujets.=',';
-	$nouveauxsujets.=str_replace(array(",","@"), " ", $_POST["nouvellecolonne"]).(empty($_POST["typecolonne"])?'':'@'.$_POST["typecolonne"]);
-
-	//mise a jour avec les nouveaux sujets dans la base
+// Add column (not for date)
+if (GETPOST("ajoutercolonne") && GETPOST('nouvellecolonne') && ($object->format == "A" || $object->format == "A+"))
+{
+	$nouveauxsujets=$object->sujet;
+
+	//on rajoute la valeur a la fin de tous les sujets deja entrés
+	$nouveauxsujets.=',';
+	$nouveauxsujets.=str_replace(array(",","@"), " ", $_POST["nouvellecolonne"]).(empty($_POST["typecolonne"])?'':'@'.$_POST["typecolonne"]);
+
+	//mise a jour avec les nouveaux sujets dans la base
 	$sql = 'UPDATE '.MAIN_DB_PREFIX."opensurvey_sondage";
 	$sql.= " SET sujet = '".$db->escape($nouveauxsujets)."'";
-	$sql.= " WHERE id_sondage = '".$db->escape($numsondage)."'";
+	$sql.= " WHERE id_sondage = '".$db->escape($numsondage)."'";
 	dol_syslog("sql=".$sql);
 	$resql = $db->query($sql);
-	if (! $resql) dol_print_error($db);
-}
+	if (! $resql) dol_print_error($db);
+}
 
 // Add column (with format date)
 if (isset($_POST["ajoutercolonne"]) && ($object->format == "D" || $object->format == "D+"))
@@ -236,12 +236,12 @@ if (isset($_POST["ajoutercolonne"]) && ($object->format == "D" || $object->forma
 		//mise a jour avec les nouveaux sujets dans la base
 		if (isset($erreur_ajout_date) && !$erreur_ajout_date)
 		{
-			$sql = 'UPDATE '.MAIN_DB_PREFIX."opensurvey_sondage";
+			$sql = 'UPDATE '.MAIN_DB_PREFIX."opensurvey_sondage";
 			$sql.= " SET sujet = '".$db->escape($dateinsertion)."'";
-			$sql.= " WHERE id_sondage = '".$db->escape($numsondage)."'";
+			$sql.= " WHERE id_sondage = '".$db->escape($numsondage)."'";
 			dol_syslog("sql=".$sql);
-			$resql = $db->query($sql);
-			if (! $resql) dol_print_error($db);
+			$resql = $db->query($sql);
+			if (! $resql) dol_print_error($db);
 
 			if ($nouvelledate > strtotime($object->date_fin))
 			{
@@ -251,7 +251,7 @@ if (isset($_POST["ajoutercolonne"]) && ($object->format == "D" || $object->forma
 				$sql.= " WHERE id_sondage = '".$db->escape($numsondage)."'";
 				dol_syslog("sql=".$sql);
 				$resql = $db->query($sql);
-				if (! $resql) dol_print_error($db);
+				if (! $resql) dol_print_error($db);
 			}
 		}
 
@@ -270,17 +270,17 @@ for ($i = 0; $i < $nblignes; $i++)
 	{
 		$compteur=0;
 
-		// Loop on each answer
-		$compteur = 0;
-		$sql ="SELECT id_users, nom, id_sondage, reponses";
-		$sql.=" FROM ".MAIN_DB_PREFIX."opensurvey_user_studs";
-		$sql.=" WHERE id_sondage = '".$db->escape($numsondage)."'";
-		dol_syslog('sql='.$sql);
-		$resql=$db->query($sql);
-		if (! $resql) dol_print_error($db);
-		$num=$db->num_rows($resql);
-		while ($compteur < $num)
-		{
+		// Loop on each answer
+		$compteur = 0;
+		$sql ="SELECT id_users, nom, id_sondage, reponses";
+		$sql.=" FROM ".MAIN_DB_PREFIX."opensurvey_user_studs";
+		$sql.=" WHERE id_sondage = '".$db->escape($numsondage)."'";
+		dol_syslog('sql='.$sql);
+		$resql=$db->query($sql);
+		if (! $resql) dol_print_error($db);
+		$num=$db->num_rows($resql);
+		while ($compteur < $num)
+		{
 			$obj=$db->fetch_object($resql);
 
 			if ($compteur==$i)
@@ -327,20 +327,20 @@ for ($i = 0; $i < $nbcolonnes; $i++)
 		if (! $resql) dol_print_error($db);
 
 		// Clean current answer to remove deleted columns
-		$compteur = 0;
-		$sql ="SELECT id_users, nom, id_sondage, reponses";
-		$sql.=" FROM ".MAIN_DB_PREFIX."opensurvey_user_studs";
-		$sql.=" WHERE id_sondage = '".$db->escape($numsondage)."'";
-		dol_syslog('sql='.$sql);
-		$resql=$db->query($sql);
-		if (! $resql)
-		{
-			dol_print_error($db);
-			exit;
-		}
-		$num=$db->num_rows($resql);
-		while ($compteur < $num)
-		{
+		$compteur = 0;
+		$sql ="SELECT id_users, nom, id_sondage, reponses";
+		$sql.=" FROM ".MAIN_DB_PREFIX."opensurvey_user_studs";
+		$sql.=" WHERE id_sondage = '".$db->escape($numsondage)."'";
+		dol_syslog('sql='.$sql);
+		$resql=$db->query($sql);
+		if (! $resql)
+		{
+			dol_print_error($db);
+			exit;
+		}
+		$num=$db->num_rows($resql);
+		while ($compteur < $num)
+		{
 			$obj=$db->fetch_object($resql);
 
 			$newcar = '';
@@ -379,13 +379,13 @@ for ($i = 0; $i < $nbcolonnes; $i++)
 
 $form=new Form($db);
 
-$result=$object->fetch(0,$numsondage);
-if ($result <= 0)
-{
-	print $langs->trans("ErrorRecordNotFound");
-	llxFooter();
-	exit;
-}
+$result=$object->fetch(0,$numsondage);
+if ($result <= 0)
+{
+	print $langs->trans("ErrorRecordNotFound");
+	llxFooter();
+	exit;
+}
 
 $arrayofjs=array();
 $arrayofcss=array('/opensurvey/css/style.css');
@@ -768,7 +768,7 @@ while ($compteur < $num)
 		for ($i = 0; $i < $nbcolonnes; $i++)
 		{
 			$car = substr($ensemblereponses, $i, 1);
-			//print 'xx'.$i."-".$car.'-'.$listofanswers[$i]['format'].'zz';
+			//print 'xx'.$i."-".$car.'-'.$listofanswers[$i]['format'].'zz';
 
 			if (empty($listofanswers[$i]['format']) || ! in_array($listofanswers[$i]['format'],array('yesno','foragainst')))
 			{
@@ -1065,7 +1065,7 @@ if ($nbofcheckbox >= 2)
 
 print '</form>'."\n";
 
-print '<a name="bas"></a>'."\n";
+print '<a name="bas"></a>'."\n";
 
 llxFooterSurvey();
 
diff --git a/htdocs/opensurvey/class/opensurveysondage.class.php b/htdocs/opensurvey/class/opensurveysondage.class.php
index 188e830be63..72cb620c462 100644
--- a/htdocs/opensurvey/class/opensurveysondage.class.php
+++ b/htdocs/opensurvey/class/opensurveysondage.class.php
@@ -91,7 +91,7 @@ class Opensurveysondage extends CommonObject
 		if (isset($this->format)) $this->format=trim($this->format);
 		if (isset($this->mailsonde)) $this->mailsonde=trim($this->mailsonde);
 		if (isset($this->survey_link_visible)) $this->survey_link_visible=trim($this->survey_link_visible);
-		if (isset($this->canedit)) $this->canedit=trim($this->canedit);
+		if (isset($this->canedit)) $this->canedit=trim($this->canedit);
 
 
 
@@ -111,7 +111,7 @@ class Opensurveysondage extends CommonObject
 		$sql.= "format,";
 		$sql.= "mailsonde,";
 		$sql.= "survey_link_visible,";
-		$sql.= "canedit";
+		$sql.= "canedit";
         $sql.= ") VALUES (";
 
 		$sql.= " ".(! isset($this->id_sondage)?'NULL':"'".$this->id_sondage."'").",";
@@ -124,7 +124,7 @@ class Opensurveysondage extends CommonObject
 		$sql.= " ".(! isset($this->format)?'NULL':"'".$this->db->escape($this->format)."'").",";
 		$sql.= " ".(! isset($this->mailsonde)?'NULL':"'".$this->mailsonde."'").",";
 		$sql.= " ".(! isset($this->survey_link_visible)?'NULL':"'".$this->survey_link_visible."'").",";
-		$sql.= " ".(! isset($this->canedit)?'NULL':"'".$this->canedit."'")."";
+		$sql.= " ".(! isset($this->canedit)?'NULL':"'".$this->canedit."'")."";
 
 		$sql.= ")";
 
@@ -267,7 +267,7 @@ class Opensurveysondage extends CommonObject
 		if (isset($this->format)) $this->format=trim($this->format);
 		if (isset($this->mailsonde)) $this->mailsonde=trim($this->mailsonde);
 		if (isset($this->survey_link_visible)) $this->survey_link_visible=trim($this->survey_link_visible);
-		if (isset($this->canedit)) $this->canedit=trim($this->canedit);
+		if (isset($this->canedit)) $this->canedit=trim($this->canedit);
 
 
 		// Check parameters
@@ -286,7 +286,7 @@ class Opensurveysondage extends CommonObject
 		$sql.= " format=".(isset($this->format)?"'".$this->db->escape($this->format)."'":"null").",";
 		$sql.= " mailsonde=".(isset($this->mailsonde)?$this->mailsonde:"null").",";
 		$sql.= " survey_link_visible=".(isset($this->survey_link_visible)?$this->survey_link_visible:"null").",";
-		$sql.= " canedit=".(isset($this->canedit)?$this->canedit:"null")."";
+		$sql.= " canedit=".(isset($this->canedit)?$this->canedit:"null")."";
 
         //$sql.= " WHERE rowid=".$this->id;
 		$sql.= " WHERE id_sondage_admin='".$this->id_sondage_admin."'";
@@ -348,7 +348,7 @@ class Opensurveysondage extends CommonObject
 		$numsondage=substr($numsondageadmin, 0, 16);
 		
 		$this->db->begin();
-
+
 		if (! $error)
 		{
 			if (! $notrigger)
@@ -367,13 +367,13 @@ class Opensurveysondage extends CommonObject
 
 		if (! $error)
 		{
-
-			$sql='DELETE FROM '.MAIN_DB_PREFIX."opensurvey_comments WHERE id_sondage = '".$numsondage."'";
-			dol_syslog(get_class($this)."::delete sql=".$sql, LOG_DEBUG);
-			$resql=$this->db->query($sql);
-			$sql='DELETE FROM '.MAIN_DB_PREFIX."opensurvey_user_studs WHERE id_sondage = '".$numsondage."'";
-			dol_syslog(get_class($this)."::delete sql=".$sql, LOG_DEBUG);
-			$resql=$this->db->query($sql);
+
+			$sql='DELETE FROM '.MAIN_DB_PREFIX."opensurvey_comments WHERE id_sondage = '".$numsondage."'";
+			dol_syslog(get_class($this)."::delete sql=".$sql, LOG_DEBUG);
+			$resql=$this->db->query($sql);
+			$sql='DELETE FROM '.MAIN_DB_PREFIX."opensurvey_user_studs WHERE id_sondage = '".$numsondage."'";
+			dol_syslog(get_class($this)."::delete sql=".$sql, LOG_DEBUG);
+			$resql=$this->db->query($sql);
 
     		$sql = "DELETE FROM ".MAIN_DB_PREFIX."opensurvey_sondage";
     		$sql.= " WHERE id_sondage_admin = '".$numsondageadmin."'";
@@ -507,7 +507,7 @@ class Opensurveysondage extends CommonObject
 		$this->format='';
 		$this->mailsonde='';
 		$this->survey_link_visible='';
-		$this->canedit=0;
+		$this->canedit=0;
 	}
 
 }
diff --git a/htdocs/opensurvey/fonctions.php b/htdocs/opensurvey/fonctions.php
index e2dbcd39af1..f83cb029207 100755
--- a/htdocs/opensurvey/fonctions.php
+++ b/htdocs/opensurvey/fonctions.php
@@ -22,77 +22,77 @@
  */
 
 
-
-/**
- * Show header for new member
- *
- * @param 	string		$title				Title
- * @param 	string		$head				Head array
- * @param 	int    		$disablejs			More content into html header
- * @param 	int    		$disablehead		More content into html header
- * @param 	array  		$arrayofjs			Array of complementary js files
- * @param 	array  		$arrayofcss			Array of complementary css files
- * @return	void
- */
-function llxHeaderSurvey($title, $head="", $disablejs=0, $disablehead=0, $arrayofjs='', $arrayofcss='')
-{
-	global $user, $conf, $langs, $mysoc;
-
-	top_htmlhead($head, $title, $disablejs, $disablehead, $arrayofjs, $arrayofcss); // Show html headers
-	print '<body id="mainbody" class="publicnewmemberform" style="margin-top: 10px;">';
-
-	showlogo();
-
-	print '<div style="margin-left: 50px; margin-right: 50px;">';
-}
-
-/**
- * Show footer for new member
- *
- * @return	void
- */
-function llxFooterSurvey()
-{
-	print '</div>';
-
-	printCommonFooter('public');
-
-	dol_htmloutput_events();
-
-	print "</body>\n";
-	print "</html>\n";
+
+/**
+ * Show header for new member
+ *
+ * @param 	string		$title				Title
+ * @param 	string		$head				Head array
+ * @param 	int    		$disablejs			More content into html header
+ * @param 	int    		$disablehead		More content into html header
+ * @param 	array  		$arrayofjs			Array of complementary js files
+ * @param 	array  		$arrayofcss			Array of complementary css files
+ * @return	void
+ */
+function llxHeaderSurvey($title, $head="", $disablejs=0, $disablehead=0, $arrayofjs='', $arrayofcss='')
+{
+	global $user, $conf, $langs, $mysoc;
+
+	top_htmlhead($head, $title, $disablejs, $disablehead, $arrayofjs, $arrayofcss); // Show html headers
+	print '<body id="mainbody" class="publicnewmemberform" style="margin-top: 10px;">';
+
+	showlogo();
+
+	print '<div style="margin-left: 50px; margin-right: 50px;">';
 }
 
-
-/**
- * Show logo
- *
- * @return	void
- */
-function showlogo()
-{
-	global $user, $conf, $langs, $mysoc;
-
-	// Print logo
-	$urllogo=DOL_URL_ROOT.'/theme/login_logo.png';
-
-	if (! empty($mysoc->logo_small) && is_readable($conf->mycompany->dir_output.'/logos/thumbs/'.$mysoc->logo_small))
-	{
-		$urllogo=DOL_URL_ROOT.'/viewimage.php?cache=1&amp;modulepart=companylogo&amp;file='.urlencode('thumbs/'.$mysoc->logo_small);
-	}
-	elseif (! empty($mysoc->logo) && is_readable($conf->mycompany->dir_output.'/logos/'.$mysoc->logo))
-	{
-		$urllogo=DOL_URL_ROOT.'/viewimage.php?cache=1&amp;modulepart=companylogo&amp;file='.urlencode($mysoc->logo);
-		$width=128;
-	}
-	elseif (is_readable(DOL_DOCUMENT_ROOT.'/theme/dolibarr_logo.png'))
-	{
-		$urllogo=DOL_URL_ROOT.'/theme/dolibarr_logo.png';
-	}
-	print '<center>';
-	print '<img alt="Logo" id="logosubscribe" title="" src="'.$urllogo.'" style="max-width: 120px" /><br>';
-	print '<strong>'.$langs->trans("OpenSurvey").'</strong>';
-	print '</center><br>';
+/**
+ * Show footer for new member
+ *
+ * @return	void
+ */
+function llxFooterSurvey()
+{
+	print '</div>';
+
+	printCommonFooter('public');
+
+	dol_htmloutput_events();
+
+	print "</body>\n";
+	print "</html>\n";
+}
+
+
+/**
+ * Show logo
+ *
+ * @return	void
+ */
+function showlogo()
+{
+	global $user, $conf, $langs, $mysoc;
+
+	// Print logo
+	$urllogo=DOL_URL_ROOT.'/theme/login_logo.png';
+
+	if (! empty($mysoc->logo_small) && is_readable($conf->mycompany->dir_output.'/logos/thumbs/'.$mysoc->logo_small))
+	{
+		$urllogo=DOL_URL_ROOT.'/viewimage.php?cache=1&amp;modulepart=companylogo&amp;file='.urlencode('thumbs/'.$mysoc->logo_small);
+	}
+	elseif (! empty($mysoc->logo) && is_readable($conf->mycompany->dir_output.'/logos/'.$mysoc->logo))
+	{
+		$urllogo=DOL_URL_ROOT.'/viewimage.php?cache=1&amp;modulepart=companylogo&amp;file='.urlencode($mysoc->logo);
+		$width=128;
+	}
+	elseif (is_readable(DOL_DOCUMENT_ROOT.'/theme/dolibarr_logo.png'))
+	{
+		$urllogo=DOL_URL_ROOT.'/theme/dolibarr_logo.png';
+	}
+	print '<center>';
+	print '<img alt="Logo" id="logosubscribe" title="" src="'.$urllogo.'" style="max-width: 120px" /><br>';
+	print '<strong>'.$langs->trans("OpenSurvey").'</strong>';
+	print '</center><br>';
 }
 
 
@@ -105,10 +105,10 @@ function get_server_name()
 {
 	global $dolibarr_main_url_root;
 
-	$urlwithouturlroot=preg_replace('/'.preg_quote(DOL_URL_ROOT,'/').'$/i','',trim($dolibarr_main_url_root));
-	$urlwithroot=$urlwithouturlroot.DOL_URL_ROOT;		// This is to use external domain name found into config file
-	//$urlwithroot=DOL_MAIN_URL_ROOT;					// This is to use same domain name than current
-
+	$urlwithouturlroot=preg_replace('/'.preg_quote(DOL_URL_ROOT,'/').'$/i','',trim($dolibarr_main_url_root));
+	$urlwithroot=$urlwithouturlroot.DOL_URL_ROOT;		// This is to use external domain name found into config file
+	//$urlwithroot=DOL_MAIN_URL_ROOT;					// This is to use same domain name than current
+
 	$url=$urlwithouturlroot.dol_buildpath('/opensurvey/',1);
 
 	if (!preg_match("|/$|", $url)) {
@@ -171,94 +171,94 @@ function getUrlSondage($id, $admin = false)
 	return $url;
 }
 
-
-/**
- * 	Generate a random id
+
+/**
+ * 	Generate a random id
  *
- *	@param	string	$car	Char to generate key
- * 	@return	void
- */
-function dol_survey_random($car)
-{
-	$string = "";
-	$chaine = "abcdefghijklmnopqrstuvwxyz123456789";
-	srand((double) microtime()*1000000);
-	for($i=0; $i<$car; $i++) {
-		$string .= $chaine[rand()%strlen($chaine)];
-	}
-	return $string;
-}
-
-/**
- * Add a poll
- *
- * @param	string	$origin		Origin of poll creation
- * @return	void
- */
-function ajouter_sondage($origin)
-{
-	global $conf, $db;
-
-	$sondage=dol_survey_random(16);
-	$sondage_admin=$sondage.dol_survey_random(8);
-
-	if ($_SESSION["formatsondage"]=="A"||$_SESSION["formatsondage"]=="A+") {
-		//extraction de la date de fin choisie
-		if ($_SESSION["champdatefin"]) {
-			if ($_SESSION["champdatefin"]>time()+250000) {
-				$date_fin=$_SESSION["champdatefin"];
-			}
-		} else {
-			$date_fin=time()+15552000;
-		}
-	}
-
-	if ($_SESSION["formatsondage"]=="D"||$_SESSION["formatsondage"]=="D+") {
-		//Calcul de la date de fin du sondage
-		$taille_tableau=count($_SESSION["totalchoixjour"])-1;
-		$date_fin=$_SESSION["totalchoixjour"][$taille_tableau]+200000;
-	}
-
-	if (is_numeric($date_fin) === false) {
-		$date_fin = time()+15552000;
+ *	@param	string	$car	Char to generate key
+ * 	@return	void
+ */
+function dol_survey_random($car)
+{
+	$string = "";
+	$chaine = "abcdefghijklmnopqrstuvwxyz123456789";
+	srand((double) microtime()*1000000);
+	for($i=0; $i<$car; $i++) {
+		$string .= $chaine[rand()%strlen($chaine)];
 	}
-	$canedit=empty($_SESSION['formatcanedit'])?'0':'1';
-
-	// Insert survey
-	$sql = 'INSERT INTO '.MAIN_DB_PREFIX.'opensurvey_sondage';
-	$sql.= '(id_sondage, commentaires, mail_admin, nom_admin, titre, id_sondage_admin, date_fin, format, mailsonde, canedit, origin, sujet)';
-	$sql.= " VALUES ('".$db->escape($sondage)."', '".$db->escape($_SESSION['commentaires'])."', '".$db->escape($_SESSION['adresse'])."', '".$db->escape($_SESSION['nom'])."',";
-	$sql.= " '".$db->escape($_SESSION['titre'])."', '".$sondage_admin."', '".$db->idate($date_fin)."', '".$_SESSION['formatsondage']."', '".$db->escape($_SESSION['mailsonde'])."',";
-	$sql.= " '".$canedit."', '".$db->escape($origin)."',";
-	$sql.= " '".$db->escape($_SESSION['toutchoix'])."'";
-	$sql.= ")";
-	dol_syslog($sql);
-	$resql=$db->query($sql);
-
-	if ($origin == 'dolibarr') $urlback=dol_buildpath('/opensurvey/adminstuds_preview.php',1).'?sondage='.$sondage_admin;
-	else
-	{
-		// Define $urlwithroot
-		$urlwithouturlroot=preg_replace('/'.preg_quote(DOL_URL_ROOT,'/').'$/i','',trim($dolibarr_main_url_root));
-		$urlwithroot=$urlwithouturlroot.DOL_URL_ROOT;		// This is to use external domain name found into config file
-		//$urlwithroot=DOL_MAIN_URL_ROOT;					// This is to use same domain name than current
-
-		$url=$urlwithouturlroot.dol_buildpath('/opensurvey/public/studs.php',1).'?sondage='.$sondage;
-
-		$urlback=$url;
-
-		//var_dump($urlback);exit;
-	}
-
-	unset($_SESSION["titre"]);
-	unset($_SESSION["nom"]);
-	unset($_SESSION["adresse"]);
-	unset($_SESSION["commentaires"]);
-	unset($_SESSION["canedit"]);
-	unset($_SESSION["mailsonde"]);
-
-	header("Location: ".$urlback);
-	exit();
+	return $string;
+}
+
+/**
+ * Add a poll
+ *
+ * @param	string	$origin		Origin of poll creation
+ * @return	void
+ */
+function ajouter_sondage($origin)
+{
+	global $conf, $db;
+
+	$sondage=dol_survey_random(16);
+	$sondage_admin=$sondage.dol_survey_random(8);
+
+	if ($_SESSION["formatsondage"]=="A"||$_SESSION["formatsondage"]=="A+") {
+		//extraction de la date de fin choisie
+		if ($_SESSION["champdatefin"]) {
+			if ($_SESSION["champdatefin"]>time()+250000) {
+				$date_fin=$_SESSION["champdatefin"];
+			}
+		} else {
+			$date_fin=time()+15552000;
+		}
+	}
+
+	if ($_SESSION["formatsondage"]=="D"||$_SESSION["formatsondage"]=="D+") {
+		//Calcul de la date de fin du sondage
+		$taille_tableau=count($_SESSION["totalchoixjour"])-1;
+		$date_fin=$_SESSION["totalchoixjour"][$taille_tableau]+200000;
+	}
+
+	if (is_numeric($date_fin) === false) {
+		$date_fin = time()+15552000;
+	}
+	$canedit=empty($_SESSION['formatcanedit'])?'0':'1';
+
+	// Insert survey
+	$sql = 'INSERT INTO '.MAIN_DB_PREFIX.'opensurvey_sondage';
+	$sql.= '(id_sondage, commentaires, mail_admin, nom_admin, titre, id_sondage_admin, date_fin, format, mailsonde, canedit, origin, sujet)';
+	$sql.= " VALUES ('".$db->escape($sondage)."', '".$db->escape($_SESSION['commentaires'])."', '".$db->escape($_SESSION['adresse'])."', '".$db->escape($_SESSION['nom'])."',";
+	$sql.= " '".$db->escape($_SESSION['titre'])."', '".$sondage_admin."', '".$db->idate($date_fin)."', '".$_SESSION['formatsondage']."', '".$db->escape($_SESSION['mailsonde'])."',";
+	$sql.= " '".$canedit."', '".$db->escape($origin)."',";
+	$sql.= " '".$db->escape($_SESSION['toutchoix'])."'";
+	$sql.= ")";
+	dol_syslog($sql);
+	$resql=$db->query($sql);
+
+	if ($origin == 'dolibarr') $urlback=dol_buildpath('/opensurvey/adminstuds_preview.php',1).'?sondage='.$sondage_admin;
+	else
+	{
+		// Define $urlwithroot
+		$urlwithouturlroot=preg_replace('/'.preg_quote(DOL_URL_ROOT,'/').'$/i','',trim($dolibarr_main_url_root));
+		$urlwithroot=$urlwithouturlroot.DOL_URL_ROOT;		// This is to use external domain name found into config file
+		//$urlwithroot=DOL_MAIN_URL_ROOT;					// This is to use same domain name than current
+
+		$url=$urlwithouturlroot.dol_buildpath('/opensurvey/public/studs.php',1).'?sondage='.$sondage;
+
+		$urlback=$url;
+
+		//var_dump($urlback);exit;
+	}
+
+	unset($_SESSION["titre"]);
+	unset($_SESSION["nom"]);
+	unset($_SESSION["adresse"]);
+	unset($_SESSION["commentaires"]);
+	unset($_SESSION["canedit"]);
+	unset($_SESSION["mailsonde"]);
+
+	header("Location: ".$urlback);
+	exit();
 }
 
 
diff --git a/htdocs/opensurvey/index.php b/htdocs/opensurvey/index.php
index 37f975d1f40..a7f88631dd8 100755
--- a/htdocs/opensurvey/index.php
+++ b/htdocs/opensurvey/index.php
@@ -50,16 +50,16 @@ print_fiche_titre($langs->trans("OpenSurveyArea"));
 echo $langs->trans("NoSurveysInDatabase",$nbsondages).'<br><br>'."\n";
 
 
-// Link
-print img_picto('','object_globe.png').' '.$langs->trans("PublicLinkToCreateSurvey").':<br>';
-
-// Define $urlwithroot
-$urlwithouturlroot=preg_replace('/'.preg_quote(DOL_URL_ROOT,'/').'$/i','',trim($dolibarr_main_url_root));
-$urlwithroot=$urlwithouturlroot.DOL_URL_ROOT;		// This is to use external domain name found into config file
-//$urlwithroot=DOL_MAIN_URL_ROOT;					// This is to use same domain name than current
-
-$url=$urlwithouturlroot.dol_buildpath('/opensurvey/public/index.php',1);
-$urllink='<a href="'.$url.'" target="_blank">'.$url.'</a>';
+// Link
+print img_picto('','object_globe.png').' '.$langs->trans("PublicLinkToCreateSurvey").':<br>';
+
+// Define $urlwithroot
+$urlwithouturlroot=preg_replace('/'.preg_quote(DOL_URL_ROOT,'/').'$/i','',trim($dolibarr_main_url_root));
+$urlwithroot=$urlwithouturlroot.DOL_URL_ROOT;		// This is to use external domain name found into config file
+//$urlwithroot=DOL_MAIN_URL_ROOT;					// This is to use same domain name than current
+
+$url=$urlwithouturlroot.dol_buildpath('/opensurvey/public/index.php',1);
+$urllink='<a href="'.$url.'" target="_blank">'.$url.'</a>';
 print $urllink;
 
 
diff --git a/htdocs/opensurvey/list.php b/htdocs/opensurvey/list.php
index c87526ce5ca..908a01db8fd 100755
--- a/htdocs/opensurvey/list.php
+++ b/htdocs/opensurvey/list.php
@@ -14,11 +14,11 @@
  * You should have received a copy of the GNU General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
-
-/**
- *	\file       htdocs/opensurvey/list.php
- *	\ingroup    opensurvey
- *	\brief      Page to list surveys
+
+/**
+ *	\file       htdocs/opensurvey/list.php
+ *	\ingroup    opensurvey
+ *	\brief      Page to list surveys
  */
 
 require_once('../main.inc.php');
@@ -27,14 +27,14 @@ require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php");
 
 $action=GETPOST('action');
 $id=GETPOST('id');
-$numsondage=substr($id, 0, 16);
+$numsondage=substr($id, 0, 16);
 
-if (! $sortorder) $sortorder="ASC";
-if (! $sortfield) $sortfield="p.titre";
-if ($page < 0) {
-	$page = 0;
-}
-$limit = $conf->liste_limit;
+if (! $sortorder) $sortorder="ASC";
+if (! $sortfield) $sortfield="p.titre";
+if ($page < 0) {
+	$page = 0;
+}
+$limit = $conf->liste_limit;
 $offset = $limit * $page;
 
 
@@ -46,10 +46,10 @@ if ($action == 'delete_confirm')
 {
 	$db->begin();
 
-	$object=new Opensurveysondage($db);
+	$object=new Opensurveysondage($db);
+	
+	$result=$object->delete($user,'',$numsondageadmin);
 	
-	$result=$object->delete($user,'',$numsondageadmin);
-	
 	$db->commit();
 }
 
@@ -81,14 +81,14 @@ print '<tr class="liste_titre"><td>'. $langs->trans("Survey").'</td><td>'. $lang
 
 $sql = "SELECT id_sondage, id_sondage_admin, mail_admin, format, origin, date_fin, titre, nom_admin";
 $sql.= " FROM ".MAIN_DB_PREFIX."opensurvey_sondage as p";
-// Count total nb of records
-$nbtotalofrecords = 0;
-if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST))
-{
-	$result = $db->query($sql);
-	$nbtotalofrecords = $db->num_rows($result);
+// Count total nb of records
+$nbtotalofrecords = 0;
+if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST))
+{
+	$result = $db->query($sql);
+	$nbtotalofrecords = $db->num_rows($result);
 }
-$sql.= " ORDER BY $sortfield $sortorder ";
+$sql.= " ORDER BY $sortfield $sortorder ";
 $sql.= " ".$db->plimit($conf->liste_limit+1, $offset);
 
 $resql=$db->query($sql);
diff --git a/htdocs/opensurvey/public/choix_autre.php b/htdocs/opensurvey/public/choix_autre.php
index 5975f9d4a0c..e120bd7ec20 100755
--- a/htdocs/opensurvey/public/choix_autre.php
+++ b/htdocs/opensurvey/public/choix_autre.php
@@ -28,87 +28,87 @@ require_once(DOL_DOCUMENT_ROOT."/core/lib/admin.lib.php");
 require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php");
 require_once(DOL_DOCUMENT_ROOT."/opensurvey/fonctions.php");
 
-$erreur = false;
-$testdate = true;
-$date_selected = '';
+$erreur = false;
+$testdate = true;
+$date_selected = '';
+
+$origin=GETPOST('origin','alpha');
 
-$origin=GETPOST('origin','alpha');
-
 
 
 /*
  * Action
  */
 
-// Set session vars
-$erreur_injection = false;
-if (isset($_SESSION["nbrecases"])) {
-	for ($i = 0; $i < $_SESSION["nbrecases"]; $i++) {
-		if (isset($_POST["choix"][$i])) {
-			$_SESSION["choix$i"]=$_POST["choix"][$i];
-		}
-		if (isset($_POST["typecolonne"][$i])) {
-			$_SESSION["typecolonne$i"]=$_POST["typecolonne"][$i];
-		}
-	}
-} else { //nombre de cases par défaut
-	$_SESSION["nbrecases"]=5;
-}
-
-if (isset($_POST["ajoutcases"]) || isset($_POST["ajoutcases_x"])) {
-	$_SESSION["nbrecases"]=$_SESSION["nbrecases"]+5;
-}
+// Set session vars
+$erreur_injection = false;
+if (isset($_SESSION["nbrecases"])) {
+	for ($i = 0; $i < $_SESSION["nbrecases"]; $i++) {
+		if (isset($_POST["choix"][$i])) {
+			$_SESSION["choix$i"]=$_POST["choix"][$i];
+		}
+		if (isset($_POST["typecolonne"][$i])) {
+			$_SESSION["typecolonne$i"]=$_POST["typecolonne"][$i];
+		}
+	}
+} else { //nombre de cases par défaut
+	$_SESSION["nbrecases"]=5;
+}
+
+if (isset($_POST["ajoutcases"]) || isset($_POST["ajoutcases_x"])) {
+	$_SESSION["nbrecases"]=$_SESSION["nbrecases"]+5;
+}
+
+// Create survey into database
+if (isset($_POST["confirmecreation"]) || isset($_POST["confirmecreation_x"]))
+{
+	//recuperation des données de champs textes
+	$toutchoix = '';
+	for ($i = 0; $i < $_SESSION["nbrecases"] + 1; $i++)
+	{
+		if (! empty($_POST["choix"][$i]))
+		{
+			$toutchoix.=',';
+			$toutchoix.=str_replace(array(",","@"), " ", $_POST["choix"][$i]).(empty($_POST["typecolonne"][$i])?'':'@'.$_POST["typecolonne"][$i]);
+		}
+	}
+
+	$toutchoix=substr("$toutchoix",1);
+	$_SESSION["toutchoix"]=$toutchoix;
 
-// Create survey into database
-if (isset($_POST["confirmecreation"]) || isset($_POST["confirmecreation_x"]))
-{
-	//recuperation des données de champs textes
-	$toutchoix = '';
-	for ($i = 0; $i < $_SESSION["nbrecases"] + 1; $i++)
-	{
-		if (! empty($_POST["choix"][$i]))
-		{
-			$toutchoix.=',';
-			$toutchoix.=str_replace(array(",","@"), " ", $_POST["choix"][$i]).(empty($_POST["typecolonne"][$i])?'':'@'.$_POST["typecolonne"][$i]);
-		}
-	}
-
-	$toutchoix=substr("$toutchoix",1);
-	$_SESSION["toutchoix"]=$toutchoix;
-
 	if (GETPOST('champdatefin'))
-	{
-		$registredate=explode("/",$_POST["champdatefin"]);
-		if (is_array($registredate) === false || count($registredate) !== 3) {
-			$testdate = false;
-			$date_selected = $_POST["champdatefin"];
-		} else {
-			$time = mktime(0,0,0,$registredate[1],$registredate[0],$registredate[2]);
-			if ($time === false || date('d/m/Y', $time) !== $_POST["champdatefin"]) {
-				$testdate = false;
-				$date_selected = $_POST["champdatefin"];
-			} else {
-				if (mktime(0,0,0,$registredate[1],$registredate[0],$registredate[2]) > time() + 250000) {
-					$_SESSION["champdatefin"]=mktime(0,0,0,$registredate[1],$registredate[0],$registredate[2]);
-				}
-			}
-		}
-	} else {
-		$_SESSION["champdatefin"]=time()+15552000;
-	}
-
-	if ($testdate === true)
-	{
-		//format du sondage AUTRE
-		$_SESSION["formatsondage"]="A";
-		$_SESSION["caneditsondage"]=$_SESSION["canedit"];
+	{
+		$registredate=explode("/",$_POST["champdatefin"]);
+		if (is_array($registredate) === false || count($registredate) !== 3) {
+			$testdate = false;
+			$date_selected = $_POST["champdatefin"];
+		} else {
+			$time = mktime(0,0,0,$registredate[1],$registredate[0],$registredate[2]);
+			if ($time === false || date('d/m/Y', $time) !== $_POST["champdatefin"]) {
+				$testdate = false;
+				$date_selected = $_POST["champdatefin"];
+			} else {
+				if (mktime(0,0,0,$registredate[1],$registredate[0],$registredate[2]) > time() + 250000) {
+					$_SESSION["champdatefin"]=mktime(0,0,0,$registredate[1],$registredate[0],$registredate[2]);
+				}
+			}
+		}
+	} else {
+		$_SESSION["champdatefin"]=time()+15552000;
+	}
 
-		// Add into database
-		ajouter_sondage($origin);
-	} else {
-		$_POST["fin_sondage_autre"] = 'ok';
-	}
-}
+	if ($testdate === true)
+	{
+		//format du sondage AUTRE
+		$_SESSION["formatsondage"]="A";
+		$_SESSION["caneditsondage"]=$_SESSION["canedit"];
+
+		// Add into database
+		ajouter_sondage($origin);
+	} else {
+		$_POST["fin_sondage_autre"] = 'ok';
+	}
+}
 
 
 
@@ -119,16 +119,16 @@ if (isset($_POST["confirmecreation"]) || isset($_POST["confirmecreation_x"]))
 
 $form=new Form($db);
 
-$arrayofjs=array();
-$arrayofcss=array('/opensurvey/css/style.css');
-llxHeaderSurvey($langs->trans("OpenSurvey"), "", 0, 0, $arrayofjs, $arrayofcss);
-
-if (empty($_SESSION['titre']) || empty($_SESSION['nom']) || empty($_SESSION['adresse']))
-{
-	dol_print_error('',"You haven't filled the first section of the poll creation");
-	llxFooterSurvey();
-	exit;
-}
+$arrayofjs=array();
+$arrayofcss=array('/opensurvey/css/style.css');
+llxHeaderSurvey($langs->trans("OpenSurvey"), "", 0, 0, $arrayofjs, $arrayofcss);
+
+if (empty($_SESSION['titre']) || empty($_SESSION['nom']) || empty($_SESSION['adresse']))
+{
+	dol_print_error('',"You haven't filled the first section of the poll creation");
+	llxFooterSurvey();
+	exit;
+}
 
 
 //partie creation du sondage dans la base SQL
@@ -150,8 +150,8 @@ for ($i = 0; $i < $_SESSION["nbrecases"]; $i++) {
 		$_SESSION["choix$i"] = '';
 	}
 	print '<tr><td>'. $langs->trans("TitleChoice") .' '.$j.' : </td><td><input type="text" name="choix[]" size="40" maxlength="40" value="'.dol_escape_htmltag($_SESSION["choix$i"]).'" id="choix'.$i.'">';
-	$tmparray=array('checkbox'=>$langs->trans("CheckBox"),'yesno'=>$langs->trans("YesNoList"),'foragainst'=>$langs->trans("PourContreList"));
-	print ' &nbsp; '.$langs->trans("Type").' '.$form->selectarray("typecolonne[]", $tmparray, $_SESSION["typecolonne$i"]);
+	$tmparray=array('checkbox'=>$langs->trans("CheckBox"),'yesno'=>$langs->trans("YesNoList"),'foragainst'=>$langs->trans("PourContreList"));
+	print ' &nbsp; '.$langs->trans("Type").' '.$form->selectarray("typecolonne[]", $tmparray, $_SESSION["typecolonne$i"]);
 	print '</td></tr>'."\n";
 }
 
diff --git a/htdocs/opensurvey/public/choix_date.php b/htdocs/opensurvey/public/choix_date.php
index 46d5377c432..f651a91899d 100755
--- a/htdocs/opensurvey/public/choix_date.php
+++ b/htdocs/opensurvey/public/choix_date.php
@@ -28,56 +28,56 @@ require_once(DOL_DOCUMENT_ROOT."/core/lib/admin.lib.php");
 require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php");
 require_once(DOL_DOCUMENT_ROOT."/opensurvey/fonctions.php");
 
-$origin=GETPOST('origin','alpha');
+$origin=GETPOST('origin','alpha');
 
 
 /*
  * Actions
  */
-
-// Insert survey
+
+// Insert survey
 if (GETPOST('confirmation') || GETPOST('confirmation_x'))
-{
+{
 	if (is_array($_SESSION['totalchoixjour']))
 	{
-		$nbofchoice=count($_SESSION["totalchoixjour"]);
+		$nbofchoice=count($_SESSION["totalchoixjour"]);
 		for ($i = 0; $i < $nbofchoice; $i++) 
-		{
-			if ($_SESSION["horaires$i"][0] == "" && $_SESSION["horaires$i"][1] == "" && $_SESSION["horaires$i"][2] == "" && $_SESSION["horaires$i"][3] == "" && $_SESSION["horaires$i"][4] == "") {
-				$choixdate.=",";
-				$choixdate .= $_SESSION["totalchoixjour"][$i];
-			} else {
-				for ($j=0;$j<$_SESSION["nbrecaseshoraires"];$j++) {
-					if ($_SESSION["horaires$i"][$j]!="") {
-						$choixdate.=",";
-						$choixdate .= $_SESSION["totalchoixjour"][$i];
-						$choixdate.="@";
-						// On remplace la virgule et l'arobase pour ne pas avoir de problème par la suite
-						$choixdate .= str_replace(array(',', '@'), array('&#44;', '&#64;'), $_SESSION["horaires$i"][$j]);
-					}
-				}
-			}
-		}
+		{
+			if ($_SESSION["horaires$i"][0] == "" && $_SESSION["horaires$i"][1] == "" && $_SESSION["horaires$i"][2] == "" && $_SESSION["horaires$i"][3] == "" && $_SESSION["horaires$i"][4] == "") {
+				$choixdate.=",";
+				$choixdate .= $_SESSION["totalchoixjour"][$i];
+			} else {
+				for ($j=0;$j<$_SESSION["nbrecaseshoraires"];$j++) {
+					if ($_SESSION["horaires$i"][$j]!="") {
+						$choixdate.=",";
+						$choixdate .= $_SESSION["totalchoixjour"][$i];
+						$choixdate.="@";
+						// On remplace la virgule et l'arobase pour ne pas avoir de problème par la suite
+						$choixdate .= str_replace(array(',', '@'), array('&#44;', '&#64;'), $_SESSION["horaires$i"][$j]);
+					}
+				}
+			}
+		}
 	}
-	else dol_print_error('','array not defined');
-
-	$_SESSION["toutchoix"]=substr("$choixdate",1);
-	ajouter_sondage($origin);
-}
+	else dol_print_error('','array not defined');
 
-// Reset days
-if (GETPOST('reset')) {
+	$_SESSION["toutchoix"]=substr("$choixdate",1);
+	ajouter_sondage($origin);
+}
+
+// Reset days
+if (GETPOST('reset')) {
 	$nbofchoice=count($_SESSION["totalchoixjour"]);
-	for ($i = 0; $i < $nbofchoice; $i++) {
-		for ($j = 0; $j < $_SESSION["nbrecaseshoraires"]; $j++) {
-			unset($_SESSION["horaires$i"][$j]);
-		}
-	}
-
-	unset($_SESSION["totalchoixjour"]);
-	unset($_SESSION["nbrecaseshoraires"]);
-}
-
+	for ($i = 0; $i < $nbofchoice; $i++) {
+		for ($j = 0; $j < $_SESSION["nbrecaseshoraires"]; $j++) {
+			unset($_SESSION["horaires$i"][$j]);
+		}
+	}
+
+	unset($_SESSION["totalchoixjour"]);
+	unset($_SESSION["nbrecaseshoraires"]);
+}
+
 
 
 /*
@@ -90,9 +90,9 @@ if (! isset($_SESSION['nom']) && ! isset($_SESSION['adresse']) && ! isset($_SESS
 	exit;
 }
 
-$arrayofjs=array();
-$arrayofcss=array('/opensurvey/css/style.css');
-llxHeaderSurvey($langs->trans("OpenSurvey"), "", 0, 0, $arrayofjs, $arrayofcss);
+$arrayofjs=array();
+$arrayofcss=array('/opensurvey/css/style.css');
+llxHeaderSurvey($langs->trans("OpenSurvey"), "", 0, 0, $arrayofjs, $arrayofcss);
 
 //nombre de cases par défaut
 if (! isset($_SESSION["nbrecaseshoraires"]))
@@ -205,8 +205,8 @@ $nbrejourmois = date("t", mktime(0, 0, 0, $_SESSION["mois"], 1, $_SESSION["annee
 $premierjourmois = date("N", mktime(0, 0, 0, $_SESSION["mois"], 1, $_SESSION["annee"])) - 1;
 
 //le format du sondage est DATE
-$_SESSION["formatsondage"] = "D";
-$_SESSION["formatcanedit"] = $_SESSION["canedit"];
+$_SESSION["formatsondage"] = "D";
+$_SESSION["formatcanedit"] = $_SESSION["canedit"];
 
 //traduction de la valeur du mois
 if (is_integer($_SESSION["mois"]) && $_SESSION["mois"] > 0 && $_SESSION["mois"] < 13)
@@ -223,7 +223,7 @@ else
 print '<form name="formulaire" action="choix_date.php" method="POST" onkeypress="javascript:process_keypress(event)">'."\n";
 print '<input type="hidden" name="origin" value="'.dol_escape_htmltag($origin).'">';
 
-print '<div class="bandeautitre">'. $langs->trans("CreatePoll")." (2 / 2)" .'</div>'."\n";
+print '<div class="bandeautitre">'. $langs->trans("CreatePoll")." (2 / 2)" .'</div>'."\n";
 
 //affichage de l'aide pour les jours
 print '<div class="bodydate">'."\n";
@@ -235,7 +235,7 @@ print '<center><div class="corps">'."\n";
 print '<table align=center>'."\n";
 print '<tr><td><input type="image" name="anneeavant" value="<<" src="images/rewind.png"></td><td><input type="image" name="moisavant" value="<" src="images/previous.png"></td>';
 print '<td width="150px" align="center"> '.$motmois.' '.$_SESSION["annee"].'<br>';
-print '<input type="image" name="retourmois" alt="'.dol_escape_htmltag($langs->trans("BackToCurrentMonth")).'" title="'.dol_escape_htmltag($langs->trans("BackToCurrentMonth")).'" value="" src="'.img_picto('', 'refresh','',0,1).'">';
+print '<input type="image" name="retourmois" alt="'.dol_escape_htmltag($langs->trans("BackToCurrentMonth")).'" title="'.dol_escape_htmltag($langs->trans("BackToCurrentMonth")).'" value="" src="'.img_picto('', 'refresh','',0,1).'">';
 print '</td><td><input type="image" name="moisapres" value=">" src="images/next.png"></td>';
 print '<td><input type="image" name="anneeapres" value=">>" src="images/fforward.png"></td><td></td><td></td><td></td><td></td><td></td><td>';
 print '</td></tr>'."\n";
@@ -594,7 +594,7 @@ print '</form>'."\n";
 print '<br><br><br><br>'."\n";
 print '</center></div>'."\n";
 
-llxFooterSurvey();
+llxFooterSurvey();
 
 $db->close();
 ?>
\ No newline at end of file
diff --git a/htdocs/opensurvey/public/create_survey.php b/htdocs/opensurvey/public/create_survey.php
index 2010a6fdd03..31d57975cc3 100755
--- a/htdocs/opensurvey/public/create_survey.php
+++ b/htdocs/opensurvey/public/create_survey.php
@@ -21,24 +21,24 @@
  *	\brief      Page to create a new survey
  */
 
-define("NOLOGIN",1);		// This means this output page does not require to be logged.
-define("NOCSRFCHECK",1);	// We accept to go on this page from external web site.
+define("NOLOGIN",1);		// This means this output page does not require to be logged.
+define("NOCSRFCHECK",1);	// We accept to go on this page from external web site.
 require_once('../../main.inc.php');
-require_once(DOL_DOCUMENT_ROOT."/core/lib/admin.lib.php");
-require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php");
+require_once(DOL_DOCUMENT_ROOT."/core/lib/admin.lib.php");
+require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php");
 require_once(DOL_DOCUMENT_ROOT."/opensurvey/fonctions.php");
 
-$langs->load("opensurvey");
+$langs->load("opensurvey");
 
 $origin=GETPOST('origin','alpha');
 
 
-// On teste toutes les variables pour supprimer l'ensemble des warnings PHP
-// On transforme en entites html les données afin éviter les failles XSS
-$post_var = array('titre', 'nom', 'adresse', 'commentaires', 'canedit', 'mailsonde', 'creation_sondage_date', 'creation_sondage_date_x', 'creation_sondage_autre', 'creation_sondage_autre_x');
+// On teste toutes les variables pour supprimer l'ensemble des warnings PHP
+// On transforme en entites html les données afin éviter les failles XSS
+$post_var = array('titre', 'nom', 'adresse', 'commentaires', 'canedit', 'mailsonde', 'creation_sondage_date', 'creation_sondage_date_x', 'creation_sondage_autre', 'creation_sondage_autre_x');
 foreach ($post_var as $var)
-{
-	$$var = GETPOST($var);
+{
+	$$var = GETPOST($var);
 }
 
 // On initialise egalement la session car sinon bonjour les warning :-)
@@ -101,9 +101,9 @@ if (GETPOST("creation_sondage_date") || GETPOST("creation_sondage_autre") || GET
  * View
  */
 
-$arrayofjs=array();
-$arrayofcss=array('/opensurvey/css/style.css');
-llxHeaderSurvey($langs->trans("OpenSurvey"), "", 0, 0, $arrayofjs, $arrayofcss);
+$arrayofjs=array();
+$arrayofcss=array('/opensurvey/css/style.css');
+llxHeaderSurvey($langs->trans("OpenSurvey"), "", 0, 0, $arrayofjs, $arrayofcss);
 
 
 print '<div class="bandeautitre">'. $langs->trans("CreatePoll").' (1 / 2)' .'</div>'."\n";
diff --git a/htdocs/opensurvey/public/exportcsv.php b/htdocs/opensurvey/public/exportcsv.php
index f933b37a317..5fded4f5d32 100755
--- a/htdocs/opensurvey/public/exportcsv.php
+++ b/htdocs/opensurvey/public/exportcsv.php
@@ -22,32 +22,32 @@
  */
 
 
-define("NOLOGIN",1);		// This means this output page does not require to be logged.
-define("NOCSRFCHECK",1);	// We accept to go on this page from external web site.
+define("NOLOGIN",1);		// This means this output page does not require to be logged.
+define("NOCSRFCHECK",1);	// We accept to go on this page from external web site.
 require_once('../../main.inc.php');
-require_once(DOL_DOCUMENT_ROOT."/core/lib/admin.lib.php");
-require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php");
-require_once(DOL_DOCUMENT_ROOT."/opensurvey/class/opensurveysondage.class.php");
+require_once(DOL_DOCUMENT_ROOT."/core/lib/admin.lib.php");
+require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php");
+require_once(DOL_DOCUMENT_ROOT."/opensurvey/class/opensurveysondage.class.php");
 
-$action=GETPOST('action');
-$numsondage = $numsondageadmin = '';
-if (GETPOST('sondage'))
-{
-	if (strlen(GETPOST('sondage')) == 24)	// recuperation du numero de sondage admin (24 car.) dans l'URL
-	{
-		$numsondageadmin=GETPOST("sondage",'alpha');
-		$numsondage=substr($numsondageadmin, 0, 16);
-	}
-	else
-	{
-		$numsondageadmin='';
-		$numsondage=GETPOST("sondage",'alpha');
-	}
+$action=GETPOST('action');
+$numsondage = $numsondageadmin = '';
+if (GETPOST('sondage'))
+{
+	if (strlen(GETPOST('sondage')) == 24)	// recuperation du numero de sondage admin (24 car.) dans l'URL
+	{
+		$numsondageadmin=GETPOST("sondage",'alpha');
+		$numsondage=substr($numsondageadmin, 0, 16);
+	}
+	else
+	{
+		$numsondageadmin='';
+		$numsondage=GETPOST("sondage",'alpha');
+	}
 }
 
-$object=new Opensurveysondage($db);
-$result=$object->fetch(0,$numsondage);
-if ($result <= 0) dol_print_error('','Failed to get survey id '.$numsondage);
+$object=new Opensurveysondage($db);
+$result=$object->fetch(0,$numsondage);
+if ($result <= 0) dol_print_error('','Failed to get survey id '.$numsondage);
 
 
 /*
@@ -122,8 +122,8 @@ if ($resql)
 			}
 			else if ($car == "2")
 			{
-				$input.='KO;';
-				$somme[$k]++;
+				$input.='KO;';
+				$somme[$k]++;
 			}
 			else
 			{
diff --git a/htdocs/opensurvey/public/index.php b/htdocs/opensurvey/public/index.php
index 557142d691d..3d5c81f9262 100755
--- a/htdocs/opensurvey/public/index.php
+++ b/htdocs/opensurvey/public/index.php
@@ -16,18 +16,18 @@
  */
 
 
-//if (! defined('NOREQUIREUSER'))  define('NOREQUIREUSER','1');
-//if (! defined('NOREQUIREDB'))    define('NOREQUIREDB','1');
-//if (! defined('NOREQUIRESOC'))   define('NOREQUIRESOC','1');
-//if (! defined('NOREQUIRETRAN'))  define('NOREQUIRETRAN','1');
-if (! defined('NOTOKENRENEWAL')) define('NOTOKENRENEWAL','1');
-if (! defined('NOREQUIREMENU'))  define('NOREQUIREMENU','1'); // If there is no menu to show
-if (! defined('NOREQUIREHTML'))  define('NOREQUIREHTML','1'); // If we don't need to load the html.form.class.php
-if (! defined('NOREQUIREAJAX'))  define('NOREQUIREAJAX','1');
-define("NOLOGIN",1);		// This means this output page does not require to be logged.
-define("NOCSRFCHECK",1);	// We accept to go on this page from external web site.
+//if (! defined('NOREQUIREUSER'))  define('NOREQUIREUSER','1');
+//if (! defined('NOREQUIREDB'))    define('NOREQUIREDB','1');
+//if (! defined('NOREQUIRESOC'))   define('NOREQUIRESOC','1');
+//if (! defined('NOREQUIRETRAN'))  define('NOREQUIRETRAN','1');
+if (! defined('NOTOKENRENEWAL')) define('NOTOKENRENEWAL','1');
+if (! defined('NOREQUIREMENU'))  define('NOREQUIREMENU','1'); // If there is no menu to show
+if (! defined('NOREQUIREHTML'))  define('NOREQUIREHTML','1'); // If we don't need to load the html.form.class.php
+if (! defined('NOREQUIREAJAX'))  define('NOREQUIREAJAX','1');
+define("NOLOGIN",1);		// This means this output page does not require to be logged.
+define("NOCSRFCHECK",1);	// We accept to go on this page from external web site.
 require_once('../../main.inc.php');
-require_once(DOL_DOCUMENT_ROOT."/core/lib/admin.lib.php");
+require_once(DOL_DOCUMENT_ROOT."/core/lib/admin.lib.php");
 require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php");
 require_once(DOL_DOCUMENT_ROOT."/opensurvey/fonctions.php");
 
@@ -46,15 +46,15 @@ llxHeaderSurvey($langs->trans("OpenSurvey"), "", 0, 0, $arrayofjs, $arrayofcss);
 
 print '<center>
 <form name="formulaire" action="create_survey.php" method="POST">
-<input type="hidden" name="origin" value="'.dol_escape_htmltag($origin).'">
-<div id="interface-header" style="">
-<p id="application-description" class="pp-gris-fonce2">'.$langs->trans("OpenSurveyDesc").' '.$langs->trans("OpenSurveyNoRegistration").'</p>
+<input type="hidden" name="origin" value="'.dol_escape_htmltag($origin).'">
+<div id="interface-header" style="">
+<p id="application-description" class="pp-gris-fonce2">'.$langs->trans("OpenSurveyDesc").' '.$langs->trans("OpenSurveyNoRegistration").'</p>
 </div><br>';
-print $langs->trans("OrganizeYourMeetingEasily").'
-<div class="corps">
-<br>
-<div class="index_date"><div><img class="opacity" src="images/date.png" onclick="document.formulaire.date.click()"></div><button id="date" name="choix_sondage" value="date" type="submit" class="button orange bigrounded"><img src="images/calendar-32.png" alt=""><strong>&nbsp;Créer un sondage spécial dates</strong></button></div><div class="index_sondage"><div><img class="opacity" src="images/sondage2.png" onclick="document.formulaire.autre.click()"></div><button id="autre" name="choix_sondage" value="autre" type="submit" class="button blue bigrounded"><img src="images/chart-32.png" alt=""><strong>&nbsp;Créer un sondage classique</strong></button></div><div style="clear:both;"></div>
-</div>
+print $langs->trans("OrganizeYourMeetingEasily").'
+<div class="corps">
+<br>
+<div class="index_date"><div><img class="opacity" src="images/date.png" onclick="document.formulaire.date.click()"></div><button id="date" name="choix_sondage" value="date" type="submit" class="button orange bigrounded"><img src="images/calendar-32.png" alt=""><strong>&nbsp;Créer un sondage spécial dates</strong></button></div><div class="index_sondage"><div><img class="opacity" src="images/sondage2.png" onclick="document.formulaire.autre.click()"></div><button id="autre" name="choix_sondage" value="autre" type="submit" class="button blue bigrounded"><img src="images/chart-32.png" alt=""><strong>&nbsp;Créer un sondage classique</strong></button></div><div style="clear:both;"></div>
+</div>
 </form></center>';
 
 llxFooterSurvey();
diff --git a/htdocs/opensurvey/public/studs.php b/htdocs/opensurvey/public/studs.php
index 9da1c4f79cb..62e78f172ee 100755
--- a/htdocs/opensurvey/public/studs.php
+++ b/htdocs/opensurvey/public/studs.php
@@ -26,32 +26,32 @@ define("NOCSRFCHECK",1);	// We accept to go on this page from external web site.
 require_once('../../main.inc.php');
 require_once(DOL_DOCUMENT_ROOT."/core/lib/admin.lib.php");
 require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php");
-require_once(DOL_DOCUMENT_ROOT."/opensurvey/class/opensurveysondage.class.php");
+require_once(DOL_DOCUMENT_ROOT."/opensurvey/class/opensurveysondage.class.php");
 require_once(DOL_DOCUMENT_ROOT."/opensurvey/fonctions.php");
 
 
 // Init vars
 $action=GETPOST('action');
-$numsondage = $numsondageadmin = '';
-if (GETPOST('sondage'))
-{
-	if (strlen(GETPOST('sondage')) == 24)	// recuperation du numero de sondage admin (24 car.) dans l'URL
-	{
-		$numsondageadmin=GETPOST("sondage",'alpha');
-		$numsondage=substr($numsondageadmin, 0, 16);
-	}
-	else
-	{
-		$numsondageadmin='';
-		$numsondage=GETPOST("sondage",'alpha');
-	}
-}
+$numsondage = $numsondageadmin = '';
+if (GETPOST('sondage'))
+{
+	if (strlen(GETPOST('sondage')) == 24)	// recuperation du numero de sondage admin (24 car.) dans l'URL
+	{
+		$numsondageadmin=GETPOST("sondage",'alpha');
+		$numsondage=substr($numsondageadmin, 0, 16);
+	}
+	else
+	{
+		$numsondageadmin='';
+		$numsondage=GETPOST("sondage",'alpha');
+	}
+}
 
 $object=new Opensurveysondage($db);
 $result=$object->fetch(0,$numsondage);
 if ($result <= 0) dol_print_error('','Failed to get survey id '.$numsondage);
 
-$nblignes=count($object->fetch_lines());
+$nblignes=count($object->fetch_lines());
 
 
 /*
@@ -60,7 +60,7 @@ $nblignes=count($object->fetch_lines());
 
 $nbcolonnes = substr_count($object->sujet, ',') + 1;
 
-$listofvoters=explode(',',$_SESSION["savevoter"]);
+$listofvoters=explode(',',$_SESSION["savevoter"]);
 
 // Add comment
 if (GETPOST('ajoutcomment'))
@@ -106,7 +106,7 @@ if (isset($_POST["boutonp"]) || isset($_POST["boutonp_x"]))
 			}
 			else if (isset($_POST["choix$i"]) && $_POST["choix$i"] == '2')
 			{
-				$nouveauchoix.="2";
+				$nouveauchoix.="2";
 			}
 			else { // sinon c'est 0
 				$nouveauchoix.="0";
@@ -134,7 +134,7 @@ if (isset($_POST["boutonp"]) || isset($_POST["boutonp_x"]))
 			{
 				// Add voter to session
 				$_SESSION["savevoter"]=$nom.','.(empty($_SESSION["savevoter"])?'':$_SESSION["savevoter"]);	// Save voter
-				$listofvoters=explode(',',$_SESSION["savevoter"]);
+				$listofvoters=explode(',',$_SESSION["savevoter"]);
 
 				if (! empty($object->mailsonde))
 				{
@@ -162,62 +162,62 @@ if (isset($_POST["boutonp"]) || isset($_POST["boutonp_x"]))
 
 
 // Update vote
-$testmodifier = false;
-$testligneamodifier = false;
-$ligneamodifier = -1;
-for ($i=0; $i<$nblignes; $i++)
-{
-	if (isset($_POST['modifierligne'.$i]))
-	{
-		$ligneamodifier=$i;
-		$testligneamodifier=true;
-	}
-
-	//test pour voir si une ligne est a modifier
-	if (isset($_POST['validermodifier'.$i]))
-	{
-		$modifier=$i;
-		$testmodifier=true;
-	}
+$testmodifier = false;
+$testligneamodifier = false;
+$ligneamodifier = -1;
+for ($i=0; $i<$nblignes; $i++)
+{
+	if (isset($_POST['modifierligne'.$i]))
+	{
+		$ligneamodifier=$i;
+		$testligneamodifier=true;
+	}
+
+	//test pour voir si une ligne est a modifier
+	if (isset($_POST['validermodifier'.$i]))
+	{
+		$modifier=$i;
+		$testmodifier=true;
+	}
 }
 
 if ($testmodifier)
 {
-	//var_dump($_POST);exit;
-	$nouveauchoix = '';
-	for ($i=0;$i<$nbcolonnes;$i++)
+	//var_dump($_POST);exit;
+	$nouveauchoix = '';
+	for ($i=0;$i<$nbcolonnes;$i++)
 	{
-		//var_dump($_POST["choix$i"]);
-		if (isset($_POST["choix$i"]) && $_POST["choix$i"] == '1')
-		{
-			$nouveauchoix.="1";
-		}
-		else if (isset($_POST["choix$i"]) && $_POST["choix$i"] == '2')
-		{
-			$nouveauchoix.="2";
-		}
-		else { // sinon c'est 0
-			$nouveauchoix.="0";
-		}
-	}
+		//var_dump($_POST["choix$i"]);
+		if (isset($_POST["choix$i"]) && $_POST["choix$i"] == '1')
+		{
+			$nouveauchoix.="1";
+		}
+		else if (isset($_POST["choix$i"]) && $_POST["choix$i"] == '2')
+		{
+			$nouveauchoix.="2";
+		}
+		else { // sinon c'est 0
+			$nouveauchoix.="0";
+		}
+	}
 
-	$idtomodify=$_POST["idtomodify".$modifier];
-	$sql = 'UPDATE '.MAIN_DB_PREFIX."opensurvey_user_studs";
-	$sql.= " SET reponses = '".$db->escape($nouveauchoix)."'";
-	$sql.= " WHERE id_users = '".$db->escape($idtomodify)."'";
-
-	dol_syslog("sql=".$sql);
-	$resql = $db->query($sql);
-	if (! $resql) dol_print_error($db);
+	$idtomodify=$_POST["idtomodify".$modifier];
+	$sql = 'UPDATE '.MAIN_DB_PREFIX."opensurvey_user_studs";
+	$sql.= " SET reponses = '".$db->escape($nouveauchoix)."'";
+	$sql.= " WHERE id_users = '".$db->escape($idtomodify)."'";
+
+	dol_syslog("sql=".$sql);
+	$resql = $db->query($sql);
+	if (! $resql) dol_print_error($db);
 }
 
-// Delete comment
-$idcomment=GETPOST('deletecomment','int');
-if ($idcomment)
-{
-	$sql = 'DELETE FROM '.MAIN_DB_PREFIX.'opensurvey_comments WHERE id_comment = '.$idcomment;
-	$resql = $db->query($sql);
-}
+// Delete comment
+$idcomment=GETPOST('deletecomment','int');
+if ($idcomment)
+{
+	$sql = 'DELETE FROM '.MAIN_DB_PREFIX.'opensurvey_comments WHERE id_comment = '.$idcomment;
+	$resql = $db->query($sql);
+}
 
 
 
@@ -228,21 +228,21 @@ if ($idcomment)
 $form=new Form($db);
 $object=new OpenSurveySondage($db);
 
-$result=$object->fetch(0,$numsondage);
-if ($result <= 0)
-{
-	print $langs->trans("ErrorRecordNotFound");
-	llxFooterSurvey();
-	exit;
+$result=$object->fetch(0,$numsondage);
+if ($result <= 0)
+{
+	print $langs->trans("ErrorRecordNotFound");
+	llxFooterSurvey();
+	exit;
 }
 
-$arrayofjs=array();
-$arrayofcss=array('/opensurvey/css/style.css');
-llxHeaderSurvey($object->titre, "", 0, 0, $arrayofjs, $arrayofcss);
-
+$arrayofjs=array();
+$arrayofcss=array('/opensurvey/css/style.css');
+llxHeaderSurvey($object->titre, "", 0, 0, $arrayofjs, $arrayofcss);
 
-// Define format of choices
-$toutsujet=explode(",",$object->sujet);
+
+// Define format of choices
+$toutsujet=explode(",",$object->sujet);
 $listofanswers=array();
 foreach ($toutsujet as $value)
 {
@@ -253,7 +253,7 @@ $toutsujet=str_replace("°","'",$toutsujet);
 
 
 print '<div class="survey_invitation">'.$langs->trans("YouAreInivitedToVote").'</div>';
-print $langs->trans("OpenSurveyHowTo").'<br><br>';
+print $langs->trans("OpenSurveyHowTo").'<br><br>';
 
 print '<div class="corps"> '."\n";
 
@@ -657,12 +657,12 @@ for ($i = 0; $i < $nbcolonnes; $i++) {
 		if ($object->format=="D"||$object->format=="D+") {
 			$meilleursujetexport = $toutsujet[$i];
 
-			if (strpos($toutsujet[$i], '@') !== false) {
-				$toutsujetdate = explode("@", $toutsujet[$i]);
-				$meilleursujet .= dol_print_date($toutsujetdate[0],'daytext'). ' ('.dol_print_date($toutsujetdate[0],'%A').')' . _("for")  . ' ' . $toutsujetdate[1];
-			} else {
-				$meilleursujet .= dol_print_date($toutsujet[$i],'daytext'). ' ('.dol_print_date($toutsujet[$i],'%A').')';
-			}
+			if (strpos($toutsujet[$i], '@') !== false) {
+				$toutsujetdate = explode("@", $toutsujet[$i]);
+				$meilleursujet .= dol_print_date($toutsujetdate[0],'daytext'). ' ('.dol_print_date($toutsujetdate[0],'%A').')' . _("for")  . ' ' . $toutsujetdate[1];
+			} else {
+				$meilleursujet .= dol_print_date($toutsujet[$i],'daytext'). ' ('.dol_print_date($toutsujet[$i],'%A').')';
+			}
 		}
 		else
 		{
@@ -696,52 +696,52 @@ if ($nbofcheckbox >= 2)
 print '<br>';
 
 
-// Comment list
-$sql = 'SELECT id_comment, usercomment, comment';
-$sql.= ' FROM '.MAIN_DB_PREFIX.'opensurvey_comments';
-$sql.= " WHERE id_sondage='".$db->escape($numsondage)."'";
-$sql.= " ORDER BY id_comment";
-$resql = $db->query($sql);
-$num_rows=$db->num_rows($resql);
-if ($num_rows > 0)
-{
-	$i = 0;
+// Comment list
+$sql = 'SELECT id_comment, usercomment, comment';
+$sql.= ' FROM '.MAIN_DB_PREFIX.'opensurvey_comments';
+$sql.= " WHERE id_sondage='".$db->escape($numsondage)."'";
+$sql.= " ORDER BY id_comment";
+$resql = $db->query($sql);
+$num_rows=$db->num_rows($resql);
+if ($num_rows > 0)
+{
+	$i = 0;
 	print "<br><b>" . $langs->trans("CommentsOfVoters") . " :</b><br>\n";
-	while ( $i < $num_rows)
-	{
+	while ( $i < $num_rows)
+	{
 		$obj=$db->fetch_object($resql);
-		print '<div class="comment"><span class="usercomment">';
+		print '<div class="comment"><span class="usercomment">';
 		if (in_array($obj->usercomment, $listofvoters)) print '<a href="'.$_SERVER["PHP_SELF"].'?deletecomment='.$obj->id_comment.'&sondage='.$numsondage.'"> '.img_picto('', 'delete.png').'</a> ';
-		print $obj->usercomment.' :</span> <span class="comment">'.dol_nl2br($obj->comment)."</span></div>";
-		$i++;
-	}
-}
+		print $obj->usercomment.' :</span> <span class="comment">'.dol_nl2br($obj->comment)."</span></div>";
+		$i++;
+	}
+}
 
 // Form to add comment
 print '<div class="addcomment">' .$langs->trans("AddACommentForPoll") . "<br>\n";
 
 print '<textarea name="comment" rows="2" cols="60"></textarea><br>'."\n";
-print $langs->trans("Name") .' : ';
-print '<input type="text" name="commentuser" maxlength="64" /> &nbsp; '."\n";
+print $langs->trans("Name") .' : ';
+print '<input type="text" name="commentuser" maxlength="64" /> &nbsp; '."\n";
 print '<input type="submit" class="button" name="ajoutcomment" value="'.dol_escape_htmltag($langs->trans("AddComment")).'"><br>'."\n";
 print '</form>'."\n";
 
 print '</div>'."\n";	// div add comment
 
-print '<br><br>';
+print '<br><br>';
 
 /*
-// Define $urlwithroot
-$urlwithouturlroot=preg_replace('/'.preg_quote(DOL_URL_ROOT,'/').'$/i','',trim($dolibarr_main_url_root));
-$urlwithroot=$urlwithouturlroot.DOL_URL_ROOT;		// This is to use external domain name found into config file
-//$urlwithroot=DOL_MAIN_URL_ROOT;					// This is to use same domain name than current
-
-$message='';
-$url=$urlwithouturlroot.dol_buildpath('/opensurvey/public/studs.php',1).'?sondage='.$numsondage;
-$urlvcal='<a href="'.$url.'" target="_blank">'.$url.'</a>';
-$message.=img_picto('','object_globe.png').' '.$langs->trans("UrlForSurvey").': '.$urlvcal;
-
-print '<center>'.$message.'</center>';
+// Define $urlwithroot
+$urlwithouturlroot=preg_replace('/'.preg_quote(DOL_URL_ROOT,'/').'$/i','',trim($dolibarr_main_url_root));
+$urlwithroot=$urlwithouturlroot.DOL_URL_ROOT;		// This is to use external domain name found into config file
+//$urlwithroot=DOL_MAIN_URL_ROOT;					// This is to use same domain name than current
+
+$message='';
+$url=$urlwithouturlroot.dol_buildpath('/opensurvey/public/studs.php',1).'?sondage='.$numsondage;
+$urlvcal='<a href="'.$url.'" target="_blank">'.$url.'</a>';
+$message.=img_picto('','object_globe.png').' '.$langs->trans("UrlForSurvey").': '.$urlvcal;
+
+print '<center>'.$message.'</center>';
 */
 
 
diff --git a/htdocs/product/class/product.class.php b/htdocs/product/class/product.class.php
index c44b8907be5..98236be4778 100644
--- a/htdocs/product/class/product.class.php
+++ b/htdocs/product/class/product.class.php
@@ -1853,7 +1853,7 @@ class Product extends CommonObject
 	function del_sousproduit($fk_parent, $fk_child)
 	{
 		if (! is_numeric($fk_parent)) $fk_parent=0;
-		if (! is_numeric($fk_child)) $fk_child=0;
+		if (! is_numeric($fk_child)) $fk_child=0;
 
 		$sql = "DELETE FROM ".MAIN_DB_PREFIX."product_association";
 		$sql.= " WHERE fk_product_pere  = ".$fk_parent;
@@ -2142,7 +2142,7 @@ class Product extends CommonObject
 				$id=(! empty($desc_pere[0]) ? $desc_pere[0] :'');
 				$nb=(! empty($desc_pere[1]) ? $desc_pere[1] :'');
 				$type=(! empty($desc_pere[2]) ? $desc_pere[2] :'');
-				$label=(! empty($desc_pere[3]) ? $desc_pere[3] :'');
+				$label=(! empty($desc_pere[3]) ? $desc_pere[3] :'');
 				if ($multiply < 1) $multiply=1;
 
 				//print "XXX We add id=".$id." - label=".$label." - nb=".$nb." - multiply=".$multiply." fullpath=".$compl_path.$label."\n";
@@ -2388,9 +2388,9 @@ class Product extends CommonObject
 			$lien = '<a href="'.DOL_URL_ROOT.'/product/composition/fiche.php?id='.$this->id.'">';
 			$lienfin='</a>';
         }
-        else if ($option == 'category')
-        {
-        	$lien = '<a href="'.DOL_URL_ROOT.'/categories/categorie.php?id='.$this->id.'&type=0">';
+        else if ($option == 'category')
+        {
+        	$lien = '<a href="'.DOL_URL_ROOT.'/categories/categorie.php?id='.$this->id.'&type=0">';
         }
         else
 		{
diff --git a/htdocs/projet/activity/index.php b/htdocs/projet/activity/index.php
index f7b5fa76650..f011c39f63c 100644
--- a/htdocs/projet/activity/index.php
+++ b/htdocs/projet/activity/index.php
@@ -66,7 +66,7 @@ else
 }
 
 
-print '<div class="fichecenter"><div class="fichethirdleft">';
+print '<div class="fichecenter"><div class="fichethirdleft">';
 
 
 print_projecttasks_array($db,$socid,$projectsListId,$mine);
diff --git a/htdocs/public/demo/index.php b/htdocs/public/demo/index.php
index a99366d9a36..d48b0effe6b 100644
--- a/htdocs/public/demo/index.php
+++ b/htdocs/public/demo/index.php
@@ -33,11 +33,11 @@ $langs->load("main");
 $langs->load("install");
 $langs->load("other");
 
-$conf->dol_hide_topmenu=GETPOST('dol_hide_topmenu');
-$conf->dol_hide_leftmenu=GETPOST('dol_hide_leftmenu');
-$conf->dol_optimize_smallscreen=GETPOST('dol_optimize_smallscreen');
-$conf->dol_no_mouse_hover=GETPOST('dol_no_mouse_hover');
-$conf->dol_use_jmobile=GETPOST('dol_use_jmobile');
+$conf->dol_hide_topmenu=GETPOST('dol_hide_topmenu');
+$conf->dol_hide_leftmenu=GETPOST('dol_hide_leftmenu');
+$conf->dol_optimize_smallscreen=GETPOST('dol_optimize_smallscreen');
+$conf->dol_no_mouse_hover=GETPOST('dol_no_mouse_hover');
+$conf->dol_use_jmobile=GETPOST('dol_use_jmobile');
 
 // Security check
 global $dolibarr_main_demo;
@@ -47,8 +47,8 @@ if (empty($dolibarr_main_demo)) accessforbidden('Parameter dolibarr_main_demo mu
 $res=$hookmanager->initHooks(array('demo'));
 
 $demoprofiles=array();
-$alwayscheckedmodules=array();
-$alwaysuncheckedmodules=array();
+$alwayscheckedmodules=array();
+$alwaysuncheckedmodules=array();
 $alwayshiddencheckedmodules=array();
 $alwayshiddenuncheckedmodules=array();
 
@@ -228,12 +228,12 @@ if (GETPOST("action") == 'gotodemo')
     // Do redirect to login page
 	if ($disablestring)
 	{
-		$url='';
-		$url.=($url?'&':'').($conf->dol_hide_topmenu?'dol_hide_topmenu='.$conf->dol_hide_topmenu:'');
-		$url.=($url?'&':'').($conf->dol_hide_leftmenu?'dol_hide_leftmenu='.$conf->dol_hide_leftmenu:'');
-		$url.=($url?'&':'').($conf->dol_optimize_smallscreen?'dol_optimize_smallscreen='.$conf->dol_optimize_smallscreen:'');
-		$url.=($url?'&':'').($conf->dol_no_mouse_hover?'dol_no_mouse_hover='.$conf->dol_no_mouse_hover:'');
-		$url.=($url?'&':'').($conf->dol_use_jmobile?'dol_use_jmobile='.$conf->dol_use_jmobile:'');
+		$url='';
+		$url.=($url?'&':'').($conf->dol_hide_topmenu?'dol_hide_topmenu='.$conf->dol_hide_topmenu:'');
+		$url.=($url?'&':'').($conf->dol_hide_leftmenu?'dol_hide_leftmenu='.$conf->dol_hide_leftmenu:'');
+		$url.=($url?'&':'').($conf->dol_optimize_smallscreen?'dol_optimize_smallscreen='.$conf->dol_optimize_smallscreen:'');
+		$url.=($url?'&':'').($conf->dol_no_mouse_hover?'dol_no_mouse_hover='.$conf->dol_no_mouse_hover:'');
+		$url.=($url?'&':'').($conf->dol_use_jmobile?'dol_use_jmobile='.$conf->dol_use_jmobile:'');
 		if (GETPOST('urlfrom')) $url.=($url?'&':'').'urlfrom='.urlencode(GETPOST('urlfrom','alpha'));
 		$url=DOL_URL_ROOT.'/index.php?'.($url?$url.'&':'').'disablemodules='.$disablestring;
 		header("Location: ".$url);
@@ -247,60 +247,60 @@ if (GETPOST("action") == 'gotodemo')
  */
 
 $head='';
-$head.='<meta name="keywords" content="dolibarr,demo,online,demonstration,example,test,web,erp,crm,demos,online">'."\n";
-$head.='<meta name="description" content="Dolibarr simple ERP/CRM demo. You can test here several profiles of Dolibarr ERP/CRM demos.">'."\n";
-$head.='<style type="text/css">'."\n";
-$head.='.body { font: 12px arial,verdana,helvetica !important; }'."\n";
-$head.='.CTable {
-padding: 6px;
-font: 12px arial,verdana,helvetica;
-font-weight: normal;
-color: #444444 !important;
- 
-margin: 8px 0px 8px 2px;
- 
-border-left: 1px solid #DDD;
-border-right: 1px solid #DDD;
-border-bottom: 1px solid #EEE;
-border-radius: 8px;
--moz-border-radius: 8px;
- 
--moz-box-shadow: 4px 4px 4px #EEE;
--webkit-box-shadow: 4px 4px 4px #EEE;
-box-shadow: 4px 4px 4px #EEE;
- 
-background-image: linear-gradient(bottom, rgb(246,248,250) 15%, rgb(235,235,238) 100%);
-background-image: -o-linear-gradient(bottom, rgb(246,248,250) 15%, rgb(235,235,238) 100%);
-background-image: -moz-linear-gradient(bottom, rgb(246,248,250) 15%, rgb(235,235,238) 100%);
-background-image: -webkit-linear-gradient(bottom, rgb(246,248,250) 15%, rgb(235,235,238) 100%);
-background-image: -ms-linear-gradient(bottom, rgb(246,248,250) 15%, rgb(235,235,238) 100%);
- 
-}
+$head.='<meta name="keywords" content="dolibarr,demo,online,demonstration,example,test,web,erp,crm,demos,online">'."\n";
+$head.='<meta name="description" content="Dolibarr simple ERP/CRM demo. You can test here several profiles of Dolibarr ERP/CRM demos.">'."\n";
+$head.='<style type="text/css">'."\n";
+$head.='.body { font: 12px arial,verdana,helvetica !important; }'."\n";
+$head.='.CTable {
+padding: 6px;
+font: 12px arial,verdana,helvetica;
+font-weight: normal;
+color: #444444 !important;
+ 
+margin: 8px 0px 8px 2px;
+ 
+border-left: 1px solid #DDD;
+border-right: 1px solid #DDD;
+border-bottom: 1px solid #EEE;
+border-radius: 8px;
+-moz-border-radius: 8px;
+ 
+-moz-box-shadow: 4px 4px 4px #EEE;
+-webkit-box-shadow: 4px 4px 4px #EEE;
+box-shadow: 4px 4px 4px #EEE;
+ 
+background-image: linear-gradient(bottom, rgb(246,248,250) 15%, rgb(235,235,238) 100%);
+background-image: -o-linear-gradient(bottom, rgb(246,248,250) 15%, rgb(235,235,238) 100%);
+background-image: -moz-linear-gradient(bottom, rgb(246,248,250) 15%, rgb(235,235,238) 100%);
+background-image: -webkit-linear-gradient(bottom, rgb(246,248,250) 15%, rgb(235,235,238) 100%);
+background-image: -ms-linear-gradient(bottom, rgb(246,248,250) 15%, rgb(235,235,238) 100%);
+ 
+}
 </style>
 
-<script type="text/javascript">
-var openedId="";
-jQuery(document).ready(function () {
-jQuery("tr.moduleline").hide();
-// Enable this to allow personalized setup
-jQuery(".modulelineshow").attr("href","#");
-jQuery(".cursorpointer").css("cursor","pointer");
-jQuery(".modulelineshow").click(function() {
-var idstring=$(this).attr("id");
-if (typeof idstring != "undefined")
-{
-var currentId = idstring.substring(2);
-jQuery("tr.moduleline").hide();
-if (currentId != openedId)
-{
-openedId=currentId;
-jQuery("#tr1"+currentId).show();
-jQuery("#tr2"+currentId).show();
-}
-else openedId = "";
-}
-});
-});
+<script type="text/javascript">
+var openedId="";
+jQuery(document).ready(function () {
+jQuery("tr.moduleline").hide();
+// Enable this to allow personalized setup
+jQuery(".modulelineshow").attr("href","#");
+jQuery(".cursorpointer").css("cursor","pointer");
+jQuery(".modulelineshow").click(function() {
+var idstring=$(this).attr("id");
+if (typeof idstring != "undefined")
+{
+var currentId = idstring.substring(2);
+jQuery("tr.moduleline").hide();
+if (currentId != openedId)
+{
+openedId=currentId;
+jQuery("#tr1"+currentId).show();
+jQuery("#tr2"+currentId).show();
+}
+else openedId = "";
+}
+});
+});
 </script>';
 
 llxHeaderVierge($langs->trans("DolibarrDemo"), $head);
diff --git a/htdocs/public/emailing/mailing-read.php b/htdocs/public/emailing/mailing-read.php
index e44342278f0..81d218cec78 100644
--- a/htdocs/public/emailing/mailing-read.php
+++ b/htdocs/public/emailing/mailing-read.php
@@ -26,10 +26,10 @@
  */
 
 if (! defined('NOLOGIN'))        define("NOLOGIN",1);			// This means this output page does not require to be logged.
-if (! defined('NOREQUIRETRAN'))  define('NOREQUIRETRAN','1');
-if (! defined('NOCSRFCHECK'))    define('NOCSRFCHECK','1');		// Do not check anti CSRF attack test
-if (! defined('NOTOKENRENEWAL')) define('NOTOKENRENEWAL','1');	// Do not check anti POST attack test
-if (! defined('NOREQUIREMENU'))  define('NOREQUIREMENU','1');	// If there is no need to load and show top and left menu
+if (! defined('NOREQUIRETRAN'))  define('NOREQUIRETRAN','1');
+if (! defined('NOCSRFCHECK'))    define('NOCSRFCHECK','1');		// Do not check anti CSRF attack test
+if (! defined('NOTOKENRENEWAL')) define('NOTOKENRENEWAL','1');	// Do not check anti POST attack test
+if (! defined('NOREQUIREMENU'))  define('NOREQUIREMENU','1');	// If there is no need to load and show top and left menu
 
 /**
  * Header empty
@@ -55,13 +55,13 @@ $securitykey=GETPOST('securitykey');
  * Actions
  */
 
-dol_syslog("public/emailing/mailing-read.php : tag=".$tag." securitykey=".$securitykey, LOG_DEBUG);
-
+dol_syslog("public/emailing/mailing-read.php : tag=".$tag." securitykey=".$securitykey, LOG_DEBUG);
+
 if ($securitykey != $conf->global->MAILING_EMAIL_UNSUBSCRIBE_KEY)
 {
 	print 'Bad security key value.';
 	exit;
-}
+}
 
 if (! empty($tag))
 {
diff --git a/htdocs/public/emailing/mailing-unsubscribe.php b/htdocs/public/emailing/mailing-unsubscribe.php
index 8585b19cd4a..3f86685fad3 100644
--- a/htdocs/public/emailing/mailing-unsubscribe.php
+++ b/htdocs/public/emailing/mailing-unsubscribe.php
@@ -25,16 +25,16 @@
  *      \brief      Script use to update unsubcribe contact to prospect mailing list
  */
 
-if (! defined('NOLOGIN'))        define("NOLOGIN",1);			// This means this output page does not require to be logged.
-if (! defined('NOCSRFCHECK'))    define('NOCSRFCHECK','1');		// Do not check anti CSRF attack test
-if (! defined('NOREQUIREMENU'))  define('NOREQUIREMENU','1');	// If there is no need to load and show top and left menu
+if (! defined('NOLOGIN'))        define("NOLOGIN",1);			// This means this output page does not require to be logged.
+if (! defined('NOCSRFCHECK'))    define('NOCSRFCHECK','1');		// Do not check anti CSRF attack test
+if (! defined('NOREQUIREMENU'))  define('NOREQUIREMENU','1');	// If there is no need to load and show top and left menu
 
-/**
- * Header empty
- *
- * @return	void
- */
-function llxHeader() { }
+/**
+ * Header empty
+ *
+ * @return	void
+ */
+function llxHeader() { }
 /**
  * Footer empty
  *
@@ -53,15 +53,15 @@ $langs->load("mails");
 
 $tag=GETPOST('tag');
 $unsuscrib=GETPOST('unsuscrib');
-$securitykey=GETPOST('securitykey');
+$securitykey=GETPOST('securitykey');
 
 
 /*
  * Actions
  */
 
-dol_syslog("public/emailing/mailing-read.php : tag=".$tag." securitykey=".$securitykey, LOG_DEBUG);
-
+dol_syslog("public/emailing/mailing-read.php : tag=".$tag." securitykey=".$securitykey, LOG_DEBUG);
+
 if ($securitykey != $conf->global->MAILING_EMAIL_UNSUBSCRIBE_KEY)
 {
 	print 'Bad security key value.';
diff --git a/htdocs/public/offline.php b/htdocs/public/offline.php
index d97c8e6e7f3..a52b446b4bb 100644
--- a/htdocs/public/offline.php
+++ b/htdocs/public/offline.php
@@ -23,8 +23,8 @@
  *	\brief      Dolibarr offline page
  */
 
-define('NOCSRFCHECK',1);
-define('NOLOGIN',1);		
+define('NOCSRFCHECK',1);
+define('NOLOGIN',1);		
 
 require '../main.inc.php';
 
diff --git a/htdocs/public/paybox/paymentko.php b/htdocs/public/paybox/paymentko.php
index 24be3c5af6f..c4457ff4d93 100644
--- a/htdocs/public/paybox/paymentko.php
+++ b/htdocs/public/paybox/paymentko.php
@@ -63,29 +63,29 @@ foreach($_POST as $k => $v) $tracepost .= "{$k} - {$v}\n";
 dol_syslog("POST=".$tracepost, LOG_DEBUG, 0, '_paybox');
 
 
-// Send an email
-if (! empty($conf->global->MEMBER_PAYONLINE_SENDEMAIL) && preg_match('/MEM=',$fulltag))
-{
-	$sendto=$conf->global->MEMBER_PAYONLINE_SENDEMAIL;
-	$from=$conf->global->MAILING_EMAIL_FROM;
-	require_once DOL_DOCUMENT_ROOT.'/core/class/CMailFile.class.php';
+// Send an email
+if (! empty($conf->global->MEMBER_PAYONLINE_SENDEMAIL) && preg_match('/MEM=',$fulltag))
+{
+	$sendto=$conf->global->MEMBER_PAYONLINE_SENDEMAIL;
+	$from=$conf->global->MAILING_EMAIL_FROM;
+	require_once DOL_DOCUMENT_ROOT.'/core/class/CMailFile.class.php';
 	$mailfile = new CMailFile(
-		'New subscription payed',
-		$sendto,
+		'New subscription payed',
+		$sendto,
 		$from,
 		'New subscription payed '.$fulltag
-		);
+		);
 
-	$result=$mailfile->sendfile();
-	if ($result)
-	{
-		dol_syslog("EMail sent to ".$sendto);
-	}
-	else
-	{
-		dol_syslog("Failed to send EMail to ".$sendto, LOG_ERR);
-	}
-}
+	$result=$mailfile->sendfile();
+	if ($result)
+	{
+		dol_syslog("EMail sent to ".$sendto);
+	}
+	else
+	{
+		dol_syslog("Failed to send EMail to ".$sendto, LOG_ERR);
+	}
+}
 
 
 llxHeaderPayBox($langs->trans("PaymentForm"));
diff --git a/htdocs/public/paybox/paymentok.php b/htdocs/public/paybox/paymentok.php
index 33107883d8f..b8940fa1a32 100644
--- a/htdocs/public/paybox/paymentok.php
+++ b/htdocs/public/paybox/paymentok.php
@@ -41,15 +41,15 @@ $langs->load("companies");
 $langs->load("paybox");
 $langs->load("paypal");
 
-/*$source=GETPOST('source');
-$ref=GETPOST('ref');
-$PAYBOXTOKEN=GETPOST('TOKEN');
-if (empty($PAYBOXTOKEN)) $PAYBOXTOKEN=GETPOST('token');
-$PAYBOXPAYERID=GETPOST('PAYERID');
-if (empty($PAYBOXPAYERID)) $PAYBOXPAYERID=GETPOST('PayerID');
+/*$source=GETPOST('source');
+$ref=GETPOST('ref');
+$PAYBOXTOKEN=GETPOST('TOKEN');
+if (empty($PAYBOXTOKEN)) $PAYBOXTOKEN=GETPOST('token');
+$PAYBOXPAYERID=GETPOST('PAYERID');
+if (empty($PAYBOXPAYERID)) $PAYBOXPAYERID=GETPOST('PayerID');
 */
-$PAYBOXFULLTAG=GETPOST('FULLTAG');
-if (empty($PAYBOXFULLTAG)) $PAYBOXFULLTAG=GETPOST('fulltag');
+$PAYBOXFULLTAG=GETPOST('FULLTAG');
+if (empty($PAYBOXFULLTAG)) $PAYBOXFULLTAG=GETPOST('fulltag');
 
 
 /*
@@ -77,44 +77,44 @@ llxHeaderPayBox($langs->trans("PaymentForm"));
 print '<span id="dolpaymentspan"></span>'."\n";
 print '<div id="dolpaymentdiv" align="center">'."\n";
 
-// Get on url call
+// Get on url call
 /*
 $token              = $PAYBOXTOKEN;
-*/
-$fulltag            = $PAYBOXFULLTAG;
-/*$payerID            = $PAYBOXPAYERID;
-// Set by newpayment.php
-$paymentType        = $_SESSION['PaymentType'];
-$currencyCodeType   = $_SESSION['currencyCodeType'];
-$FinalPaymentAmt    = $_SESSION["Payment_Amount"];
-// From env
-$ipaddress          = $_SESSION['ipaddress'];
-
-dol_syslog("Call newpaymentok with token=".$token." paymentType=".$paymentType." currencyCodeType=".$currencyCodeType." payerID=".$payerID." ipaddress=".$ipaddress." FinalPaymentAmt=".$FinalPaymentAmt." fulltag=".$fulltag);
-*/
-
-// Send an email
-if (! empty($conf->global->MEMBER_PAYONLINE_SENDEMAIL) && preg_match('/MEM=',$fulltag))
-{
-	$sendto=$conf->global->MEMBER_PAYONLINE_SENDEMAIL;
-	$from=$conf->global->MAILING_EMAIL_FROM;
-	require_once DOL_DOCUMENT_ROOT.'/core/class/CMailFile.class.php';
+*/
+$fulltag            = $PAYBOXFULLTAG;
+/*$payerID            = $PAYBOXPAYERID;
+// Set by newpayment.php
+$paymentType        = $_SESSION['PaymentType'];
+$currencyCodeType   = $_SESSION['currencyCodeType'];
+$FinalPaymentAmt    = $_SESSION["Payment_Amount"];
+// From env
+$ipaddress          = $_SESSION['ipaddress'];
+
+dol_syslog("Call newpaymentok with token=".$token." paymentType=".$paymentType." currencyCodeType=".$currencyCodeType." payerID=".$payerID." ipaddress=".$ipaddress." FinalPaymentAmt=".$FinalPaymentAmt." fulltag=".$fulltag);
+*/
+
+// Send an email
+if (! empty($conf->global->MEMBER_PAYONLINE_SENDEMAIL) && preg_match('/MEM=',$fulltag))
+{
+	$sendto=$conf->global->MEMBER_PAYONLINE_SENDEMAIL;
+	$from=$conf->global->MAILING_EMAIL_FROM;
+	require_once DOL_DOCUMENT_ROOT.'/core/class/CMailFile.class.php';
 	$mailfile = new CMailFile(
-		'New subscription payed',
-		$sendto,
-		$from,
+		'New subscription payed',
+		$sendto,
+		$from,
 		'New subscription payed '.$fulltag
-		);
-
-	$result=$mailfile->sendfile();
-	if ($result)
-	{
-		dol_syslog("EMail sent to ".$sendto);
-	}
-	else
-	{
-		dol_syslog("Failed to send EMail to ".$sendto, LOG_ERR);
-	}
+		);
+
+	$result=$mailfile->sendfile();
+	if ($result)
+	{
+		dol_syslog("EMail sent to ".$sendto);
+	}
+	else
+	{
+		dol_syslog("Failed to send EMail to ".$sendto, LOG_ERR);
+	}
 }
 
 
diff --git a/htdocs/public/paypal/paymentko.php b/htdocs/public/paypal/paymentko.php
index ee72206ae52..21d93f3eaa1 100755
--- a/htdocs/public/paypal/paymentko.php
+++ b/htdocs/public/paypal/paymentko.php
@@ -71,29 +71,29 @@ foreach($_POST as $k => $v) $tracepost .= "{$k} - {$v}\n";
 dol_syslog("POST=".$tracepost, LOG_DEBUG, 0, '_paypal');
 
 
-// Send an email
-if (! empty($conf->global->MEMBER_PAYONLINE_SENDEMAIL) && preg_match('/MEM=',$fulltag))
-{
-	$sendto=$conf->global->MEMBER_PAYONLINE_SENDEMAIL;
-	$from=$conf->global->MAILING_EMAIL_FROM;
-	require_once DOL_DOCUMENT_ROOT.'/core/class/CMailFile.class.php';
+// Send an email
+if (! empty($conf->global->MEMBER_PAYONLINE_SENDEMAIL) && preg_match('/MEM=',$fulltag))
+{
+	$sendto=$conf->global->MEMBER_PAYONLINE_SENDEMAIL;
+	$from=$conf->global->MAILING_EMAIL_FROM;
+	require_once DOL_DOCUMENT_ROOT.'/core/class/CMailFile.class.php';
 	$mailfile = new CMailFile(
-		'New subscription payed',
-		$sendto,
-		$from,
+		'New subscription payed',
+		$sendto,
+		$from,
 		'New subscription payed '.$fulltag
-		);
-
-	$result=$mailfile->sendfile();
-	if ($result)
-	{
-		dol_syslog("EMail sent to ".$sendto);
-	}
-	else
-	{
-		dol_syslog("Failed to send EMail to ".$sendto, LOG_ERR);
-	}
-}
+		);
+
+	$result=$mailfile->sendfile();
+	if ($result)
+	{
+		dol_syslog("EMail sent to ".$sendto);
+	}
+	else
+	{
+		dol_syslog("Failed to send EMail to ".$sendto, LOG_ERR);
+	}
+}
 
 
 llxHeaderPaypal($langs->trans("PaymentForm"));
diff --git a/htdocs/public/paypal/paymentok.php b/htdocs/public/paypal/paymentok.php
index 012269b8be3..e4ea8a92095 100755
--- a/htdocs/public/paypal/paymentok.php
+++ b/htdocs/public/paypal/paymentok.php
@@ -81,14 +81,14 @@ if (empty($PAYPAL_API_SIGNATURE))
     return -1;
 }
 
-$source=GETPOST('source');
-$ref=GETPOST('ref');
-$PAYPALTOKEN=GETPOST('TOKEN');
-if (empty($PAYPALTOKEN)) $PAYPALTOKEN=GETPOST('token');
-$PAYPALPAYERID=GETPOST('PAYERID');
-if (empty($PAYPALPAYERID)) $PAYPALPAYERID=GETPOST('PayerID');
-$PAYPALFULLTAG=GETPOST('FULLTAG');
-if (empty($PAYPALFULLTAG)) $PAYPALFULLTAG=GETPOST('fulltag');
+$source=GETPOST('source');
+$ref=GETPOST('ref');
+$PAYPALTOKEN=GETPOST('TOKEN');
+if (empty($PAYPALTOKEN)) $PAYPALTOKEN=GETPOST('token');
+$PAYPALPAYERID=GETPOST('PAYERID');
+if (empty($PAYPALPAYERID)) $PAYPALPAYERID=GETPOST('PayerID');
+$PAYPALFULLTAG=GETPOST('FULLTAG');
+if (empty($PAYPALFULLTAG)) $PAYPALFULLTAG=GETPOST('fulltag');
 
 
 /*
@@ -135,23 +135,23 @@ if ($PAYPALTOKEN)
 	{
 		$sendto=$conf->global->MEMBER_PAYONLINE_SENDEMAIL;
 		$from=$conf->global->MAILING_EMAIL_FROM;
-		require_once DOL_DOCUMENT_ROOT.'/core/class/CMailFile.class.php';
+		require_once DOL_DOCUMENT_ROOT.'/core/class/CMailFile.class.php';
 		$mailfile = new CMailFile(
-			'New subscription payed',
+			'New subscription payed',
 			$sendto,
-			$from,
+			$from,
 			'New subscription payed '.$fulltag
-			);
-
-		$result=$mailfile->sendfile();
-		if ($result)
-		{
-			dol_syslog("EMail sent to ".$sendto);
-		}
-		else
-		{
+			);
+
+		$result=$mailfile->sendfile();
+		if ($result)
+		{
+			dol_syslog("EMail sent to ".$sendto);
+		}
+		else
+		{
 			dol_syslog("Failed to send EMail to ".$sendto, LOG_ERR);
-		}
+		}
 	}
 
 
diff --git a/htdocs/societe/checkvat/checkVatPopup.php b/htdocs/societe/checkvat/checkVatPopup.php
index 61c01b00f2a..0fb2da5a053 100644
--- a/htdocs/societe/checkvat/checkVatPopup.php
+++ b/htdocs/societe/checkvat/checkVatPopup.php
@@ -66,8 +66,8 @@ else
     //ini_set('default_socket_timeout', $params['response_timeout']);
     //$soapclient = new SoapClient($WS_DOL_URL_WSDL,$params);
 	$soapclient = new nusoap_client($WS_DOL_URL_WSDL,true,$params['proxy_host'],$params['proxy_port'],$params['proxy_login'],$params['proxy_password'],$params['connection_timeout'],$params['response_timeout']);
-	$soapclient->soap_defencoding = 'utf-8';
-	$soapclient->xml_encoding = 'utf-8';
+	$soapclient->soap_defencoding = 'utf-8';
+	$soapclient->xml_encoding = 'utf-8';
 	$soapclient->decode_utf8 = false;
 
 	// Check for an error
diff --git a/htdocs/societe/class/societe.class.php b/htdocs/societe/class/societe.class.php
index f998f563729..b6bee432087 100644
--- a/htdocs/societe/class/societe.class.php
+++ b/htdocs/societe/class/societe.class.php
@@ -1452,14 +1452,14 @@ class Societe extends CommonObject
         {
             $lien = '<a href="'.DOL_URL_ROOT.'/fourn/fiche.php?socid='.$this->id;
         }
-        else if ($option == 'category')
-        {
-        	$lien = '<a href="'.DOL_URL_ROOT.'/categories/categorie.php?id='.$this->id.'&type=2';
-        }
-        else if ($option == 'category_supplier')
-        {
-        	$lien = '<a href="'.DOL_URL_ROOT.'/categories/categorie.php?id='.$this->id.'&type=1';
-        }
+        else if ($option == 'category')
+        {
+        	$lien = '<a href="'.DOL_URL_ROOT.'/categories/categorie.php?id='.$this->id.'&type=2';
+        }
+        else if ($option == 'category_supplier')
+        {
+        	$lien = '<a href="'.DOL_URL_ROOT.'/categories/categorie.php?id='.$this->id.'&type=1';
+        }
 
         // By default
         if (empty($lien))
@@ -2541,7 +2541,7 @@ class Societe extends CommonObject
         $this->url='http://www.specimen.com';
 
         $this->phone='0909090901';
-        $this->fax='0909090909';
+        $this->fax='0909090909';
 
         $this->code_client='CC-'.dol_print_date($now,'dayhourlog');
         $this->code_fournisseur='SC-'.dol_print_date($now,'dayhourlog');
diff --git a/htdocs/societe/soc.php b/htdocs/societe/soc.php
index 27db36e8a32..356001648c3 100644
--- a/htdocs/societe/soc.php
+++ b/htdocs/societe/soc.php
@@ -443,10 +443,10 @@ if (empty($reshook))
     }
 
     // Set parent company
-    if ($action == 'set_thirdparty' && $user->rights->societe->creer)
+    if ($action == 'set_thirdparty' && $user->rights->societe->creer)
     {
-    	$result = $object->set_parent(GETPOST('editparentcompany','int'));
-    }
+    	$result = $object->set_parent(GETPOST('editparentcompany','int'));
+    }
 
     /*
      * Generate document
@@ -1721,24 +1721,24 @@ else
         // Parent company
         if (empty($conf->global->SOCIETE_DISABLE_PARENTCOMPANY))
         {
-        	// Payment term
-        	print '<tr><td>';
-        	print '<table class="nobordernopadding" width="100%"><tr><td>';
-        	print $langs->trans('ParentCompany');
-        	print '</td>';
-        	if ($action != 'editparentcompany') print '<td align="right"><a href="'.$_SERVER["PHP_SELF"].'?action=editparentcompany&amp;socid='.$object->id.'">'.img_edit($langs->transnoentitiesnoconv('Edit'),1).'</a></td>';
-        	print '</tr></table>';
-        	print '</td><td colspan="3">';
-        	if ($action == 'editparentcompany')
-        	{
-        		$form->form_thirdparty($_SERVER['PHP_SELF'].'?socid='.$object->id,$object->parent,'editparentcompany','s.rowid <> '.$object->id,1);
-        	}
-        	else
-        	{
-        		$form->form_thirdparty($_SERVER['PHP_SELF'].'?socid='.$object->id,$object->parent,'none','s.rowid <> '.$object->id,1);
-        	}
-        	print '</td>';
-        	print '</tr>';
+        	// Payment term
+        	print '<tr><td>';
+        	print '<table class="nobordernopadding" width="100%"><tr><td>';
+        	print $langs->trans('ParentCompany');
+        	print '</td>';
+        	if ($action != 'editparentcompany') print '<td align="right"><a href="'.$_SERVER["PHP_SELF"].'?action=editparentcompany&amp;socid='.$object->id.'">'.img_edit($langs->transnoentitiesnoconv('Edit'),1).'</a></td>';
+        	print '</tr></table>';
+        	print '</td><td colspan="3">';
+        	if ($action == 'editparentcompany')
+        	{
+        		$form->form_thirdparty($_SERVER['PHP_SELF'].'?socid='.$object->id,$object->parent,'editparentcompany','s.rowid <> '.$object->id,1);
+        	}
+        	else
+        	{
+        		$form->form_thirdparty($_SERVER['PHP_SELF'].'?socid='.$object->id,$object->parent,'none','s.rowid <> '.$object->id,1);
+        	}
+        	print '</td>';
+        	print '</tr>';
         }
 
         // Sales representative
diff --git a/htdocs/support/index.php b/htdocs/support/index.php
index 6b555672631..5d2d7fb5104 100644
--- a/htdocs/support/index.php
+++ b/htdocs/support/index.php
@@ -175,7 +175,7 @@ print '</tr>';
 print '</table>'."\n";
 
 
-print '</div><div class="inline-block">';
+print '</div><div class="inline-block">';
 
 
 // Other support
diff --git a/htdocs/theme/amarok/graph-color.php b/htdocs/theme/amarok/graph-color.php
index 1a0d2253a2a..be8421b6d4b 100755
--- a/htdocs/theme/amarok/graph-color.php
+++ b/htdocs/theme/amarok/graph-color.php
@@ -22,10 +22,10 @@
  *      \ingroup    core
  */
 
-global $theme_bordercolor, $theme_datacolor, $theme_bgcolor, $theme_bgcoloronglet;
-$theme_bordercolor = array(235,235,224);
-$theme_datacolor = array(array(190,190,220), array(200,160,180), array(125,135,150), array(170,140,190), array(190,190,170));
-$theme_bgcolor = array(hexdec('F4'),hexdec('F4'),hexdec('F4'));
-$theme_bgcoloronglet = array(hexdec('DE'),hexdec('E7'),hexdec('EC'));
+global $theme_bordercolor, $theme_datacolor, $theme_bgcolor, $theme_bgcoloronglet;
+$theme_bordercolor = array(235,235,224);
+$theme_datacolor = array(array(190,190,220), array(200,160,180), array(125,135,150), array(170,140,190), array(190,190,170));
+$theme_bgcolor = array(hexdec('F4'),hexdec('F4'),hexdec('F4'));
+$theme_bgcoloronglet = array(hexdec('DE'),hexdec('E7'),hexdec('EC'));
 
 ?>
diff --git a/htdocs/theme/amarok/style.css.php b/htdocs/theme/amarok/style.css.php
index 4f55463a323..6c5ca41d52b 100755
--- a/htdocs/theme/amarok/style.css.php
+++ b/htdocs/theme/amarok/style.css.php
@@ -41,8 +41,8 @@ session_cache_limiter(FALSE);
 
 require_once '../../main.inc.php';
 
-// Load user to have $user->conf loaded (not done into main because of NOLOGIN constant defined)
-if (empty($user->id) && ! empty($_SESSION['dol_login'])) $user->fetch('',$_SESSION['dol_login']);
+// Load user to have $user->conf loaded (not done into main because of NOLOGIN constant defined)
+if (empty($user->id) && ! empty($_SESSION['dol_login'])) $user->fetch('',$_SESSION['dol_login']);
 
 // Define css type
 header('Content-type: text/css');
@@ -72,109 +72,109 @@ $fontlist='helvetica,arial,tahoma,verdana';    //$fontlist='Verdana,Helvetica,Ar
 $img_liste_titre=dol_buildpath($path.'/theme/'.$theme.'/img/menus/trtitle.png',1);
 $img_head=dol_buildpath($path.'/theme/'.$theme.'/img/headbg2.jpg',1);
 $img_button=dol_buildpath($path.'/theme/'.$theme.'/img/button_bg.png',1);
-$dol_hide_topmenu=$conf->dol_hide_topmenu;
-$dol_hide_leftmenu=$conf->dol_hide_leftmenu;
-$dol_optimize_smallscreen=$conf->dol_optimize_smallscreen;
-$dol_no_mouse_hover=$conf->dol_no_mouse_hover;
-$dol_use_jmobile=$conf->dol_use_jmobile;
+$dol_hide_topmenu=$conf->dol_hide_topmenu;
+$dol_hide_leftmenu=$conf->dol_hide_leftmenu;
+$dol_optimize_smallscreen=$conf->dol_optimize_smallscreen;
+$dol_no_mouse_hover=$conf->dol_no_mouse_hover;
+$dol_use_jmobile=$conf->dol_use_jmobile;
 
-
-// Define reference colors
-// Example: Light grey: $colred=235;$colgreen=235;$colblue=235;
-// Example: Pink:       $colred=230;$colgreen=210;$colblue=230;
-// Example: Green:      $colred=210;$colgreen=230;$colblue=210;
-// Example: Ocean:      $colred=220;$colgreen=220;$colblue=240;
-//$conf->global->THEME_ELDY_ENABLE_PERSONALIZED=0;
-//$user->conf->THEME_ELDY_ENABLE_PERSONALIZED=0;
-//var_dump($user->conf->THEME_ELDY_RGB);
-$colred  =empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED)?(empty($conf->global->THEME_ELDY_RGB)?235:hexdec(substr($conf->global->THEME_ELDY_RGB,0,2))):(empty($user->conf->THEME_ELDY_RGB)?235:hexdec(substr($user->conf->THEME_ELDY_RGB,0,2)));
-$colgreen=empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED)?(empty($conf->global->THEME_ELDY_RGB)?235:hexdec(substr($conf->global->THEME_ELDY_RGB,2,2))):(empty($user->conf->THEME_ELDY_RGB)?235:hexdec(substr($user->conf->THEME_ELDY_RGB,2,2)));
-$colblue =empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED)?(empty($conf->global->THEME_ELDY_RGB)?235:hexdec(substr($conf->global->THEME_ELDY_RGB,4,2))):(empty($user->conf->THEME_ELDY_RGB)?235:hexdec(substr($user->conf->THEME_ELDY_RGB,4,2)));
-
-// Colors
-$isred=max(0,(2*$colred-$colgreen-$colblue)/2);        // 0 - 255
-$isgreen=max(0,(2*$colgreen-$colred-$colblue)/2);      // 0 - 255
-$isblue=max(0,(2*$colblue-$colred-$colgreen)/2);       // 0 - 255
-$colorback1=($colred-3).','.($colgreen-3).','.($colblue-3);         // topmenu
-$colorback2=($colred+5).','.($colgreen+5).','.($colblue+5);
-$colorbacktab1=($colred+15).','.($colgreen+16).','.($colblue+17);      // vmenu
-$colorbacktab1b=($colred+5).','.($colgreen+6).','.($colblue+7);        // vmenu (not menu)
-$colorbacktab2=($colred-15).','.($colgreen-15).','.($colblue-15);
-$colorbacktitle1=($colred-5).','.($colgreen-5).','.($colblue-5);    // title of array
-$colorbacktitle2=($colred-15).','.($colgreen-15).','.($colblue-15);
-$colorbacktabcard1=($colred+15).','.($colgreen+16).','.($colblue+17);  // card
-$colorbacktabcard2=($colred-15).','.($colgreen-15).','.($colblue-15);
-$colorbacktabactive=($colred-15).','.($colgreen-15).','.($colblue-15);
-$colorbacklineimpair1=(244+round($isred/3)).','.(244+round($isgreen/3)).','.(244+round($isblue/3));    // line impair
-$colorbacklineimpair2=(250+round($isred/3)).','.(250+round($isgreen/3)).','.(250+round($isblue/3));    // line impair
-$colorbacklineimpairhover=(230+round(($isred+$isgreen+$isblue)/9)).','.(230+round(($isred+$isgreen+$isblue)/9)).','.(230+round(($isred+$isgreen+$isblue)/9));    // line impair
-$colorbacklinepair1='255,255,255';    // line pair
-$colorbacklinepair2='255,255,255';    // line pair
-$colorbacklinepairhover=(230+round(($isred+$isgreen+$isblue)/9)).','.(230+round(($isred+$isgreen+$isblue)/9)).','.(230+round(($isred+$isgreen+$isblue)/9));
-$colorbackbody='#f5f5f5';
-$colortext='40,40,40';
-$fontsize=empty($conf->dol_optimize_smallscreen)?'12':'14';
-$fontsizesmaller=empty($conf->dol_optimize_smallscreen)?'11':'14';
 
-$colorback1          =empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED)?(empty($conf->global->THEME_ELDY_TOPMENU_BACK1)?$colorback1:$conf->global->THEME_ELDY_TOPMENU_BACK1)        :(empty($user->conf->THEME_ELDY_TOPMENU_BACK1)?$colorback1:$user->conf->THEME_ELDY_TOPMENU_BACK1);
-$colorback2          =empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED)?(empty($conf->global->THEME_ELDY_TOPMENU_BACK2)?$colorback2:$conf->global->THEME_ELDY_TOPMENU_BACK2)        :(empty($user->conf->THEME_ELDY_TOPMENU_BACK2)?$colorback2:$user->conf->THEME_ELDY_TOPMENU_BACK2);
-$colorbacktab1       =empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED)?(empty($conf->global->THEME_ELDY_VERMENU_BACK1)?$colorbacktab1:$conf->global->THEME_ELDY_VERMENU_BACK1)     :(empty($user->conf->THEME_ELDY_VERMENU_BACK1)?$colorbacktab1:$user->conf->THEME_ELDY_VERMENU_BACK1);
-$colorbacktab1b      =empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED)?(empty($conf->global->THEME_ELDY_VERMENU_BACK1b)?$colorbacktab1:$conf->global->THEME_ELDY_VERMENU_BACK1b)   :(empty($user->conf->THEME_ELDY_VERMENU_BACK1b)?$colorbacktab1b:$user->conf->THEME_ELDY_VERMENU_BACK1b);
-$colorbacktab2       =empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED)?(empty($conf->global->THEME_ELDY_VERMENU_BACK2)?$colorbacktab2:$conf->global->THEME_ELDY_VERMENU_BACK2)     :(empty($user->conf->THEME_ELDY_VERMENU_BACK2)?$colorbacktab2:$user->conf->THEME_ELDY_VERMENU_BACK2);
-$colorbacktitle1     =empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED)?(empty($conf->global->THEME_ELDY_BACKTITLE1)   ?$colorbacktitle1:$conf->global->THEME_ELDY_BACKTITLE1)      :(empty($user->conf->THEME_ELDY_BACKTITLE1)?$colorbacktitle1:$user->conf->THEME_ELDY_BACKTITLE1);
-$colorbacktitle2     =empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED)?(empty($conf->global->THEME_ELDY_BACKTITLE2)   ?$colorbacktitle2:$conf->global->THEME_ELDY_BACKTITLE2)      :(empty($user->conf->THEME_ELDY_BACKTITLE2)?$colorbacktitle2:$user->conf->THEME_ELDY_BACKTITLE2);
-$colorbacktabcard1   =empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED)?(empty($conf->global->THEME_ELDY_BACKTABCARD1) ?$colorbacktabcard1:$conf->global->THEME_ELDY_BACKTABCARD1)  :(empty($user->conf->THEME_ELDY_BACKTABCARD1)?$colorbacktabcard1:$user->conf->THEME_ELDY_BACKTABCARD1);
-$colorbacktabcard2   =empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED)?(empty($conf->global->THEME_ELDY_BACKTABCARD2) ?$colorbacktabcard2:$conf->global->THEME_ELDY_BACKTABCARD2)  :(empty($user->conf->THEME_ELDY_BACKTABCARD2)?$colorbacktabcard2:$user->conf->THEME_ELDY_BACKTABCARD2);
-$colorbacktabactive  =empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED)?(empty($conf->global->THEME_ELDY_BACKTABACTIVE)?$colorbacktabactive:$conf->global->THEME_ELDY_BACKTABACTIVE):(empty($user->conf->THEME_ELDY_BACKTABACTIVE)?$colorbacktabactive:$user->conf->THEME_ELDY_BACKTABACTIVE);
-$colorbacklineimpair1=empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED)?(empty($conf->global->THEME_ELDY_LINEIMPAIR1)  ?$colorbacklineimpair1:$conf->global->THEME_ELDY_LINEIMPAIR1):(empty($user->conf->THEME_ELDY_LINEIMPAIR1)?$colorbacklineimpair1:$user->conf->THEME_ELDY_LINEIMPAIR1);
-$colorbacklineimpair2=empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED)?(empty($conf->global->THEME_ELDY_LINEIMPAIR2)  ?$colorbacklineimpair2:$conf->global->THEME_ELDY_LINEIMPAIR2):(empty($user->conf->THEME_ELDY_LINEIMPAIR2)?$colorbacklineimpair2:$user->conf->THEME_ELDY_LINEIMPAIR2);
-$colorbacklineimpairhover=empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED)?(empty($conf->global->THEME_ELDY_LINEIMPAIRHOVER)  ?$colorbacklineimpairhover:$conf->global->THEME_ELDY_LINEIMPAIRHOVER):(empty($user->conf->THEME_ELDY_LINEIMPAIRHOVER)?$colorbacklineimpairhover:$user->conf->THEME_ELDY_LINEIMPAIRHOVER);
-$colorbacklinepair1  =empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED)?(empty($conf->global->THEME_ELDY_LINEPAIR1)    ?$colorbacklinepair1:$conf->global->THEME_ELDY_LINEPAIR1)    :(empty($user->conf->THEME_ELDY_LINEPAIR1)?$colorbacklinepair1:$user->conf->THEME_ELDY_LINEPAIR1);
-$colorbacklinepair2  =empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED)?(empty($conf->global->THEME_ELDY_LINEPAIR2)    ?$colorbacklinepair2:$conf->global->THEME_ELDY_LINEPAIR2)    :(empty($user->conf->THEME_ELDY_LINEPAIR2)?$colorbacklinepair2:$user->conf->THEME_ELDY_LINEPAIR2);
-$colorbacklinepairhover  =empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED)?(empty($conf->global->THEME_ELDY_LINEPAIRHOVER)    ?$colorbacklinepairhover:$conf->global->THEME_ELDY_LINEPAIRHOVER)    :(empty($user->conf->THEME_ELDY_LINEPAIRHOVER)?$colorbacklinepairhover:$user->conf->THEME_ELDY_LINEPAIRHOVER);
-$colorbackbody       =empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED)?(empty($conf->global->THEME_ELDY_BACKBODY)     ?$colorbackbody:$conf->global->THEME_ELDY_BACKBODY)          :(empty($user->conf->THEME_ELDY_BACKBODY)?$colorbackbody:$user->conf->THEME_ELDY_BACKBODY);
-$colortext           =empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED)?(empty($conf->global->THEME_ELDY_TEXT)         ?$colortext:$conf->global->THEME_ELDY_TEXT)                  :(empty($user->conf->THEME_ELDY_TEXT)?$colortext:$user->conf->THEME_ELDY_TEXT);
-$fontsize            =empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED)?(empty($conf->global->THEME_ELDY_FONT_SIZE1)   ?$fontsize:$conf->global->THEME_ELDY_FONT_SIZE1)             :(empty($user->conf->THEME_ELDY_FONT_SIZE1)?$fontsize:$user->conf->THEME_ELDY_FONT_SIZE1);
-$fontsizesmaller     =empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED)?(empty($conf->global->THEME_ELDY_FONT_SIZE2)   ?$fontsize:$conf->global->THEME_ELDY_FONT_SIZE2)             :(empty($user->conf->THEME_ELDY_FONT_SIZE2)?$fontsize:$user->conf->THEME_ELDY_FONT_SIZE2);
-// No hover by default, we keep only if we set var THEME_ELDY_USE_HOVER
-if ((! empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED) && empty($user->conf->THEME_ELDY_USE_HOVER))
-	|| (empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED) && empty($conf->global->THEME_ELDY_USE_HOVER)))
-{
-	$colorbacklineimpairhover='';
-	$colorbacklinepairhover='';
-}
-
-// Set text color to black or white
-$tmppart=explode(',',$colorback1);
-$tmpval=(! empty($tmppart[1]) ? $tmppart[1] : '');
-$tmpval+=(! empty($tmppart[2]) ? $tmppart[2] : '');
-$tmpval+=(! empty($tmppart[3]) ? $tmppart[3] : '');
-//print $tmpval;
-if ($tmpval < 340) $colortextmain='FFFFFF';
-else $colortextmain='101010';
-
-$usecss3=true;
-if ($conf->browser->name == 'ie' && round($conf->browser->version,2) < 10) $usecss3=false;
-elseif ($conf->browser->name == 'iceweasel') $usecss3=false;
-elseif ($conf->browser->name == 'epiphany')  $usecss3=false;
-
-print '/*'."\n";
-print 'colred='.$colred.' colgreen='.$colgreen.' colblue='.$colblue."\n";
-print 'isred='.$isred.' isgreen='.$isgreen.' isblue='.$isblue."\n";
-print 'colorbacklineimpair1='.$colorbacklineimpair1."\n";
-print 'colorbacklineimpair2='.$colorbacklineimpair2."\n";
-print 'colorbacklineimpairhover='.$colorbacklineimpairhover."\n";
-print 'colorbacklinepair1='.$colorbacklinepair1."\n";
-print 'colorbacklinepair2='.$colorbacklinepair2."\n";
-print 'colorbacklinepairhover='.$colorbacklinepairhover."\n";
-print 'usecss3='.$usecss3."\n";
-print 'dol_hide_topmenu='.$dol_hide_topmenu."\n";
-print 'dol_hide_leftmenu='.$dol_hide_leftmenu."\n";
-print 'dol_optimize_smallscreen='.$dol_optimize_smallscreen."\n";
-print 'dol_no_mouse_hover='.$dol_no_mouse_hover."\n";
-print 'dol_use_jmobile='.$dol_use_jmobile."\n";
-print '*/'."\n";
-
+// Define reference colors
+// Example: Light grey: $colred=235;$colgreen=235;$colblue=235;
+// Example: Pink:       $colred=230;$colgreen=210;$colblue=230;
+// Example: Green:      $colred=210;$colgreen=230;$colblue=210;
+// Example: Ocean:      $colred=220;$colgreen=220;$colblue=240;
+//$conf->global->THEME_ELDY_ENABLE_PERSONALIZED=0;
+//$user->conf->THEME_ELDY_ENABLE_PERSONALIZED=0;
+//var_dump($user->conf->THEME_ELDY_RGB);
+$colred  =empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED)?(empty($conf->global->THEME_ELDY_RGB)?235:hexdec(substr($conf->global->THEME_ELDY_RGB,0,2))):(empty($user->conf->THEME_ELDY_RGB)?235:hexdec(substr($user->conf->THEME_ELDY_RGB,0,2)));
+$colgreen=empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED)?(empty($conf->global->THEME_ELDY_RGB)?235:hexdec(substr($conf->global->THEME_ELDY_RGB,2,2))):(empty($user->conf->THEME_ELDY_RGB)?235:hexdec(substr($user->conf->THEME_ELDY_RGB,2,2)));
+$colblue =empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED)?(empty($conf->global->THEME_ELDY_RGB)?235:hexdec(substr($conf->global->THEME_ELDY_RGB,4,2))):(empty($user->conf->THEME_ELDY_RGB)?235:hexdec(substr($user->conf->THEME_ELDY_RGB,4,2)));
+
+// Colors
+$isred=max(0,(2*$colred-$colgreen-$colblue)/2);        // 0 - 255
+$isgreen=max(0,(2*$colgreen-$colred-$colblue)/2);      // 0 - 255
+$isblue=max(0,(2*$colblue-$colred-$colgreen)/2);       // 0 - 255
+$colorback1=($colred-3).','.($colgreen-3).','.($colblue-3);         // topmenu
+$colorback2=($colred+5).','.($colgreen+5).','.($colblue+5);
+$colorbacktab1=($colred+15).','.($colgreen+16).','.($colblue+17);      // vmenu
+$colorbacktab1b=($colred+5).','.($colgreen+6).','.($colblue+7);        // vmenu (not menu)
+$colorbacktab2=($colred-15).','.($colgreen-15).','.($colblue-15);
+$colorbacktitle1=($colred-5).','.($colgreen-5).','.($colblue-5);    // title of array
+$colorbacktitle2=($colred-15).','.($colgreen-15).','.($colblue-15);
+$colorbacktabcard1=($colred+15).','.($colgreen+16).','.($colblue+17);  // card
+$colorbacktabcard2=($colred-15).','.($colgreen-15).','.($colblue-15);
+$colorbacktabactive=($colred-15).','.($colgreen-15).','.($colblue-15);
+$colorbacklineimpair1=(244+round($isred/3)).','.(244+round($isgreen/3)).','.(244+round($isblue/3));    // line impair
+$colorbacklineimpair2=(250+round($isred/3)).','.(250+round($isgreen/3)).','.(250+round($isblue/3));    // line impair
+$colorbacklineimpairhover=(230+round(($isred+$isgreen+$isblue)/9)).','.(230+round(($isred+$isgreen+$isblue)/9)).','.(230+round(($isred+$isgreen+$isblue)/9));    // line impair
+$colorbacklinepair1='255,255,255';    // line pair
+$colorbacklinepair2='255,255,255';    // line pair
+$colorbacklinepairhover=(230+round(($isred+$isgreen+$isblue)/9)).','.(230+round(($isred+$isgreen+$isblue)/9)).','.(230+round(($isred+$isgreen+$isblue)/9));
+$colorbackbody='#f5f5f5';
+$colortext='40,40,40';
+$fontsize=empty($conf->dol_optimize_smallscreen)?'12':'14';
+$fontsizesmaller=empty($conf->dol_optimize_smallscreen)?'11':'14';
+
+$colorback1          =empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED)?(empty($conf->global->THEME_ELDY_TOPMENU_BACK1)?$colorback1:$conf->global->THEME_ELDY_TOPMENU_BACK1)        :(empty($user->conf->THEME_ELDY_TOPMENU_BACK1)?$colorback1:$user->conf->THEME_ELDY_TOPMENU_BACK1);
+$colorback2          =empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED)?(empty($conf->global->THEME_ELDY_TOPMENU_BACK2)?$colorback2:$conf->global->THEME_ELDY_TOPMENU_BACK2)        :(empty($user->conf->THEME_ELDY_TOPMENU_BACK2)?$colorback2:$user->conf->THEME_ELDY_TOPMENU_BACK2);
+$colorbacktab1       =empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED)?(empty($conf->global->THEME_ELDY_VERMENU_BACK1)?$colorbacktab1:$conf->global->THEME_ELDY_VERMENU_BACK1)     :(empty($user->conf->THEME_ELDY_VERMENU_BACK1)?$colorbacktab1:$user->conf->THEME_ELDY_VERMENU_BACK1);
+$colorbacktab1b      =empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED)?(empty($conf->global->THEME_ELDY_VERMENU_BACK1b)?$colorbacktab1:$conf->global->THEME_ELDY_VERMENU_BACK1b)   :(empty($user->conf->THEME_ELDY_VERMENU_BACK1b)?$colorbacktab1b:$user->conf->THEME_ELDY_VERMENU_BACK1b);
+$colorbacktab2       =empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED)?(empty($conf->global->THEME_ELDY_VERMENU_BACK2)?$colorbacktab2:$conf->global->THEME_ELDY_VERMENU_BACK2)     :(empty($user->conf->THEME_ELDY_VERMENU_BACK2)?$colorbacktab2:$user->conf->THEME_ELDY_VERMENU_BACK2);
+$colorbacktitle1     =empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED)?(empty($conf->global->THEME_ELDY_BACKTITLE1)   ?$colorbacktitle1:$conf->global->THEME_ELDY_BACKTITLE1)      :(empty($user->conf->THEME_ELDY_BACKTITLE1)?$colorbacktitle1:$user->conf->THEME_ELDY_BACKTITLE1);
+$colorbacktitle2     =empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED)?(empty($conf->global->THEME_ELDY_BACKTITLE2)   ?$colorbacktitle2:$conf->global->THEME_ELDY_BACKTITLE2)      :(empty($user->conf->THEME_ELDY_BACKTITLE2)?$colorbacktitle2:$user->conf->THEME_ELDY_BACKTITLE2);
+$colorbacktabcard1   =empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED)?(empty($conf->global->THEME_ELDY_BACKTABCARD1) ?$colorbacktabcard1:$conf->global->THEME_ELDY_BACKTABCARD1)  :(empty($user->conf->THEME_ELDY_BACKTABCARD1)?$colorbacktabcard1:$user->conf->THEME_ELDY_BACKTABCARD1);
+$colorbacktabcard2   =empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED)?(empty($conf->global->THEME_ELDY_BACKTABCARD2) ?$colorbacktabcard2:$conf->global->THEME_ELDY_BACKTABCARD2)  :(empty($user->conf->THEME_ELDY_BACKTABCARD2)?$colorbacktabcard2:$user->conf->THEME_ELDY_BACKTABCARD2);
+$colorbacktabactive  =empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED)?(empty($conf->global->THEME_ELDY_BACKTABACTIVE)?$colorbacktabactive:$conf->global->THEME_ELDY_BACKTABACTIVE):(empty($user->conf->THEME_ELDY_BACKTABACTIVE)?$colorbacktabactive:$user->conf->THEME_ELDY_BACKTABACTIVE);
+$colorbacklineimpair1=empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED)?(empty($conf->global->THEME_ELDY_LINEIMPAIR1)  ?$colorbacklineimpair1:$conf->global->THEME_ELDY_LINEIMPAIR1):(empty($user->conf->THEME_ELDY_LINEIMPAIR1)?$colorbacklineimpair1:$user->conf->THEME_ELDY_LINEIMPAIR1);
+$colorbacklineimpair2=empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED)?(empty($conf->global->THEME_ELDY_LINEIMPAIR2)  ?$colorbacklineimpair2:$conf->global->THEME_ELDY_LINEIMPAIR2):(empty($user->conf->THEME_ELDY_LINEIMPAIR2)?$colorbacklineimpair2:$user->conf->THEME_ELDY_LINEIMPAIR2);
+$colorbacklineimpairhover=empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED)?(empty($conf->global->THEME_ELDY_LINEIMPAIRHOVER)  ?$colorbacklineimpairhover:$conf->global->THEME_ELDY_LINEIMPAIRHOVER):(empty($user->conf->THEME_ELDY_LINEIMPAIRHOVER)?$colorbacklineimpairhover:$user->conf->THEME_ELDY_LINEIMPAIRHOVER);
+$colorbacklinepair1  =empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED)?(empty($conf->global->THEME_ELDY_LINEPAIR1)    ?$colorbacklinepair1:$conf->global->THEME_ELDY_LINEPAIR1)    :(empty($user->conf->THEME_ELDY_LINEPAIR1)?$colorbacklinepair1:$user->conf->THEME_ELDY_LINEPAIR1);
+$colorbacklinepair2  =empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED)?(empty($conf->global->THEME_ELDY_LINEPAIR2)    ?$colorbacklinepair2:$conf->global->THEME_ELDY_LINEPAIR2)    :(empty($user->conf->THEME_ELDY_LINEPAIR2)?$colorbacklinepair2:$user->conf->THEME_ELDY_LINEPAIR2);
+$colorbacklinepairhover  =empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED)?(empty($conf->global->THEME_ELDY_LINEPAIRHOVER)    ?$colorbacklinepairhover:$conf->global->THEME_ELDY_LINEPAIRHOVER)    :(empty($user->conf->THEME_ELDY_LINEPAIRHOVER)?$colorbacklinepairhover:$user->conf->THEME_ELDY_LINEPAIRHOVER);
+$colorbackbody       =empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED)?(empty($conf->global->THEME_ELDY_BACKBODY)     ?$colorbackbody:$conf->global->THEME_ELDY_BACKBODY)          :(empty($user->conf->THEME_ELDY_BACKBODY)?$colorbackbody:$user->conf->THEME_ELDY_BACKBODY);
+$colortext           =empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED)?(empty($conf->global->THEME_ELDY_TEXT)         ?$colortext:$conf->global->THEME_ELDY_TEXT)                  :(empty($user->conf->THEME_ELDY_TEXT)?$colortext:$user->conf->THEME_ELDY_TEXT);
+$fontsize            =empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED)?(empty($conf->global->THEME_ELDY_FONT_SIZE1)   ?$fontsize:$conf->global->THEME_ELDY_FONT_SIZE1)             :(empty($user->conf->THEME_ELDY_FONT_SIZE1)?$fontsize:$user->conf->THEME_ELDY_FONT_SIZE1);
+$fontsizesmaller     =empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED)?(empty($conf->global->THEME_ELDY_FONT_SIZE2)   ?$fontsize:$conf->global->THEME_ELDY_FONT_SIZE2)             :(empty($user->conf->THEME_ELDY_FONT_SIZE2)?$fontsize:$user->conf->THEME_ELDY_FONT_SIZE2);
+// No hover by default, we keep only if we set var THEME_ELDY_USE_HOVER
+if ((! empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED) && empty($user->conf->THEME_ELDY_USE_HOVER))
+	|| (empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED) && empty($conf->global->THEME_ELDY_USE_HOVER)))
+{
+	$colorbacklineimpairhover='';
+	$colorbacklinepairhover='';
+}
+
+// Set text color to black or white
+$tmppart=explode(',',$colorback1);
+$tmpval=(! empty($tmppart[1]) ? $tmppart[1] : '');
+$tmpval+=(! empty($tmppart[2]) ? $tmppart[2] : '');
+$tmpval+=(! empty($tmppart[3]) ? $tmppart[3] : '');
+//print $tmpval;
+if ($tmpval < 340) $colortextmain='FFFFFF';
+else $colortextmain='101010';
+
+$usecss3=true;
+if ($conf->browser->name == 'ie' && round($conf->browser->version,2) < 10) $usecss3=false;
+elseif ($conf->browser->name == 'iceweasel') $usecss3=false;
+elseif ($conf->browser->name == 'epiphany')  $usecss3=false;
+
+print '/*'."\n";
+print 'colred='.$colred.' colgreen='.$colgreen.' colblue='.$colblue."\n";
+print 'isred='.$isred.' isgreen='.$isgreen.' isblue='.$isblue."\n";
+print 'colorbacklineimpair1='.$colorbacklineimpair1."\n";
+print 'colorbacklineimpair2='.$colorbacklineimpair2."\n";
+print 'colorbacklineimpairhover='.$colorbacklineimpairhover."\n";
+print 'colorbacklinepair1='.$colorbacklinepair1."\n";
+print 'colorbacklinepair2='.$colorbacklinepair2."\n";
+print 'colorbacklinepairhover='.$colorbacklinepairhover."\n";
+print 'usecss3='.$usecss3."\n";
+print 'dol_hide_topmenu='.$dol_hide_topmenu."\n";
+print 'dol_hide_leftmenu='.$dol_hide_leftmenu."\n";
+print 'dol_optimize_smallscreen='.$dol_optimize_smallscreen."\n";
+print 'dol_no_mouse_hover='.$dol_no_mouse_hover."\n";
+print 'dol_use_jmobile='.$dol_use_jmobile."\n";
+print '*/'."\n";
+
 if (! empty($conf->dol_optimize_smallscreen)) $fontsize=11;
 ?>
 
diff --git a/htdocs/theme/auguria/style.css.php b/htdocs/theme/auguria/style.css.php
index 41bdadf037c..71deed1ce23 100644
--- a/htdocs/theme/auguria/style.css.php
+++ b/htdocs/theme/auguria/style.css.php
@@ -63,10 +63,10 @@ if (! empty($conf->global->MAIN_OVERWRITE_THEME_RES)) { $path='/'.$conf->global-
 // Define image path files
 $fontlist='arial,tahoma,verdana,helvetica';    //$fontlist='Verdana,Helvetica,Arial,sans-serif';
 
-$dol_hide_topmenu=$conf->dol_hide_topmenu;
-$dol_hide_leftmenu=$conf->dol_hide_leftmenu;
-$dol_optimize_smallscreen=$conf->dol_optimize_smallscreen;
-$dol_no_mouse_hover=$conf->dol_no_mouse_hover;
+$dol_hide_topmenu=$conf->dol_hide_topmenu;
+$dol_hide_leftmenu=$conf->dol_hide_leftmenu;
+$dol_optimize_smallscreen=$conf->dol_optimize_smallscreen;
+$dol_no_mouse_hover=$conf->dol_no_mouse_hover;
 $dol_use_jmobile=$conf->dol_use_jmobile;
 
 $img_liste_titre=dol_buildpath($path.'/theme/'.$theme.'/img/menus/trtitle.png',1);

From 37ef86379f5c30dc302f9122b6776545a48fc175 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=A9dric=20Salvador?= <csalvador@gpcsolutions.fr>
Date: Wed, 5 Jun 2013 18:19:50 +0200
Subject: [PATCH 36/43] fixed bug when editing a supplier order line

---
 .../fourn/class/fournisseur.commande.class.php |  6 ++++--
 htdocs/fourn/commande/fiche.php                | 18 ++++++++++++++----
 2 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/htdocs/fourn/class/fournisseur.commande.class.php b/htdocs/fourn/class/fournisseur.commande.class.php
index dbd23b2f465..3374393310e 100644
--- a/htdocs/fourn/class/fournisseur.commande.class.php
+++ b/htdocs/fourn/class/fournisseur.commande.class.php
@@ -1802,7 +1802,7 @@ class CommandeFournisseur extends CommonOrder
             $sql.= ",total_localtax1='".price2num($total_localtax1)."'";
             $sql.= ",total_localtax2='".price2num($total_localtax2)."'";
             $sql.= ",total_ttc='".price2num($total_ttc)."'";
-            $sql.= ",product_type='".$type."'";
+            $sql.= ",product_type=".$type;
             $sql.= " WHERE rowid = ".$rowid;
 
             dol_syslog(get_class($this)."::updateline sql=".$sql);
@@ -2063,7 +2063,7 @@ class CommandeFournisseurLigne
         $sql.= ' cd.localtax1_tx, cd.localtax2_tx,';
         $sql.= ' cd.remise, cd.remise_percent, cd.subprice,';
         $sql.= ' cd.info_bits, cd.total_ht, cd.total_tva, cd.total_ttc,';
-        $sql.= ' cd.total_localtax1, cd.local_localtax2,';
+        $sql.= ' cd.total_localtax1, cd.total_localtax2,';
         $sql.= ' p.ref as product_ref, p.label as product_libelle, p.description as product_desc';
         $sql.= ' FROM '.MAIN_DB_PREFIX.'commande_fournisseurdet as cd';
         $sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'product as p ON cd.fk_product = p.rowid';
@@ -2096,10 +2096,12 @@ class CommandeFournisseurLigne
             $this->product_desc     = $objp->product_desc;
 
             $this->db->free($result);
+            return 1;
         }
         else
         {
             dol_print_error($this->db);
+            return -1;
         }
     }
 
diff --git a/htdocs/fourn/commande/fiche.php b/htdocs/fourn/commande/fiche.php
index cbe5388164e..1bb3fa405af 100644
--- a/htdocs/fourn/commande/fiche.php
+++ b/htdocs/fourn/commande/fiche.php
@@ -336,10 +336,11 @@ else if ($action == 'addline' && $user->rights->fournisseur->commande->creer)
  */
 else if ($action == 'updateligne' && $user->rights->fournisseur->commande->creer &&	$_POST['save'] == $langs->trans('Save'))
 {
-    $product=new Product($db);
     if ($_POST["elrowid"])
     {
-        if ($product->fetch($_POST["elrowid"]) < 0) dol_print_error($db);
+        $line = new CommandeFournisseurLigne($db);
+        $res = $line->fetch($_POST["elrowid"]); 
+        if (!$res) dol_print_error($db);
     }
 
     $localtax1_tx=get_localtax($_POST['tva_tx'],1,$mysoc,$object->thirdparty);
@@ -356,9 +357,18 @@ else if ($action == 'updateligne' && $user->rights->fournisseur->commande->creer
         $localtax2_tx,
         'HT',
         0,
-        isset($_POST["type"])?$_POST["type"]:$product->type
+        isset($_POST["type"])?$_POST["type"]:$line->product_type
     );
-
+    unset($_POST['qty']);
+    unset($_POST['type']);
+    unset($_POST['idprodfournprice']);
+    unset($_POST['remmise_percent']);
+    unset($_POST['dp_desc']);
+    unset($_POST['np_desc']);
+    unset($_POST['pu']);
+    unset($_POST['tva_tx']);
+    unset($localtax1_tx);
+    unset($localtax2_tx);
     if ($result	>= 0)
     {
         $outputlangs = $langs;

From 61d5359f237a9be1826d4941fb428ae60b1e9650 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 5 Jun 2013 21:55:51 +0200
Subject: [PATCH 37/43] Fix: Uniformize menu entries

---
 htdocs/core/menus/init_menu_auguria.sql | 10 +++++-----
 htdocs/core/menus/standard/eldy.lib.php | 20 ++++++++++----------
 2 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/htdocs/core/menus/init_menu_auguria.sql b/htdocs/core/menus/init_menu_auguria.sql
index aec2b78f9ad..8f49ca9eb7e 100644
--- a/htdocs/core/menus/init_menu_auguria.sql
+++ b/htdocs/core/menus/init_menu_auguria.sql
@@ -108,7 +108,7 @@ insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, left
 
 -- Commercial - Proposals
 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->propal->enabled', __HANDLER__, 'left', 1100__+MAX_llx_menu__, 'commercial', 'propals', 5__+MAX_llx_menu__, '/comm/propal/index.php?leftmenu=propals', 'Prop', 0, 'propal', '$user->rights->propale->lire', '', 2, 4, __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->propal->enabled', __HANDLER__, 'left', 1101__+MAX_llx_menu__, 'commercial', '', 1100__+MAX_llx_menu__, '/societe/societe.php?leftmenu=propals', 'NewPropal', 1, 'propal', '$user->rights->propale->creer', '', 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->propal->enabled', __HANDLER__, 'left', 1101__+MAX_llx_menu__, 'commercial', '', 1100__+MAX_llx_menu__, '/comm/propal.php?action=create&amp;leftmenu=propals', 'NewPropal', 1, 'propal', '$user->rights->propale->creer', '', 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->propal->enabled', __HANDLER__, 'left', 1102__+MAX_llx_menu__, 'commercial', '', 1100__+MAX_llx_menu__, '/comm/propal/list.php?leftmenu=propals', 'List', 1, 'propal', '$user->rights->propale->lire', '', 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->propal->enabled && $leftmenu=="propals"', __HANDLER__, 'left', 1103__+MAX_llx_menu__, 'commercial', '', 1102__+MAX_llx_menu__, '/comm/propal/list.php?leftmenu=propals&amp;viewstatut=0', 'PropalsDraft', 1, 'propal', '$user->rights->propale->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->propal->enabled && $leftmenu=="propals"', __HANDLER__, 'left', 1104__+MAX_llx_menu__, 'commercial', '', 1102__+MAX_llx_menu__, '/comm/propal/list.php?leftmenu=propals&amp;viewstatut=1', 'PropalsOpened', 1, 'propal', '$user->rights->propale->lire', '', 2, 3, __ENTITY__);
@@ -118,7 +118,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->propal->enabled', __HANDLER__, 'left', 1110__+MAX_llx_menu__, 'commercial', '', 1100__+MAX_llx_menu__, '/comm/propal/stats/index.php?leftmenu=propals', 'Statistics', 1, 'propal', '$user->rights->propale->lire', '', 2, 4, __ENTITY__);
 -- Commercial - Customer's orders
 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->commande->enabled', __HANDLER__, 'left', 1200__+MAX_llx_menu__, 'commercial', 'orders', 5__+MAX_llx_menu__, '/commande/index.php?leftmenu=orders', 'CustomersOrders', 0, 'orders', '$user->rights->commande->lire', '', 2, 5, __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->commande->enabled', __HANDLER__, 'left', 1201__+MAX_llx_menu__, 'commercial', '', 1200__+MAX_llx_menu__, '/societe/societe.php?leftmenu=orders', 'NewOrder', 1, 'orders', '$user->rights->commande->creer', '', 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->commande->enabled', __HANDLER__, 'left', 1201__+MAX_llx_menu__, 'commercial', '', 1200__+MAX_llx_menu__, '/commande/fiche.php?action=create&amp;leftmenu=orders', 'NewOrder', 1, 'orders', '$user->rights->commande->creer', '', 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->commande->enabled', __HANDLER__, 'left', 1202__+MAX_llx_menu__, 'commercial', '', 1200__+MAX_llx_menu__, '/commande/liste.php?leftmenu=orders', 'List', 1, 'orders', '$user->rights->commande->lire', '', 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->commande->enabled && $leftmenu=="orders"', __HANDLER__, 'left', 1203__+MAX_llx_menu__, 'commercial', '', 1202__+MAX_llx_menu__, '/commande/liste.php?leftmenu=orders&amp;viewstatut=0', 'StatusOrderDraftShort', 1, 'orders', '$user->rights->commande->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->commande->enabled && $leftmenu=="orders"', __HANDLER__, 'left', 1204__+MAX_llx_menu__, 'commercial', '', 1202__+MAX_llx_menu__, '/commande/liste.php?leftmenu=orders&amp;viewstatut=1', 'StatusOrderValidated', 1, 'orders', '$user->rights->commande->lire', '', 2, 3, __ENTITY__);
@@ -129,12 +129,12 @@ 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->commande->enabled', __HANDLER__, 'left', 1209__+MAX_llx_menu__, 'commercial', '', 1200__+MAX_llx_menu__, '/commande/stats/index.php?leftmenu=orders', 'Statistics', 1, 'orders', '$user->rights->commande->lire', '', 2, 4, __ENTITY__);
 -- Commercial - Supplier's orders
 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->fournisseur->enabled', __HANDLER__, 'left', 5100__+MAX_llx_menu__, 'commercial', 'orders_suppliers', 5__+MAX_llx_menu__, '/fourn/commande/index.php?leftmenu=orders_suppliers', 'SuppliersOrders', 0, 'orders', '$user->rights->fournisseur->commande->lire', '', 2, 6, __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->fournisseur->enabled', __HANDLER__, 'left', 5101__+MAX_llx_menu__, 'commercial', '', 5100__+MAX_llx_menu__, '/societe/societe.php?leftmenu=orders_suppliers', 'NewOrder', 1, 'orders', '$user->rights->fournisseur->commande->creer', '', 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->fournisseur->enabled', __HANDLER__, 'left', 5101__+MAX_llx_menu__, 'commercial', '', 5100__+MAX_llx_menu__, '/fourn/commande/fiche.php?action=create&amp;leftmenu=orders_suppliers', 'NewOrder', 1, 'orders', '$user->rights->fournisseur->commande->creer', '', 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->fournisseur->enabled', __HANDLER__, 'left', 5102__+MAX_llx_menu__, 'commercial', '', 5100__+MAX_llx_menu__, '/fourn/commande/liste.php?leftmenu=orders_suppliers&amp;viewstatut=0', 'List', 1, 'orders', '$user->rights->fournisseur->commande->lire', '', 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->fournisseur->enabled', __HANDLER__, 'left', 5108__+MAX_llx_menu__, 'commercial', '', 5100__+MAX_llx_menu__, '/commande/stats/index.php?leftmenu=orders_suppliers&amp;mode=supplier', 'Statistics', 1, 'orders', '$user->rights->fournisseur->commande->lire', '', 2, 7, __ENTITY__);
 -- Commercial - Contracts
 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->contrat->enabled', __HANDLER__, 'left', 1400__+MAX_llx_menu__, 'commercial', 'contracts', 5__+MAX_llx_menu__, '/contrat/index.php?leftmenu=contracts', 'Contracts', 0, 'contracts', '$user->rights->contrat->lire', '', 2, 7, __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->contrat->enabled', __HANDLER__, 'left', 1401__+MAX_llx_menu__, 'commercial', '', 1400__+MAX_llx_menu__, '/societe/societe.php?leftmenu=contracts', 'NewContract', 1, 'contracts', '$user->rights->contrat->creer', '', 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->contrat->enabled', __HANDLER__, 'left', 1401__+MAX_llx_menu__, 'commercial', '', 1400__+MAX_llx_menu__, '/contrat/fiche.php?&action=create&amp;leftmenu=contracts', 'NewContract', 1, 'contracts', '$user->rights->contrat->creer', '', 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->contrat->enabled', __HANDLER__, 'left', 1402__+MAX_llx_menu__, 'commercial', '', 1400__+MAX_llx_menu__, '/contrat/liste.php?leftmenu=contracts', 'List', 1, 'contracts', '$user->rights->contrat->lire', '', 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->contrat->enabled', __HANDLER__, 'left', 1403__+MAX_llx_menu__, 'commercial', '', 1400__+MAX_llx_menu__, '/contrat/services.php?leftmenu=contracts', 'MenuServices', 1, 'contracts', '$user->rights->contrat->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->contrat->enabled&&$leftmenu=="contracts"', __HANDLER__, 'left', 1404__+MAX_llx_menu__, 'commercial', '', 1403__+MAX_llx_menu__, '/contrat/services.php?leftmenu=contracts&amp;mode=0', 'MenuInactiveServices', 2, 'contracts', '$user->rights->contrat->lire', '', 2, 0, __ENTITY__);
@@ -153,7 +153,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->fournisseur->enabled', __HANDLER__, 'left', 1604__+MAX_llx_menu__, 'accountancy', '', 1600__+MAX_llx_menu__, '/compta/facture/stats/index.php?leftmenu=customers_bills&mode=supplier', 'Statistics', 1, 'bills', '$user->rights->fournisseur->facture->lire', '', 2, 8, __ENTITY__);
 -- Accountancy - Customer invoice
 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->facture->enabled', __HANDLER__, 'left', 1700__+MAX_llx_menu__, 'accountancy', 'customer_bills', 6__+MAX_llx_menu__, '/compta/facture/list.php?leftmenu=customers_bills', 'BillsCustomers', 0, 'bills', '$user->rights->facture->lire', '', 2, 3, __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->facture->enabled', __HANDLER__, 'left', 1701__+MAX_llx_menu__, 'accountancy', '', 1700__+MAX_llx_menu__, '/compta/clients.php?action=facturer&amp;leftmenu=customers_bills', 'NewBill', 1, 'bills', '$user->rights->facture->creer', '', 2, 3, __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->facture->enabled', __HANDLER__, 'left', 1701__+MAX_llx_menu__, 'accountancy', '', 1700__+MAX_llx_menu__, '/compta/facture.php?action=create&amp;leftmenu=customers_bills', 'NewBill', 1, 'bills', '$user->rights->facture->creer', '', 2, 3, __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->facture->enabled', __HANDLER__, 'left', 1702__+MAX_llx_menu__, 'accountancy', '', 1700__+MAX_llx_menu__, '/compta/facture/fiche-rec.php?leftmenu=customers_bills', 'Repeatable', 1, 'bills', '$user->rights->facture->lire', '', 2, 4, __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->facture->enabled', __HANDLER__, 'left', 1703__+MAX_llx_menu__, 'accountancy', '', 1700__+MAX_llx_menu__, '/compta/facture/impayees.php?action=facturer&amp;leftmenu=customers_bills', 'Unpaid', 1, 'bills', '$user->rights->facture->lire', '', 2, 5, __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->facture->enabled', __HANDLER__, 'left', 1704__+MAX_llx_menu__, 'accountancy', '', 1700__+MAX_llx_menu__, '/compta/paiement/liste.php?leftmenu=customers_bills', 'Payments', 1, 'bills', '$user->rights->facture->lire', '', 2, 6, __ENTITY__);
diff --git a/htdocs/core/menus/standard/eldy.lib.php b/htdocs/core/menus/standard/eldy.lib.php
index 857b23c5466..9d497589705 100644
--- a/htdocs/core/menus/standard/eldy.lib.php
+++ b/htdocs/core/menus/standard/eldy.lib.php
@@ -658,7 +658,7 @@ function print_left_eldy_menu($db,$menu_array_before,$menu_array_after,&$tabMenu
             {
                 $langs->load("orders");
                 $newmenu->add("/commande/index.php?leftmenu=orders", $langs->trans("CustomersOrders"), 0, $user->rights->commande->lire, '', $mainmenu, 'orders');
-                $newmenu->add("/commande/fiche.php?action=create", $langs->trans("NewOrder"), 1, $user->rights->commande->creer);
+                $newmenu->add("/commande/fiche.php?action=create&amp;leftmenu=orders", $langs->trans("NewOrder"), 1, $user->rights->commande->creer);
                 $newmenu->add("/commande/liste.php?leftmenu=orders", $langs->trans("List"), 1, $user->rights->commande->lire);
                 if (empty($leftmenu) || $leftmenu=="orders") $newmenu->add("/commande/liste.php?leftmenu=orders&viewstatut=0", $langs->trans("StatusOrderDraftShort"), 2, $user->rights->commande->lire);
                 if (empty($leftmenu) || $leftmenu=="orders") $newmenu->add("/commande/liste.php?leftmenu=orders&viewstatut=1", $langs->trans("StatusOrderValidated"), 2, $user->rights->commande->lire);
@@ -674,7 +674,7 @@ function print_left_eldy_menu($db,$menu_array_before,$menu_array_after,&$tabMenu
 			{
 				$langs->load("orders");
 				$newmenu->add("/fourn/commande/index.php?leftmenu=orders_suppliers",$langs->trans("SuppliersOrders"), 0, $user->rights->fournisseur->commande->lire, '', $mainmenu, 'orders_suppliers');
-				$newmenu->add("/fourn/commande/fiche.php?action=create", $langs->trans("NewOrder"), 1, $user->rights->fournisseur->commande->creer);
+				$newmenu->add("/fourn/commande/fiche.php?action=create&amp;leftmenu=orders_suppliers", $langs->trans("NewOrder"), 1, $user->rights->fournisseur->commande->creer);
 				$newmenu->add("/fourn/commande/liste.php?leftmenu=orders_suppliers", $langs->trans("List"), 1, $user->rights->fournisseur->commande->lire);
 				$newmenu->add("/commande/stats/index.php?leftmenu=orders_suppliers&amp;mode=supplier", $langs->trans("Statistics"), 1, $user->rights->fournisseur->commande->lire);
 			}
@@ -1172,15 +1172,15 @@ function print_left_eldy_menu($db,$menu_array_before,$menu_array_after,&$tabMenu
 			$sql.= " WHERE entity = ".$conf->entity;
 			$sql.= " AND clos = 0";
 			$sql.= " ORDER BY label";
-		
+
 			$resql = $db->query($sql);
 			if ($resql)
 			{
 				$numr = $db->num_rows($resql);
 				$i = 0;
-		
+
 				if ($numr > 0) 	$newmenu->add('/compta/bank/index.php',$langs->trans("BankAccounts"),0,$user->rights->banque->lire);
-		
+
 				while ($i < $numr)
 				{
 					$objp = $db->fetch_object($resql);
@@ -1206,16 +1206,16 @@ function print_left_eldy_menu($db,$menu_array_before,$menu_array_after,&$tabMenu
 				if (! empty($conf->global->$paramkey))
 				{
 					$link="/ftp/index.php?idmenu=".$_SESSION["idmenu"]."&numero_ftp=".$i;
-		
+
 					$newmenu->add($link, dol_trunc($conf->global->$paramkey,24));
 				}
 				$i++;
 			}
-		}		
-	
+		}
+
 	}
-	
-	
+
+
 	// Build final $menu_array = $menu_array_before +$newmenu->liste + $menu_array_after
 	//var_dump($menu_array_before);exit;
 	//var_dump($menu_array_after);exit;

From 7e53f98baa4d9cfcf949f8d33259c83de54520ce Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 5 Jun 2013 22:01:35 +0200
Subject: [PATCH 38/43] Qual: Uniformize code

---
 htdocs/core/class/html.form.class.php | 232 +++++++++++++++++---------
 htdocs/societe/ajax/company.php       | 107 ++++++++++++
 2 files changed, 264 insertions(+), 75 deletions(-)
 create mode 100644 htdocs/societe/ajax/company.php

diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index d68d9c8d59f..d753803dc54 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -655,6 +655,72 @@ class Form
         if ($user->admin) print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionnarySetup"),1);
     }
 
+
+    /**
+     *  Return list of company for customer in Ajax if Ajax activated or go to select_thirparty_list
+     *
+     *  @param		int			$selected				Preselected products
+     *  @param		string		$htmlname				Name of HTML seletc field (must be unique in page)
+     *  @param		int			$filtertype				Filter on product type (''=nofilter, 0=product, 1=service)
+     *  @param		int			$limit					Limit on number of returned lines
+     *  @param		array		$ajaxoptions			Options for ajax_autocompleter
+     *  @return		void
+     */
+    function select_thirdparty($selected='', $htmlname='productid', $filtertype='', $limit=20, $ajaxoptions=array())
+    {
+    	global $langs,$conf;
+
+    	if (! empty($conf->use_javascript_ajax) && ! empty($conf->global->COMPANY_USE_SEARCH_TO_SELECT))
+    	{
+    		$placeholder='';
+
+    		if ($selected && empty($selected_input_value))
+    		{
+    			require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
+    			$societe = new Societe($this->db);
+    			$societe->fetch($selected);
+    			$selected_input_value=$societe->ref;
+    		}
+    		// mode=1 means customers products
+    		$urloption='htmlname='.$htmlname.'&outjson=1&price_level='.$price_level.'&type='.$filtertype.'&mode=1&status='.$status.'&finished='.$finished;
+    		print ajax_autocompleter($selected, $htmlname, DOL_URL_ROOT.'/societe/ajax/company.php', $urloption, $conf->global->COMPANY_USE_SEARCH_TO_SELECT, 0, $ajaxoptions);
+    		if (empty($hidelabel)) print $langs->trans("RefOrLabel").' : ';
+    		else if ($hidelabel > 1) {
+    			if (! empty($conf->global->MAIN_HTML5_PLACEHOLDER)) $placeholder=' placeholder="'.$langs->trans("RefOrLabel").'"';
+    			else $placeholder=' title="'.$langs->trans("RefOrLabel").'"';
+    			if ($hidelabel == 2) {
+    				print img_picto($langs->trans("Search"), 'search');
+    			}
+    		}
+    		print '<input type="text" size="20" name="search_'.$htmlname.'" id="search_'.$htmlname.'" value="'.$selected_input_value.'"'.$placeholder.' />';
+    		if ($hidelabel == 3) {
+    			print img_picto($langs->trans("Search"), 'search');
+    		}
+    	}
+    	else
+    	{
+    		print $this->select_thirdparty_list($selected,$htmlname,$filtertype,1,0,1,array(),'',0,$limit);
+    	}
+    }
+
+    /**
+     *  Output html form to select a third party
+     *
+     *	@param	string	$selected       Preselected type
+     *	@param  string	$htmlname       Name of field in form
+     *  @param  string	$filter         Optionnal filters criteras (example: 's.rowid <> x')
+     *	@param	int		$showempty		Add an empty field
+     * 	@param	int		$showtype		Show third party type in combolist (customer, prospect or supplier)
+     * 	@param	int		$forcecombo		Force to use combo box
+     *  @param	array	$event			Event options. Example: array(array('method'=>'getContacts', 'url'=>dol_buildpath('/core/ajax/contacts.php',1), 'htmlname'=>'contactid', 'params'=>array('add-customer-contact'=>'disabled')))
+     * 	@return	string					HTML string with
+	 *  @deprecated						Use select_thirdparty instead
+     */
+    function select_company($selected='',$htmlname='socid',$filter='',$showempty=0, $showtype=0, $forcecombo=0, $event=array())
+    {
+		return $this->select_thirdparty_list($selected='',$htmlname='socid',$filter='',$showempty=0, $showtype=0, $forcecombo=0, $event=array());
+    }
+
     /**
      *  Output html form to select a third party
      *
@@ -665,13 +731,17 @@ class Form
      * 	@param	int		$showtype		Show third party type in combolist (customer, prospect or supplier)
      * 	@param	int		$forcecombo		Force to use combo box
      *  @param	array	$event			Event options. Example: array(array('method'=>'getContacts', 'url'=>dol_buildpath('/core/ajax/contacts.php',1), 'htmlname'=>'contactid', 'params'=>array('add-customer-contact'=>'disabled')))
+     *  @param	string	$filterkey		Filter on key value
+     *  @param	int		$outputmode		0=HTML select string, 1=Array
+     *  @param	int		$limit			Limit number of answers
      * 	@return	string					HTML string with
      */
-    function select_company($selected='',$htmlname='socid',$filter='',$showempty=0, $showtype=0, $forcecombo=0, $event=array())
+    function select_thirdparty_list($selected='',$htmlname='socid',$filter='',$showempty=0, $showtype=0, $forcecombo=0, $event=array(), $filterkey='', $outputmode=0, $limit=20)
     {
         global $conf,$user,$langs;
 
         $out='';
+        $outarray=array();
 
         // On recherche les societes
         $sql = "SELECT s.rowid, s.nom, s.client, s.fournisseur, s.code_client, s.code_fournisseur";
@@ -682,9 +752,33 @@ class Form
         if ($filter) $sql.= " AND (".$filter.")";
         if (!$user->rights->societe->client->voir && !$user->societe_id) $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
         if (! empty($conf->global->COMPANY_HIDE_INACTIVE_IN_COMBOBOX)) $sql.= " AND s.status<>0 ";
+        // Add criteria
+        if ($filterkey && $filterkey != '')
+        {
+			$sql.=" AND (";
+        	if (! empty($conf->global->COMPANY_DONOTSEARCH_ANYWHERE))   // Can use index
+        	{
+        		$sql.="(s.name LIKE '".$filterkey."%'";
+        		$sql.=")";
+        	}
+        	else
+        	{
+        		// For natural search
+        		$scrit = explode(' ', $filterkey);
+        		foreach ($scrit as $crit) {
+        			$sql.=" AND (s.name LIKE '%".$crit."%'";
+        			$sql.=")";
+        		}
+        	}
+        	if (! empty($conf->barcode->enabled))
+        	{
+        		$sql .= " OR s.barcode LIKE '".$filterkey."'";
+        	}
+        	$sql.=")";
+        }
         $sql.= " ORDER BY nom ASC";
 
-        dol_syslog(get_class($this)."::select_company sql=".$sql);
+        dol_syslog(get_class($this)."::select_thirdparty_list sql=".$sql);
         $resql=$this->db->query($sql);
         if ($resql)
         {
@@ -692,32 +786,9 @@ class Form
             {
                 //$minLength = (is_numeric($conf->global->COMPANY_USE_SEARCH_TO_SELECT)?$conf->global->COMPANY_USE_SEARCH_TO_SELECT:2);
                 $out.= ajax_combobox($htmlname, $event, $conf->global->COMPANY_USE_SEARCH_TO_SELECT);
-				/*
-<<<<<<< HEAD
-				if ($selected && empty($selected_input_value))
-                {
-                	require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
-                	$product = new Product($this->db);
-                	$product->fetch($selected);
-                	$selected_input_value=$product->ref;
-                }
-=======
-				if ($selected && empty($selected_input_value))
-                {
-                	require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
-                	$product = new Product($this->db);
-                	$product->fetch($selected);
-                	$selected_input_value=$product->ref;
-                }
->>>>>>> refs/remotes/origin/3.3
-                // mode=1 means customers products
-                $ajaxoptions=array();
-                $urloption='htmlname='.$htmlname.'&outjson=1&filter='.urlencode($filter).'&showtype='.$showtype;
-				$out.=ajax_autocompleter($selected, $htmlname, DOL_URL_ROOT.'/societe/ajax/company.php', $urloption, $conf->global->COMPANY_USE_SEARCH_TO_SELECT, 0, $ajaxoptions);
-                $out.='<input type="text" size="20" name="search_'.$htmlname.'" id="search_'.$htmlname.'" value="'.$selected_input_value.'" />';
-				*/
             }
 
+            // Construct $out and $outarray
             $out.= '<select id="'.$htmlname.'" class="flat" name="'.$htmlname.'">';
             if ($showempty) $out.= '<option value="-1"></option>';
             $num = $this->db->num_rows($resql);
@@ -741,9 +812,12 @@ class Form
                         $out.= '<option value="'.$obj->rowid.'" selected="selected">'.$label.'</option>';
                     }
                     else
-                    {
+					{
                         $out.= '<option value="'.$obj->rowid.'">'.$label.'</option>';
                     }
+
+                    array_push($outarray, array('key'=>$obj->rowid, 'value'=>$obj->name, 'label'=>$obj->name));
+
                     $i++;
                 }
             }
@@ -754,6 +828,7 @@ class Form
             dol_print_error($this->db);
         }
 
+        if ($outputmode) return $outarray;
         return $out;
     }
 
@@ -1114,7 +1189,7 @@ class Form
 
 
     /**
-     *  Return list of products for customer in Ajax if Ajax activated or go to select_produits_do
+     *  Return list of products for customer in Ajax if Ajax activated or go to select_produits_list
      *
      *  @param		int			$selected				Preselected products
      *  @param		string		$htmlname				Name of HTML seletc field (must be unique in page)
@@ -1162,8 +1237,8 @@ class Form
             }
         }
         else
-        {
-            $this->select_produits_do($selected,$htmlname,$filtertype,$limit,$price_level,'',$status,$finished,0);
+		{
+            print $this->select_produits_list($selected,$htmlname,$filtertype,$limit,$price_level,'',$status,$finished,0);
         }
     }
 
@@ -1178,13 +1253,16 @@ class Form
      * 	@param      string	$filterkey      Filter on product
      *	@param		int		$status         -1=Return all products, 0=Products not on sell, 1=Products on sell
      *  @param      int		$finished       Filter on finished field: 2=No filter
-     *  @param      int		$disableout     Disable print output
+     *  @param      int		$outputmode     0=HTML select string, 1=Array
      *  @return     array    				Array of keys for json
      */
-    function select_produits_do($selected='',$htmlname='productid',$filtertype='',$limit=20,$price_level=0,$filterkey='',$status=1,$finished=2,$disableout=0)
+    function select_produits_list($selected='',$htmlname='productid',$filtertype='',$limit=20,$price_level=0,$filterkey='',$status=1,$finished=2,$outputmode=0)
     {
         global $langs,$conf,$user,$db;
 
+        $out='';
+        $outarray=array();
+
         $sql = "SELECT ";
         $sql.= " p.rowid, p.label, p.ref, p.description, p.fk_product_type, p.price, p.price_ttc, p.price_base_type, p.tva_tx, p.duration, p.stock";
         // Multilang : we add translation
@@ -1228,6 +1306,7 @@ class Form
         // Add criteria on ref/label
         if ($filterkey && $filterkey != '')
         {
+        	$sql.=" AND (";
             if (! empty($conf->global->PRODUCT_DONOTSEARCH_ANYWHERE))   // Can use index
             {
                 $sql.=" AND (p.ref LIKE '".$filterkey."%' OR p.label LIKE '".$filterkey."%'";
@@ -1249,22 +1328,20 @@ class Form
             {
                 $sql .= " OR p.barcode LIKE '".$filterkey."'";
             }
+            $sql.=")";
         }
         $sql.= $db->order("p.ref");
         $sql.= $db->plimit($limit);
 
         // Build output string
-        $outselect='';
-        $outjson=array();
-
-        dol_syslog(get_class($this)."::select_produits_do search product sql=".$sql, LOG_DEBUG);
+        dol_syslog(get_class($this)."::select_produits_list search product sql=".$sql, LOG_DEBUG);
         $result=$this->db->query($sql);
         if ($result)
         {
             $num = $this->db->num_rows($result);
 
-            $outselect.='<select class="flat" name="'.$htmlname.'" id="'.$htmlname.'">';
-            $outselect.='<option value="0" selected="selected">&nbsp;</option>';
+            $out.='<select class="flat" name="'.$htmlname.'" id="'.$htmlname.'">';
+            $out.='<option value="0" selected="selected">&nbsp;</option>';
 
             $i = 0;
             while ($num && $i < $num)
@@ -1273,13 +1350,14 @@ class Form
 				$optJson = array();
 				$objp = $this->db->fetch_object($result);
 
-				if(!empty($objp->price_by_qty) && $objp->price_by_qty == 1) { // Price by quantity will return many prices for the same product
+				if (!empty($objp->price_by_qty) && $objp->price_by_qty == 1)
+				{ // Price by quantity will return many prices for the same product
 					$sql = "SELECT rowid, quantity, price, unitprice, remise_percent, remise";
 					$sql.= " FROM ".MAIN_DB_PREFIX."product_price_by_qty";
 					$sql.= " WHERE fk_product_price=".$objp->price_rowid;
 					$sql.= " ORDER BY quantity ASC";
 
-					dol_syslog(get_class($this)."::select_produits_do search price by qty sql=".$sql);
+					dol_syslog(get_class($this)."::select_produits_list search price by qty sql=".$sql);
 					$result2 = $this->db->query($sql);
 					if ($result2)
 					{
@@ -1302,46 +1380,48 @@ class Form
 							// Add new entry
 							// "key" value of json key array is used by jQuery automatically as selected value
 							// "label" value of json key array is used by jQuery automatically as text for combo box
-							$outselect.=$opt;
-							array_push($outjson, $optJson);
+							$out.=$opt;
+							array_push($outarray, $optJson);
 						}
 					}
-				} else {
+				}
+				else
+				{
 					$this->_construct_product_list_option($objp, $opt, $optJson, $price_level, $selected);
 					// Add new entry
 					// "key" value of json key array is used by jQuery automatically as selected value
 					// "label" value of json key array is used by jQuery automatically as text for combo box
-					$outselect.=$opt;
-					array_push($outjson, $optJson);
+					$out.=$opt;
+					array_push($outarray, $optJson);
 				}
 
                 $i++;
             }
 
-            $outselect.='</select>';
+            $out.='</select>';
 
             $this->db->free($result);
 
-            if (empty($disableout)) print $outselect;
-            return $outjson;
+            if (empty($outputmode)) return $out;
+            return $outarray;
         }
         else
-        {
+		{
             dol_print_error($db);
         }
     }
 
     /**
      * _construct_product_list_option
-     * 
+     *
      * @param 	resultset		&$objp			Resultset of fetch
      * @param 	string		$opt			Option
      * @param 	string		$optJson		Option
      * @param 	int			$price_level	Price level
      * @param 	string		$selected		Preselected value
-     * @return	
+     * @return
      */
-	private function _construct_product_list_option(&$objp, &$opt, &$optJson, $price_level, $selected) 
+	private function _construct_product_list_option(&$objp, &$opt, &$optJson, $price_level, $selected)
 	{
 		global $langs,$conf,$user,$db;
 
@@ -1399,7 +1479,7 @@ class Form
             $sql.= " ORDER BY date_price";
             $sql.= " DESC LIMIT 1";
 
-            dol_syslog(get_class($this)."::select_produits_do search price for level '.$price_level.' sql=".$sql);
+            dol_syslog(get_class($this)."::_construct_product_list_option search price for level '.$price_level.' sql=".$sql);
             $result2 = $this->db->query($sql);
             if ($result2)
             {
@@ -1430,7 +1510,8 @@ class Form
         }
 
 		// Price by quantity
-		if (!empty($objp->quantity) && $objp->quantity >= 1) {
+		if (!empty($objp->quantity) && $objp->quantity >= 1)
+		{
 			$found = 1;
 			$outqty=$objp->quantity;
 			$outdiscount=$objp->remise_percent;
@@ -1511,7 +1592,7 @@ class Form
 	}
 
     /**
-     *	Return list of products for customer (in Ajax if Ajax activated or go to select_produits_fournisseurs_do)
+     *	Return list of products for customer (in Ajax if Ajax activated or go to select_produits_fournisseurs_list)
      *
      *	@param	int		$socid			Id third party
      *	@param  string	$selected       Preselected product
@@ -1536,7 +1617,7 @@ class Form
         }
         else
         {
-            $this->select_produits_fournisseurs_do($socid,$selected,$htmlname,$filtertype,$filtre,'',-1,0);
+            print $this->select_produits_fournisseurs_list($socid,$selected,$htmlname,$filtertype,$filtre,'',-1,0);
         }
     }
 
@@ -1550,13 +1631,16 @@ class Form
      *	@param  string	$filtre         Pour filtre sql
      *	@param  string	$filterkey      Filtre des produits
      *  @param  int		$statut         -1=Return all products, 0=Products not on sell, 1=Products on sell
-     *  @param  int		$disableout     Disable print output
+     *  @param  int		$outputmode     0=HTML select string, 1=Array
      *  @return array           		Array of keys for json
      */
-    function select_produits_fournisseurs_do($socid,$selected='',$htmlname='productid',$filtertype='',$filtre='',$filterkey='',$statut=-1,$disableout=0)
+    function select_produits_fournisseurs_list($socid,$selected='',$htmlname='productid',$filtertype='',$filtre='',$filterkey='',$statut=-1,$outputmode=0)
     {
         global $langs,$conf;
 
+        $out='';
+        $outarray=array();
+
         $langs->load('stocks');
 
         $sql = "SELECT p.rowid, p.label, p.ref, p.price, p.duration,";
@@ -1590,20 +1674,18 @@ class Form
         $sql.= " ORDER BY pfp.ref_fourn DESC, pfp.quantity ASC";
 
         // Build output string
-        $outselect='';
-        $outjson=array();
 
-        dol_syslog(get_class($this)."::select_produits_fournisseurs_do sql=".$sql,LOG_DEBUG);
+        dol_syslog(get_class($this)."::select_produits_fournisseurs_list sql=".$sql,LOG_DEBUG);
         $result=$this->db->query($sql);
         if ($result)
         {
 
             $num = $this->db->num_rows($result);
 
-            //$outselect.='<select class="flat" id="select'.$htmlname.'" name="'.$htmlname.'">';	// remove select to have id same with combo and ajax
-            $outselect.='<select class="flat" id="'.$htmlname.'" name="'.$htmlname.'">';
-            if (! $selected) $outselect.='<option value="0" selected="selected">&nbsp;</option>';
-            else $outselect.='<option value="0">&nbsp;</option>';
+            //$out.='<select class="flat" id="select'.$htmlname.'" name="'.$htmlname.'">';	// remove select to have id same with combo and ajax
+            $out.='<select class="flat" id="'.$htmlname.'" name="'.$htmlname.'">';
+            if (! $selected) $out.='<option value="0" selected="selected">&nbsp;</option>';
+            else $out.='<option value="0">&nbsp;</option>';
 
             $i = 0;
             while ($i < $num)
@@ -1694,9 +1776,9 @@ class Form
                 // Add new entry
                 // "key" value of json key array is used by jQuery automatically as selected value
                 // "label" value of json key array is used by jQuery automatically as text for combo box
-                $outselect.=$opt;
-                array_push($outjson, array('key'=>$outkey, 'value'=>$outref, 'label'=>$outval, 'qty'=>$outqty, 'discount'=>$outdiscount, 'disabled'=>(empty($objp->idprodfournprice)?true:false)));
-				// Exemple of var_dump $outjson
+                $out.=$opt;
+                array_push($outarray, array('key'=>$outkey, 'value'=>$outref, 'label'=>$outval, 'qty'=>$outqty, 'discount'=>$outdiscount, 'disabled'=>(empty($objp->idprodfournprice)?true:false)));
+				// Exemple of var_dump $outarray
 				// array(1) {[0]=>array(6) {[key"]=>string(1) "2" ["value"]=>string(3) "ppp"
 				//           ["label"]=>string(76) "ppp (<strong>f</strong>ff2) - ppp - 20,00 Euros/1unité (20,00 Euros/unité)"
 				//      	 ["qty"]=>string(1) "1" ["discount"]=>string(1) "0" ["disabled"]=>bool(false)
@@ -1707,12 +1789,12 @@ class Form
 
                 $i++;
             }
-            $outselect.='</select>';
+            $out.='</select>';
 
             $this->db->free($result);
 
-            if (empty($disableout)) print $outselect;
-            return $outjson;
+            if (empty($outputmode)) return $out;
+            return $outarray;
         }
         else
         {
@@ -3524,7 +3606,7 @@ class Form
     function select_duration($prefix,$iSecond='',$disabled=0,$typehour='select')
     {
     	global $langs;
-    	
+
         if ($iSecond)
         {
             require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
@@ -3532,8 +3614,8 @@ class Form
             $hourSelected = convertSecondToTime($iSecond,'hour');
             $minSelected = convertSecondToTime($iSecond,'min');
         }
-		
-        if ($typehour=='select') 
+
+        if ($typehour=='select')
         {
 	        print '<select class="flat" name="'.$prefix.'hour"'.($disabled?' disabled="disabled"':'').'>';
 	        for ($hour = 0; $hour < 24; $hour++)
@@ -3547,7 +3629,7 @@ class Form
 	        }
 	        print "</select>";
         }
-        elseif ($typehour=='text') 
+        elseif ($typehour=='text')
         {
         	$fullhours=convertSecondToTime($iSecond,'fullhour');
         	print '<input type="text" size="3" name="'.$prefix.'hour" class="flat" value="'.$fullhours.'">';
diff --git a/htdocs/societe/ajax/company.php b/htdocs/societe/ajax/company.php
new file mode 100644
index 00000000000..d79fe3f4ee9
--- /dev/null
+++ b/htdocs/societe/ajax/company.php
@@ -0,0 +1,107 @@
+<?php
+/* Copyright (C) 2006      Andre Cianfarani     <acianfa@free.fr>
+ * Copyright (C) 2005-2012 Regis Houssin        <regis.houssin@capnetworks.com>
+ * Copyright (C) 2007-2011 Laurent Destailleur  <eldy@users.sourceforge.net>
+ *
+ * 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
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+/**
+ *       \file       htdocs/product/ajax/products.php
+ *       \brief      File to return Ajax response on product list request
+ */
+
+if (! defined('NOTOKENRENEWAL')) define('NOTOKENRENEWAL',1); // Disables token renewal
+if (! defined('NOREQUIREMENU'))  define('NOREQUIREMENU','1');
+if (! defined('NOREQUIREHTML'))  define('NOREQUIREHTML','1');
+if (! defined('NOREQUIREAJAX'))  define('NOREQUIREAJAX','1');
+if (! defined('NOREQUIRESOC'))   define('NOREQUIRESOC','1');
+if (! defined('NOCSRFCHECK'))    define('NOCSRFCHECK','1');
+if (empty($_GET['keysearch']) && ! defined('NOREQUIREHTML'))  define('NOREQUIREHTML','1');
+
+require '../../main.inc.php';
+
+$htmlname=GETPOST('htmlname','alpha');
+$socid=GETPOST('socid','int');
+$type=GETPOST('type','int');
+$mode=GETPOST('mode','int');
+$status=((GETPOST('status','int') >= 0) ? GETPOST('status','int') : -1);
+$outjson=(GETPOST('outjson','int') ? GETPOST('outjson','int') : 0);
+$price_level=GETPOST('price_level','int');
+$action=GETPOST('action', 'alpha');
+$id=GETPOST('id', 'int');
+$price_by_qty_rowid=GETPOST('pbq', 'int');
+
+/*
+ * View
+ */
+
+//print '<!-- Ajax page called with url '.$_SERVER["PHP_SELF"].'?'.$_SERVER["QUERY_STRING"].' -->'."\n";
+
+dol_syslog(join(',',$_GET));
+//print_r($_GET);
+
+if (! empty($action) && $action == 'fetch' && ! empty($id))
+{
+	require DOL_DOCUMENT_ROOT . '/societe/class/societe.class.php';
+
+	$outjson=array();
+
+	$object = new Societe($db);
+	$ret=$object->fetch($id);
+	if ($ret > 0)
+	{
+		$outname=$object->name;
+
+		$outjson = array('name'=>$outname);
+	}
+
+	echo json_encode($outjson);
+}
+else
+{
+	require_once DOL_DOCUMENT_ROOT.'/core/class/html.form.class.php';
+
+	$langs->load("products");
+	$langs->load("main");
+
+	top_httphead();
+
+	if (empty($htmlname)) return;
+
+	$match = preg_grep('/('.$htmlname.'[0-9]+)/',array_keys($_GET));
+	sort($match);
+	$id = (! empty($match[0]) ? $match[0] : '');
+
+	if (! GETPOST($htmlname) && ! GETPOST($id)) return;
+
+	// When used from jQuery, the search term is added as GET param "term".
+	$searchkey=(GETPOST($id)?GETPOST($id):(GETPOST($htmlname)?GETPOST($htmlname):''));
+
+	$form = new Form($db);
+	if (empty($mode) || $mode == 'customer')
+	{
+		$arrayresult=$form->select_company_html($socid,$htmlname,"client IN (1,3)",0,0,0,null,$searchkey,$outjson);
+	}
+	elseif ($mode == 'supplier')
+	{
+		$arrayresult=$form->select_company_html($socid,$htmlname,"fournisseur=1",0,0,0,null,$searchkey,$outjson);
+	}
+
+	$db->close();
+
+	if ($outjson) print json_encode($arrayresult);
+}
+
+?>
\ No newline at end of file

From 56f9d8f50c9b1a202e490d30bb0a428c458a20c3 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 5 Jun 2013 22:10:43 +0200
Subject: [PATCH 39/43] Fix: missing style

---
 htdocs/theme/bureau2crea/style.css.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/htdocs/theme/bureau2crea/style.css.php b/htdocs/theme/bureau2crea/style.css.php
index 73873699280..7f506006b74 100644
--- a/htdocs/theme/bureau2crea/style.css.php
+++ b/htdocs/theme/bureau2crea/style.css.php
@@ -227,7 +227,9 @@ div.inline-block
 .nowrap {
 	white-space: <?php print ($dol_optimize_smallscreen?'normal':'nowrap'); ?>;
 }
-
+.dolibarrcombobox {
+	height: 22px;
+}
 
 /* ============================================================================== */
 /* Styles to hide objects                                                         */

From b7f697e8c49eebeb1d883970de31ae575037a8cf Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 5 Jun 2013 22:27:02 +0200
Subject: [PATCH 40/43] Remove a call of a deprecated function

---
 htdocs/cashdesk/admin/cashdesk.php    |  3 ++-
 htdocs/core/class/html.form.class.php | 16 +++++++++-------
 2 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/htdocs/cashdesk/admin/cashdesk.php b/htdocs/cashdesk/admin/cashdesk.php
index 91700e328df..217b184f1d9 100644
--- a/htdocs/cashdesk/admin/cashdesk.php
+++ b/htdocs/cashdesk/admin/cashdesk.php
@@ -103,7 +103,8 @@ print "</tr>\n";
 $var=!$var;
 print '<tr '.$bc[$var].'><td width=\"50%\">'.$langs->trans("CashDeskThirdPartyForSell").'</td>';
 print '<td colspan="2">';
-print $form->select_company($conf->global->CASHDESK_ID_THIRDPARTY,'socid','s.client in (1,3)',1,1);
+//print $form->select_company($conf->global->CASHDESK_ID_THIRDPARTY,'socid','s.client in (1,3)',1,1);
+print $form->select_thirdparty($conf->global->CASHDESK_ID_THIRDPARTY,'socid','s.client in (1,3)',0,array(),1);
 print '</td></tr>';
 if (! empty($conf->banque->enabled))
 {
diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index d753803dc54..87bc7dff59f 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -661,16 +661,18 @@ class Form
      *
      *  @param		int			$selected				Preselected products
      *  @param		string		$htmlname				Name of HTML seletc field (must be unique in page)
-     *  @param		int			$filtertype				Filter on product type (''=nofilter, 0=product, 1=service)
+     *  @param		int			$filter					Filter on thirdparty
      *  @param		int			$limit					Limit on number of returned lines
      *  @param		array		$ajaxoptions			Options for ajax_autocompleter
+     * 	@param		int			$forcecombo				Force to use combo box
      *  @return		void
      */
-    function select_thirdparty($selected='', $htmlname='productid', $filtertype='', $limit=20, $ajaxoptions=array())
+    function select_thirdparty($selected='', $htmlname='productid', $filter='', $limit=20, $ajaxoptions=array(), $forcecombo=0)
     {
     	global $langs,$conf;
-
-    	if (! empty($conf->use_javascript_ajax) && ! empty($conf->global->COMPANY_USE_SEARCH_TO_SELECT))
+
+    	/* TODO Use ajax autocompletion (not finished)
+    	if (! empty($conf->use_javascript_ajax) && ! empty($conf->global->COMPANY_USE_SEARCH_TO_SELECT) && ! $forcecombo)
     	{
     		$placeholder='';
 
@@ -698,9 +700,9 @@ class Form
     		}
     	}
     	else
-    	{
-    		print $this->select_thirdparty_list($selected,$htmlname,$filtertype,1,0,1,array(),'',0,$limit);
-    	}
+    	{*/
+    		print $this->select_thirdparty_list($selected,$htmlname,$filter,1,0,$forcecombo,array(),'',0,$limit);
+    	//}
     }
 
     /**

From 81d6d5d51f6b0acac9c277e2fe3bad3b96f5a419 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 5 Jun 2013 22:28:55 +0200
Subject: [PATCH 41/43] Doc

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

diff --git a/ChangeLog b/ChangeLog
index 1a1e738da68..6152f1407b8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -16,6 +16,9 @@ For users:
 - New: Show process id in all command line scripts.
 - New: Module mailman can subscribe/unsubscribe to ML according to categories of member.
 
+For translators:
+- Normalized sort order of all languages files with english ref file.
+
 For developers:
 - New: DolGraph can build graph with three lines.
 

From db6d226ffd1973897f5f5befc734a9c1a8e24c13 Mon Sep 17 00:00:00 2001
From: Grand Philippe <contact@atoo-net.com>
Date: Thu, 6 Jun 2013 09:22:26 +0200
Subject: [PATCH 42/43] code was displayed twice

---
 htdocs/fichinter/fiche.php | 51 --------------------------------------
 1 file changed, 51 deletions(-)

diff --git a/htdocs/fichinter/fiche.php b/htdocs/fichinter/fiche.php
index 2f8cdc6ed22..96565d9ebd2 100644
--- a/htdocs/fichinter/fiche.php
+++ b/htdocs/fichinter/fiche.php
@@ -1065,7 +1065,6 @@ if ($action == 'create')
 			print $object->showOptionals($extrafields,'edit');
 		}
 
-
         // Show link to origin object
         if (! empty($origin) && ! empty($originid) && is_object($objectsrc))
         {
@@ -1082,56 +1081,6 @@ if ($action == 'create')
 	        print '<input type="hidden" name="originid"       value="'.$objectsrc->id.'">';
 		}
 
-		// Model
-		print '<tr>';
-		print '<td>'.$langs->trans("DefaultModel").'</td>';
-		print '<td colspan="2">';
-		$liste=ModelePDFFicheinter::liste_modeles($db);
-		print $form->selectarray('model',$liste,$conf->global->FICHEINTER_ADDON_PDF);
-		print "</td></tr>";
-
-		// Public note
-		print '<tr>';
-		print '<td class="border" valign="top">'.$langs->trans('NotePublic').'</td>';
-		print '<td valign="top" colspan="2">';
-		$doleditor = new DolEditor('note_public', $note_public, '', 80, 'dolibarr_notes', 'In', 0, false, true, ROWS_3, 70);
-		print $doleditor->Create(1);
-		//print '<textarea name="note_public" cols="80" rows="'.ROWS_3.'">'.$note_public.'</textarea>';
-		print '</td></tr>';
-
-		// Private note
-		if (!empty($user->societe_id))
-		{
-			print '<tr>';
-			print '<td class="border" valign="top">'.$langs->trans('NotePrivate').'</td>';
-			print '<td valign="top" colspan="2">';
-			$doleditor = new DolEditor('note_private', $note_private, '', 80, 'dolibarr_notes', 'In', 0, false, true, ROWS_3, 70);
-			print $doleditor->Create(1);
-			//print '<textarea name="note_private" cols="80" rows="'.ROWS_3.'">'.$note_private.'</textarea>';
-			print '</td></tr>';
-		}
-
-		// Other attributes
-		$parameters=array('colspan' => ' colspan="2"');
-		$reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$object,$action);    // Note that $action and $object may have been modified by hook
-
-
-		// Show link to origin object
-		if (! empty($origin) && ! empty($originid) && is_object($objectsrc))
-		{
-			$newclassname=$classname;
-			if ($newclassname=='Propal') $newclassname='CommercialProposal';
-			print '<tr><td>'.$langs->trans($newclassname).'</td><td colspan="2">'.$objectsrc->getNomUrl(1).'</td></tr>';
-		}
-
-		print '</table>';
-
-		if (is_object($objectsrc))
-		{
-			print '<input type="hidden" name="origin"         value="'.$objectsrc->element.'">';
-			print '<input type="hidden" name="originid"       value="'.$objectsrc->id.'">';
-		}
-
 		print '<center><br>';
 		print '<input type="submit" class="button" value="'.$langs->trans("CreateDraftIntervention").'">';
 		print '</center>';

From bf8fd7d34f4eea343c2a4023e895cc7aaf42fa4e Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 6 Jun 2013 09:42:39 +0200
Subject: [PATCH 43/43] Fix: CSS

---
 htdocs/theme/bureau2crea/style.css.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/theme/bureau2crea/style.css.php b/htdocs/theme/bureau2crea/style.css.php
index 7f506006b74..ab50ee574b8 100644
--- a/htdocs/theme/bureau2crea/style.css.php
+++ b/htdocs/theme/bureau2crea/style.css.php
@@ -789,7 +789,7 @@ div.blockvmenusearch div.menu_titre {
 {
 	padding-top: 1px;
 	padding-bottom: 1px;
-	height: 16px;
+	min-height: 14px;
 }
 
 div.blockvmenubookmarks